Fix 'thinko'.
[oweals/busybox.git] / networking / ping.c
index a2e9163624daa8b7df2cf610c733273b8412c06d..28b38db1407cc0f883f99ad5d0da7c51cc759f25 100644 (file)
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * $Id: ping.c,v 1.35 2001/01/27 08:24:37 andersen Exp $
+ * $Id: ping.c,v 1.54 2003/03/19 09:12:38 mjn3 Exp $
  * Mini ping implementation for busybox
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
@@ -31,7 +31,6 @@
  * Original copyright notice is retained at the end of this file.
  */
 
-#include "busybox.h"
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#include "busybox.h"
 
 
 /* It turns out that libc5 doesn't have proper icmp support
  * built into it header files, so we have to supplement it */
-#if ! defined __GLIBC__ && ! defined __UCLIBC__
-typedef unsigned int socklen_t;
-
+#if __GNU_LIBRARY__ < 5
 static const int ICMP_MINLEN = 8;                              /* abs minimum */
 
 struct icmp_ra_addr
@@ -176,13 +174,12 @@ static int in_cksum(unsigned short *buf, int sz)
 }
 
 /* simple version */
-#ifdef BB_FEATURE_SIMPLE_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)
@@ -193,19 +190,12 @@ static void ping(const char *host)
        int pingsock, c;
        char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 
-       if ((pingsock = socket(AF_INET, SOCK_RAW, 1)) < 0)      /* 1 == ICMP */
-               perror_msg_and_die("creating a 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;
-       if (!(h = gethostbyname(host))) {
-               error_msg("unknown host %s\n", host);
-               exit(1);
-       }
+       h = xgethostbyname(host);
        memcpy(&pingaddr.sin_addr, h->h_addr, sizeof(pingaddr.sin_addr));
        hostname = h->h_name;
 
@@ -218,7 +208,7 @@ static void ping(const char *host)
                           (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
 
        if (c < 0 || c != sizeof(packet))
-               perror_msg_and_die("sendto");
+               bb_perror_msg_and_die("sendto");
 
        signal(SIGALRM, noresp);
        alarm(5);                                       /* give the host 5000ms to respond */
@@ -231,7 +221,7 @@ static void ping(const char *host)
                                                  (struct sockaddr *) &from, &fromlen)) < 0) {
                        if (errno == EINTR)
                                continue;
-                       perror_msg("recvfrom");
+                       bb_perror_msg("recvfrom");
                        continue;
                }
                if (c >= 76) {                  /* ip + icmp */
@@ -251,23 +241,24 @@ extern int ping_main(int argc, char **argv)
        argc--;
        argv++;
        if (argc < 1)
-               usage(ping_usage);
+               bb_show_usage();
        ping(*argv);
        return EXIT_SUCCESS;
 }
 
-#else /* ! BB_FEATURE_SIMPLE_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 *);
@@ -280,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)
@@ -322,9 +313,9 @@ static void sendping(int junk)
                           (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in));
 
        if (i < 0)
-               perror_msg_and_die("sendto");
+               bb_perror_msg_and_die("sendto");
        else if ((size_t)i != sizeof(packet))
-               error_msg_and_die("ping wrote %d chars; %d expected\n", i,
+               bb_error_msg_and_die("ping wrote %d chars; %d expected", i,
                           (int)sizeof(packet));
 
        signal(SIGALRM, sendping);
@@ -419,49 +410,25 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
                printf("\n");
        } else 
                if (icmppkt->icmp_type != ICMP_ECHO)
-                       error_msg("Warning: Got ICMP %d (%s)\n",
+                       bb_error_msg("Warning: Got ICMP %d (%s)",
                                        icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type));
 }
 
 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?)\n");
-               else
-                       perror_msg_and_die("creating a 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;
-       if (!(h = gethostbyname(host))) {
-               error_msg("unknown host %s\n", host);
-               exit(1);
-       }
+       hostent = xgethostbyname(host);
+       if (hostent->h_addrtype != AF_INET)
+               bb_error_msg_and_die("unknown address type; only AF_INET is currently supported.");
 
-       if (h->h_addrtype != AF_INET) {
-               error_msg("unknown address type; only AF_INET is currently supported.\n");
-               exit(1);
-       }
-
-       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;
@@ -474,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);
 
@@ -493,7 +460,7 @@ static void ping(const char *host)
                                                  (struct sockaddr *) &from, &fromlen)) < 0) {
                        if (errno == EINTR)
                                continue;
-                       perror_msg("recvfrom");
+                       bb_perror_msg("recvfrom");
                        continue;
                }
                unpack(packet, c, &from);
@@ -522,30 +489,30 @@ extern int ping_main(int argc, char **argv)
                        break;
                case 'c':
                        if (--argc <= 0)
-                               usage(ping_usage);
+                               bb_show_usage();
                        argv++;
                        pingcount = atoi(*argv);
                        break;
                case 's':
                        if (--argc <= 0)
-                               usage(ping_usage);
+                               bb_show_usage();
                        argv++;
                        datalen = atoi(*argv);
                        break;
                default:
-                       usage(ping_usage);
+                       bb_show_usage();
                }
                argc--;
                argv++;
        }
        if (argc < 1)
-               usage(ping_usage);
+               bb_show_usage();
 
        myid = getpid() & 0xFFFF;
        ping(*argv);
        return EXIT_SUCCESS;
 }
-#endif /* ! BB_FEATURE_SIMPLE_PING */
+#endif /* ! CONFIG_FEATURE_FANCY_PING */
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.