httpd: reduce ifdef forest. comment out redundant PATH setting
[oweals/busybox.git] / networking / ping6.c
index 72867f346a4e7fd022652ec2bbe082194ae14b41..af9c00e22019005fe31090a1055c0d279b62555d 100644 (file)
@@ -5,19 +5,7 @@
  *
  * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
  * This version of ping is adapted from the ping in netkit-base 0.10,
  * which is:
@@ -37,9 +25,8 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-#include <sys/time.h>
 #include <sys/times.h>
-#include <sys/signal.h>
+#include <signal.h>
 
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <stddef.h>                            /* offsetof */
 #include "busybox.h"
 
-static const int DEFDATALEN = 56;
-static const int MAXIPLEN = 60;
-static const int MAXICMPLEN = 76;
-static const int MAXPACKET = 65468;
-#define        MAX_DUP_CHK     (8 * 128)
-static const int MAXWAIT = 10;
-static const int PINGINTERVAL = 1;             /* second */
+enum {
+       DEFDATALEN = 56,
+       MAXIPLEN = 60,
+       MAXICMPLEN = 76,
+       MAXPACKET = 65468,
+       MAX_DUP_CHK = (8 * 128),
+       MAXWAIT = 10,
+       PINGINTERVAL = 1                /* second */
+};
 
 #define O_QUIET         (1 << 0)
 #define O_VERBOSE       (1 << 1)
@@ -79,7 +68,7 @@ static void ping(const char *host);
 #ifndef CONFIG_FEATURE_FANCY_PING6
 static struct hostent *h;
 
-void noresp(int ign)
+static void noresp(int ign)
 {
        printf("No response from %s\n", h->h_name);
        exit(EXIT_FAILURE);
@@ -109,11 +98,13 @@ static void ping(const char *host)
        setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, (char *) &sockopt,
                           sizeof(sockopt));
 
-       c = sendto(pingsock, packet, sizeof(packet), 0,
+       c = sendto(pingsock, packet, DEFDATALEN + sizeof (struct icmp6_hdr), 0,
                           (struct sockaddr *) &pingaddr, sizeof(struct sockaddr_in6));
 
-       if (c < 0 || c != sizeof(packet))
+       if (c < 0 || c != sizeof(packet)) {
+               if (ENABLE_FEATURE_CLEAN_UP) close(pingsock);
                bb_perror_msg_and_die("sendto");
+       }
 
        signal(SIGALRM, noresp);
        alarm(5);                                       /* give the host 5000ms to respond */
@@ -135,11 +126,12 @@ static void ping(const char *host)
                                break;
                }
        }
+       if (ENABLE_FEATURE_CLEAN_UP) close(pingsock);
        printf("%s is alive!\n", h->h_name);
        return;
 }
 
-extern int ping6_main(int argc, char **argv)
+int ping6_main(int argc, char **argv)
 {
        argc--;
        argv++;
@@ -153,18 +145,15 @@ extern int ping6_main(int argc, char **argv)
 /* full(er) version */
 static struct sockaddr_in6 pingaddr;
 static int pingsock = -1;
-static int datalen; /* intentionally uninitialized to work around gcc bug */
-static char* ifname;
+static unsigned datalen; /* intentionally uninitialized to work around gcc bug */
+static int if_index;
 
-static long ntransmitted, nreceived, nrepeats, pingcount;
+static unsigned 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];
 
-# ifdef CONFIG_FEATURE_FANCY_PING
-extern
-# endif
-       struct hostent *hostent;
+static struct hostent *hostent;
 
 static void sendping(int);
 static void pingstats(int);
@@ -179,12 +168,12 @@ static void pingstats(int junk)
        signal(SIGINT, SIG_IGN);
 
        printf("\n--- %s ping statistics ---\n", hostent->h_name);
-       printf("%ld packets transmitted, ", ntransmitted);
-       printf("%ld packets received, ", nreceived);
+       printf("%lu packets transmitted, ", ntransmitted);
+       printf("%lu packets received, ", nreceived);
        if (nrepeats)
-               printf("%ld duplicates, ", nrepeats);
+               printf("%lu duplicates, ", nrepeats);
        if (ntransmitted)
