httpd: reduce ifdef forest. comment out redundant PATH setting

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

diff --git a/networking/ping.c b/networking/ping.c
index 967a3e3788e5e34f2785c19f67b4e2ce74a6b199..782b801c80d3f10cd7f082ac742ec3c5b431aded 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -155,10 +155,11 @@ int ping_main(int argc, char **argv)
 #else /* ! CONFIG_FEATURE_FANCY_PING */
 /* full(er) version */
 static struct sockaddr_in pingaddr;
+static struct sockaddr_in sourceaddr;
 static int pingsock = -1;
-static int datalen; /* intentionally uninitialized to work around gcc bug */
+static unsigned datalen; /* intentionally uninitialized to work around gcc bug */
 
-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];
@@ -178,12 +179,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",
@@ -208,7 +209,7 @@ static void sendping(int junk)
        pkt->icmp_type = ICMP_ECHO;
        pkt->icmp_code = 0;
        pkt->icmp_cksum = 0;
-       pkt->icmp_seq = SWAP_BE16(ntransmitted++);
+       pkt->icmp_seq = htons(ntransmitted++);
        pkt->icmp_id = myid;
        CLR(ntohs(pkt->icmp_seq) % MAX_DUP_CHK);
 
@@ -234,7 +235,7 @@ static void sendping(int junk)
        }
 }
 
-static char *icmp_type_name (int id)
+static char *icmp_type_name(int id)
 {
        switch (id) {
        case ICMP_ECHOREPLY:            return "Echo Reply";
@@ -264,16 +265,15 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
 
        gettimeofday(&tv, NULL);
 
-       /* check IP header */
-       iphdr = (struct iphdr *) buf;
-       hlen = iphdr->ihl << 2;
        /* discard if too short */
        if (sz < (datalen + ICMP_MINLEN))
                return;
 
+       /* check IP header */
+       iphdr = (struct iphdr *) buf;
+       hlen = iphdr->ihl << 2;
        sz -= hlen;
        icmppkt = (struct icmp *) (buf + hlen);
-
        if (icmppkt->icmp_id != myid)
                return;                         /* not our ping */
 
@@ -314,11 +314,11 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
                printf(" time=%lu.%lu ms", triptime / 10, triptime % 10);
                if (dupflag)
                        printf(" (DUP!)");
-               printf("\n");
+               puts("");
        } else
                if (icmppkt->icmp_type != ICMP_ECHO)
-                       bb_error_msg("Warning: Got ICMP %d (%s)",
-                                       icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type));
+                       bb_error_msg("warning: got ICMP %d (%s)",
+                                       icmppkt->icmp_type, icmp_type_name(icmppkt->icmp_type));
        fflush(stdout);
 }
 
@@ -329,12 +329,16 @@ static void ping(const char *host)
 
        pingsock = create_icmp_socket();
 
+       if (sourceaddr.sin_addr.s_addr) {
+               xbind(pingsock, (struct sockaddr*)&sourceaddr, sizeof(sourceaddr));
+       }
+
        memset(&pingaddr, 0, sizeof(struct sockaddr_in));
 
        pingaddr.sin_family = AF_INET;
        hostent = xgethostbyname(host);
        if (hostent->h_addrtype != AF_INET)
-               bb_error_msg_and_die("unknown address type; only AF_INET is currently supported.");
+               bb_error_msg_and_die("unknown address type; only AF_INET is currently supported");
 
        memcpy(&pingaddr.sin_addr, hostent->h_addr, sizeof(pingaddr.sin_addr));
 
@@ -348,10 +352,14 @@ static void ping(const char *host)
        setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, (char *) &sockopt,
                           sizeof(sockopt));
 
-       printf("PING %s (%s): %d data bytes\n",
-                  hostent->h_name,
-                  inet_ntoa(*(struct in_addr *) &pingaddr.sin_addr.s_addr),
-                  datalen);
+       printf("PING %s (%s)",
+                       hostent->h_name,
+                       inet_ntoa(*(struct in_addr *) &pingaddr.sin_addr.s_addr));
+       if (sourceaddr.sin_addr.s_addr) {
+               printf(" from %s",
+                       inet_ntoa(*(struct in_addr *) &sourceaddr.sin_addr.s_addr));
+       }
+       printf(": %d data bytes\n", datalen);
 
        signal(SIGINT, pingstats);
 
@@ -378,6 +386,27 @@ static void ping(const char *host)
        pingstats(0);
 }
 
+/* TODO: consolidate ether-wake.c, dnsd.c, ifupdown.c, nslookup.c
+ * versions of below thing. BTW we have far too many "%u.%u.%u.%u" too...
+*/
+static int parse_nipquad(const char *str, struct sockaddr_in* addr)
+{
+       char dummy;
+       unsigned i1, i2, i3, i4;
+       if (sscanf(str, "%u.%u.%u.%u%c",
+                          &i1, &i2, &i3, &i4, &dummy) == 4
+       && ( (i1|i2|i3|i4) <= 0xff )
+       ) {
+               uint8_t* ptr = (uint8_t*)&addr->sin_addr;
+               ptr[0] = i1;
+               ptr[1] = i2;
+               ptr[2] = i3;
+               ptr[3] = i4;
+               return 0;
+       }
+       return 1; /* error */
+}
+
 int ping_main(int argc, char **argv)
 {
        char *thisarg;
@@ -386,7 +415,6 @@ int ping_main(int argc, char **argv)
 
        argc--;
        argv++;
-       options = 0;
        /* Parse any options */
        while (argc >= 1 && **argv == '-') {
                thisarg = *argv;
@@ -399,13 +427,25 @@ int ping_main(int argc, char **argv)
                        if (--argc <= 0)
                                bb_show_usage();
                        argv++;
-                       pingcount = atoi(*argv);
+                       pingcount = xatoul(*argv);
                        break;
                case 's':
                        if (--argc <= 0)
                                bb_show_usage();
                        argv++;
-                       datalen = atoi(*argv);
+                       datalen = xatou16(*argv);
+                       break;
+               case 'I':
+                       if (--argc <= 0)
+                               bb_show_usage();
+                       argv++;
+/* ping6 accepts iface too:
+                       if_index = if_nametoindex(*argv);
+                       if (!if_index) ...
+   make it true for ping too. TODO.
+*/
+                       if (parse_nipquad(*argv, &sourceaddr))
+                               bb_show_usage();
                        break;
                default:
                        bb_show_usage();