emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

traceroute: do not look up icmp protocol# in /etc, it is well-known :)

Browse Source
This commit is contained in:
Denis Vlasenko 2006-10-03 10:47:35 +00:00
parent 1c3577f91d
commit 7c1ed2e922
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
networking/traceroute.c
View File

@ -224,6 +224,7 @@
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/protocols.h>
#include <netinet/udp.h> #include <netinet/udp.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ip_icmp.h> #include <netinet/ip_icmp.h>
@ -921,14 +922,12 @@ int
traceroute_main(int argc, char *argv[]) traceroute_main(int argc, char *argv[])
{ {
int code, n; int code, n;
char *cp;
unsigned char *outp; unsigned char *outp;
u_int32_t *ap; u_int32_t *ap;
struct sockaddr_in *from = (struct sockaddr_in *)&wherefrom; struct sockaddr_in *from = (struct sockaddr_in *)&wherefrom;
struct sockaddr_in *to = (struct sockaddr_in *)&whereto; struct sockaddr_in *to = (struct sockaddr_in *)&whereto;
struct hostinfo *hi; struct hostinfo *hi;
int on = 1; int on = 1;
struct protoent *pe;
int ttl, probe, i; int ttl, probe, i;
int seq = 0; int seq = 0;
int tos = 0; int tos = 0;
@ -1076,16 +1075,12 @@ traceroute_main(int argc, char *argv[])
bb_show_usage(); bb_show_usage();
} }
cp = "icmp";
if ((pe = getprotobyname(cp)) == NULL)
bb_perror_msg_and_die("unknown protocol %s", cp);
/* Insure the socket fds won't be 0, 1 or 2 */ /* Insure the socket fds won't be 0, 1 or 2 */
do n = xopen(bb_dev_null, O_RDONLY); while (n < 2); do n = xopen(bb_dev_null, O_RDONLY); while (n < 2);
if (n > 2) if (n > 2)
close(n); close(n);
s = xsocket(AF_INET, SOCK_RAW, pe->p_proto); s = xsocket(AF_INET, SOCK_RAW, IP_ICMP);
#ifdef CONFIG_FEATURE_TRACEROUTE_SO_DEBUG #ifdef CONFIG_FEATURE_TRACEROUTE_SO_DEBUG
if (op & USAGE_OP_DEBUG) if (op & USAGE_OP_DEBUG)