source: freewrt/package/busybox/patches/350-ping-opt-srcaddr.patch@ 1d8c05f

include/usage.h

@@ -2350 +2350 @@
         "Options:\n" \
         "\t-c COUNT\tSend only COUNT pings\n" \
         "\t-s SIZE\t\tSend SIZE data bytes in packets (default=56)\n" \
+        "\t-I IPADDR\tUse IPADDR as source address.\n" \
         "\t-q\t\tQuiet mode, only displays output at start\n" \
         "\t\t\tand when finished"
 #endif

networking/ping.c

@@ -153 +153 @@
 #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 */
 
@@ -330 +331 @@
 
         pingsock = create_icmp_socket();
 
+        if (sourceaddr.sin_addr.s_addr != 0) {
+                if (bind(pingsock, (struct sockaddr*)&sourceaddr, sizeof(sourceaddr)) == -1)
+                        bb_error_msg_and_die("could not bind to address");
+        }
+
         memset(&pingaddr, 0, sizeof(struct sockaddr_in));
 
         pingaddr.sin_family = AF_INET;
@@ -349 +355 @@
         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 != 0) {
+                printf(" from %s",
+                        inet_ntoa(*(struct in_addr *) &sourceaddr.sin_addr.s_addr));
+        }
+        printf(": %d data bytes\n", datalen);
 
         signal(SIGINT, pingstats);
 
@@ -388 +398 @@
         argc--;
         argv++;
         options = 0;
+        memset(&sourceaddr, 0, sizeof(sourceaddr));
         /* Parse any options */
         while (argc >= 1 && **argv == '-') {
                 thisarg = *argv;
@@ -408 +419 @@
                         argv++;
                         datalen = atoi(*argv);
                         break;
+                case 'I':
+                        if (--argc <= 0)
+                                bb_show_usage();
+                        argv++;
+                        {
+                                char dummy;
+                                int i1, i2, i3, i4;
+                                if (sscanf(*argv, "%u.%u.%u.%u%c",
+                                                   &i1, &i2, &i3, &i4, &dummy) == 4) {
+                                        unsigned char* ptr;
+                                        ptr = (unsigned char*)&sourceaddr.sin_addr;
+                                        ptr[0] = i1;
+                                        ptr[1] = i2;
+                                        ptr[2] = i3;
+                                        ptr[3] = i4;
+                                }
+                                else {
+                                        bb_show_usage();
+                                }
+                        }
+                        break;
                 default:
                         bb_show_usage();
                 }