A patch from John F. Kelly to add in a utility for configuring

[oweals/busybox.git] / networking / ping.c

diff --git a/networking/ping.c b/networking/ping.c
index 205133d8cc0aa70e147e08243d169bf86e8982f2..044b547ac601af85555daeea3a85b10d65002f91 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.44 2001/07/12 20:26:31 andersen Exp $
+ * $Id: ping.c,v 1.53 2003/01/12 06:08:33 andersen Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -174,13 +174,12 @@ static int in_cksum(unsigned short *buf, int sz)
 }
 
 /* simple version */
-#ifndef BB_FEATURE_FANCY_PING
+#ifndef CONFIG_FEATURE_FANCY_PING
 static char *hostname = NULL;
-
 static void noresp(int ign)
 {
        printf("No response from %s\n", hostname);
-       exit(0);
+       exit(EXIT_FAILURE);
 }
 
 static void ping(const char *host)
@@ -191,7 +190,7 @@ static void ping(const char *host)
        int pingsock, c;
        char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 
-       pingsock = create_raw_socket();
+       pingsock = create_icmp_socket();
 
        memset(&pingaddr, 0, sizeof(struct sockaddr_in));
 
@@ -247,18 +246,19 @@ extern int ping_main(int argc, char **argv)
        return EXIT_SUCCESS;
 }
 
-#else /* ! BB_FEATURE_FANCY_PING */
+#else /* ! CONFIG_FEATURE_FANCY_PING */
 /* full(er) version */
-static char *hostname = NULL;
 static struct sockaddr_in pingaddr;
 static int pingsock = -1;
 static int datalen; /* intentionally uninitialized to work around gcc bug */
 
-static long ntransmitted = 0, nreceived = 0, nrepeats = 0, pingcount = 0;
-static int myid = 0, options = 0;
-static unsigned long tmin = ULONG_MAX, tmax = 0, tsum = 0;
+static long ntransmitted, nreceived, nrepeats, pingcount;
+static int myid, options;
+static unsigned long tmin = ULONG_MAX, tmax, tsum;
 static char rcvd_tbl[MAX_DUP_CHK / 8];
 
+struct hostent *hostent;
+
 static void sendping(int);
 static void pingstats(int);
 static void unpack(char *, int, struct sockaddr_in *);
@@ -271,7 +271,7 @@ static void pingstats(int junk)
 
        signal(SIGINT, SIG_IGN);
 
-       printf("\n--- %s ping statistics ---\n", hostname);
+       printf("\n--- %s ping statistics ---\n", hostent->h_name);
        printf("%ld packets transmitted, ", ntransmitted);
        printf("%ld packets received, ", nreceived);
        if (nrepeats)
@@ -416,37 +416,19 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
 
 static void ping(const char *host)
 {
-       struct protoent *proto;
-       struct hostent *h;
-       char buf[MAXHOSTNAMELEN];
        char packet[datalen + MAXIPLEN + MAXICMPLEN];
        int sockopt;
 
-       proto = getprotobyname("icmp");
-       /* if getprotobyname failed, just silently force 
-        * proto->p_proto to have the correct value for "icmp" */
-       if ((pingsock = socket(AF_INET, SOCK_RAW,
-                                                  (proto ? proto->p_proto : 1))) < 0) {        /* 1 == ICMP */
-               if (errno == EPERM)
-                       error_msg_and_die("permission denied. (are you root?)");
-               else
-                       perror_msg_and_die(can_not_create_raw_socket);
-       }
-
-       /* drop root privs if running setuid */
-       setuid(getuid());
+       pingsock = create_icmp_socket();
 
        memset(&pingaddr, 0, sizeof(struct sockaddr_in));
 
        pingaddr.sin_family = AF_INET;
-       h = xgethostbyname(host);
-       if (h->h_addrtype != AF_INET)
+       hostent = xgethostbyname(host);
+       if (hostent->h_addrtype != AF_INET)
                error_msg_and_die("unknown address type; only AF_INET is currently supported.");
 
-       pingaddr.sin_family = AF_INET;  /* h->h_addrtype */
-       memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr));
-       strncpy(buf, h->h_name, sizeof(buf) - 1);
-       hostname = buf;
+       memcpy(&pingaddr.sin_addr, hostent->h_addr, sizeof(pingaddr.sin_addr));
 
        /* enable broadcast pings */
        sockopt = 1;
@@ -459,7 +441,7 @@ static void ping(const char *host)
                           sizeof(sockopt));
 
        printf("PING %s (%s): %d data bytes\n",
-                  hostname,
+                  hostent->h_name,
                   inet_ntoa(*(struct in_addr *) &pingaddr.sin_addr.s_addr),
                   datalen);
 
@@ -530,7 +512,7 @@ extern int ping_main(int argc, char **argv)
        ping(*argv);
        return EXIT_SUCCESS;
 }
-#endif /* ! BB_FEATURE_FANCY_PING */
+#endif /* ! CONFIG_FEATURE_FANCY_PING */
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.