-               printf("%ld%% packet loss\n",
+               printf("%lu%% packet loss\n",
                           (ntransmitted - nreceived) * 100 / ntransmitted);
        if (nreceived)
                printf("round-trip min/avg/max = %lu.%lu/%lu.%lu/%lu.%lu ms\n",
@@ -202,14 +191,14 @@ static void sendping(int junk)
 {
        struct icmp6_hdr *pkt;
        int i;
-       char packet[datalen + 8];
+       char packet[datalen + sizeof (struct icmp6_hdr)];
 
        pkt = (struct icmp6_hdr *) packet;
 
        pkt->icmp6_type = ICMP6_ECHO_REQUEST;
        pkt->icmp6_code = 0;
        pkt->icmp6_cksum = 0;
-       pkt->icmp6_seq = ntransmitted++;
+       pkt->icmp6_seq = htons(ntransmitted++);
        pkt->icmp6_id = myid;
        CLR(pkt->icmp6_seq % MAX_DUP_CHK);
 
@@ -234,7 +223,18 @@ static void sendping(int junk)
        }
 }
 
-static char *icmp6_type_name (int id)
+/* RFC3542 changed some definitions from RFC2292 for no good reason, whee !
+ * the newer 3542 uses a MLD_ prefix where as 2292 uses ICMP6_ prefix */
+#ifndef MLD_LISTENER_QUERY
+# define MLD_LISTENER_QUERY ICMP6_MEMBERSHIP_QUERY
+#endif
+#ifndef MLD_LISTENER_REPORT
+# define MLD_LISTENER_REPORT ICMP6_MEMBERSHIP_REPORT
+#endif
+#ifndef MLD_LISTENER_REDUCTION
+# define MLD_LISTENER_REDUCTION ICMP6_MEMBERSHIP_REDUCTION
+#endif
+static char *icmp6_type_name(int id)
 {
        switch (id) {
        case ICMP6_DST_UNREACH:                         return "Destination Unreachable";
@@ -243,10 +243,10 @@ static char *icmp6_type_name (int id)
        case ICMP6_PARAM_PROB:                          return "Parameter Problem";
        case ICMP6_ECHO_REPLY:                          return "Echo Reply";
        case ICMP6_ECHO_REQUEST:                        return "Echo Request";
-       case ICMP6_MEMBERSHIP_QUERY:            return "Membership Query";
-       case ICMP6_MEMBERSHIP_REPORT:           return "Membership Report";
-       case ICMP6_MEMBERSHIP_REDUCTION:        return "Membership Reduction";
-       default:                                                        return "unknown ICMP type";
+       case MLD_LISTENER_QUERY:                        return "Listener Query";
+       case MLD_LISTENER_REPORT:                       return "Listener Report";
+       case MLD_LISTENER_REDUCTION:            return "Listener Reduction";
+       default:                                                        return "unknown ICMP type";
        }
 }
 
@@ -265,12 +265,11 @@ static void unpack(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit
                return;
 
        icmppkt = (struct icmp6_hdr *) packet;
-
        if (icmppkt->icmp6_id != myid)
-           return;                             /* not our ping */
+               return;                         /* not our ping */
 
        if (icmppkt->icmp6_type == ICMP6_ECHO_REPLY) {
-           ++nreceived;
+               ++nreceived;
                tp = (struct timeval *) &icmppkt->icmp6_data8[4];
 
                if ((tv.tv_usec -= tp->tv_usec) < 0) {
@@ -299,18 +298,18 @@ static void unpack(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit
                        return;
 
                printf("%d bytes from %s: icmp6_seq=%u", sz,
-                          inet_ntop(AF_INET6, (struct in_addr6 *) &pingaddr.sin6_addr,
+                          inet_ntop(AF_INET6, &pingaddr.sin6_addr,
                                                 buf, sizeof(buf)),
                           icmppkt->icmp6_seq);
                printf(" ttl=%d time=%lu.%lu ms", hoplimit,
                           triptime / 10, triptime % 10);
                if (dupflag)
                        printf(" (DUP!)");
-               printf("\n");
+               puts("");
        } else
                if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST)
-                       bb_error_msg("Warning: Got ICMP %d (%s)",
-                                       icmppkt->icmp6_type, icmp6_type_name (icmppkt->icmp6_type));
+                       bb_error_msg("warning: got ICMP %d (%s)",
+                                       icmppkt->icmp6_type, icmp6_type_name(icmppkt->icmp6_type));
 }
 
 static void ping(const char *host)
@@ -330,7 +329,7 @@ static void ping(const char *host)
        pingaddr.sin6_family = AF_INET6;
        hostent = xgethostbyname2(host, AF_INET6);
        if (hostent->h_addrtype != AF_INET6)
-               bb_error_msg_and_die("unknown address type; only AF_INET6 is currently supported.");
+               bb_error_msg_and_die("unknown address type; only AF_INET6 is currently supported");
 
        memcpy(&pingaddr.sin6_addr, hostent->h_addr, sizeof(pingaddr.sin6_addr));
 
@@ -339,13 +338,7 @@ static void ping(const char *host)
                struct icmp6_filter filt;
                if (!(options & O_VERBOSE)) {
                        ICMP6_FILTER_SETBLOCKALL(&filt);
-#if 0
-                       if ((options & F_FQDN) || (options & F_FQDNOLD) ||
-                               (options & F_NODEADDR) || (options & F_SUPTYPES))
-                               ICMP6_FILTER_SETPASS(ICMP6_NI_REPLY, &filt);
-                       else
-#endif
-                               ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filt);
+                       ICMP6_FILTER_SETPASS(ICMP6_ECHO_REPLY, &filt);
                } else {
                        ICMP6_FILTER_SETPASSALL(&filt);
                }
@@ -373,15 +366,13 @@ static void ping(const char *host)
        setsockopt(pingsock, SOL_IPV6, IPV6_HOPLIMIT, (char *) &sockopt,
                           sizeof(sockopt));
 
-       if (ifname) {
-               if ((pingaddr.sin6_scope_id = if_nametoindex(ifname)) == 0)
-                       bb_error_msg_and_die("%s: invalid interface name", ifname);
-       }
+       if (if_index)
+               pingaddr.sin6_scope_id = if_index;
 
        printf("PING %s (%s): %d data bytes\n",
-                  hostent->h_name,
-                          inet_ntop(AF_INET6, (struct in_addr6 *) &pingaddr.sin6_addr,
-                                                buf, sizeof(buf)),
+                  hostent->h_name,
+                  inet_ntop(AF_INET6, &pingaddr.sin6_addr,
+                       buf, sizeof(buf)),
                   datalen);
 
        signal(SIGINT, pingstats);
@@ -390,18 +381,18 @@ static void ping(const char *host)
        sendping(0);
 
        /* listen for replies */
-       msg.msg_name=&from;
-       msg.msg_namelen=sizeof(from);
-       msg.msg_iov=&iov;
-       msg.msg_iovlen=1;
-       msg.msg_control=control_buf;
-       iov.iov_base=packet;
-       iov.iov_len=sizeof(packet);
+       msg.msg_name = &from;
+       msg.msg_namelen = sizeof(from);
+       msg.msg_iov = &iov;
+       msg.msg_iovlen = 1;
+       msg.msg_control = control_buf;
+       iov.iov_base = packet;
+       iov.iov_len = sizeof(packet);
        while (1) {
                int c;
                struct cmsghdr *cmsgptr = NULL;
-               int hoplimit=-1;
-               msg.msg_controllen=sizeof(control_buf);
+               int hoplimit = -1;
+               msg.msg_controllen = sizeof(control_buf);
 
                if ((c = recvmsg(pingsock, &msg, 0)) < 0) {
                        if (errno == EINTR)
@@ -413,7 +404,7 @@ static void ping(const char *host)
                         cmsgptr = CMSG_NXTHDR(&msg, cmsgptr)) {
                        if (cmsgptr->cmsg_level == SOL_IPV6 &&
                                cmsgptr->cmsg_type == IPV6_HOPLIMIT ) {
-                               hoplimit=*(int*)CMSG_DATA(cmsgptr);
+                               hoplimit = *(int*)CMSG_DATA(cmsgptr);
                        }
                }
                unpack(packet, c, &from, hoplimit);
@@ -423,7 +414,7 @@ static void ping(const char *host)
        pingstats(0);
 }
 
-extern int ping6_main(int argc, char **argv)
+int ping6_main(int argc, char **argv)
 {
        char *thisarg;
 
@@ -431,7 +422,6 @@ extern int ping6_main(int argc, char **argv)
 
        argc--;
        argv++;
-       options = 0;
        /* Parse any options */
        while (argc >= 1 && **argv == '-') {
                thisarg = *argv;
@@ -447,21 +437,24 @@ extern int ping6_main(int argc, char **argv)
                        break;
                case 'c':
                        if (--argc <= 0)
-                               bb_show_usage();
+                               bb_show_usage();
                        argv++;
-                       pingcount = atoi(*argv);
+                       pingcount = xatoul(*argv);
                        break;
                case 's':
                        if (--argc <= 0)
-                               bb_show_usage();
+                               bb_show_usage();
                        argv++;
-                       datalen = atoi(*argv);
+                       datalen = xatou16(*argv);
                        break;
                case 'I':
                        if (--argc <= 0)
-                               bb_show_usage();
+                               bb_show_usage();
                        argv++;
-                       ifname = *argv;
+                       if_index = if_nametoindex(*argv);
+                       if (!if_index)
+                               bb_error_msg_and_die(
+                                       "%s: invalid interface name", *argv);
                        break;
                default:
                        bb_show_usage();
@@ -472,7 +465,7 @@ extern int ping6_main(int argc, char **argv)
        if (argc < 1)
                bb_show_usage();
 
-       myid = getpid() & 0xFFFF;
+       myid = (int16_t) getpid();
        ping(*argv);
        return EXIT_SUCCESS;
 }