ntpd: remove some code which is at best unneeded and at worst wrong

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

diff --git a/networking/ping.c b/networking/ping.c
index 71b2a4be8812e47dcb3c54346974ea47a654ecd5..4e770bdbdf5bc26c5fa82b30052a9a811d69080f 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -30,13 +30,13 @@
 #include "libbb.h"
 
 #if ENABLE_PING6
-#include <netinet/icmp6.h>
+# include <netinet/icmp6.h>
 /* I see RENUMBERED constants in bits/in.h - !!?
  * What a fuck is going on with libc? Is it a glibc joke? */
-#ifdef IPV6_2292HOPLIMIT
-#undef IPV6_HOPLIMIT
-#define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
-#endif
+# ifdef IPV6_2292HOPLIMIT
+#  undef IPV6_HOPLIMIT
+#  define IPV6_HOPLIMIT IPV6_2292HOPLIMIT
+# endif
 #endif
 
 enum {
@@ -173,13 +173,14 @@ static void ping6(len_and_sockaddr *lsa)
 }
 #endif
 
-int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ping_main(int argc UNUSED_PARAM, char **argv)
+#if !ENABLE_PING6
+# define common_ping_main(af, argv) common_ping_main(argv)
+#endif
+static int common_ping_main(sa_family_t af, char **argv)
 {
        len_and_sockaddr *lsa;
-#if ENABLE_PING6
-       sa_family_t af = AF_UNSPEC;
 
+#if ENABLE_PING6
        while ((++argv)[0] && argv[0][0] == '-') {
                if (argv[0][1] == '4') {
                        af = AF_INET;
@@ -491,7 +492,7 @@ static void unpack_tail(int sz, uint32_t *tp,
        if (tp)
                printf(" time=%u.%03u ms", triptime / 1000, triptime % 1000);
        puts(dupmsg);
-       fflush(stdout);
+       fflush_all();
 }
 static void unpack4(char *buf, int sz, struct sockaddr_in *from)
 {
@@ -689,7 +690,8 @@ static void ping6(len_and_sockaddr *lsa)
                         /* don't check len - we trust the kernel: */
                         /* && mp->cmsg_len >= CMSG_LEN(sizeof(int)) */
                        ) {
-                               hoplimit = *(int*)CMSG_DATA(mp);
+                               /*hoplimit = *(int*)CMSG_DATA(mp); - unaligned access */
+                               move_from_unaligned_int(hoplimit, CMSG_DATA(mp));
                        }
                }
                unpack6(packet, c, /*&from,*/ hoplimit);
@@ -716,18 +718,16 @@ static void ping(len_and_sockaddr *lsa)
                ping4(lsa);
 }
 
-int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ping_main(int argc UNUSED_PARAM, char **argv)
+static int common_ping_main(int opt, char **argv)
 {
        len_and_sockaddr *lsa;
        char *str_s;
-       int opt;
 
        INIT_G();
 
        /* exactly one argument needed; -v and -q don't mix; -c NUM, -w NUM, -W NUM */
        opt_complementary = "=1:q--v:v--q:c+:w+:W+";
-       opt = getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
+       opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &deadline, &timeout, &str_I);
        if (opt & OPT_s)
                datalen = xatou16(str_s); // -s
        if (opt & OPT_I) { // -I
@@ -765,13 +765,25 @@ int ping_main(int argc UNUSED_PARAM, char **argv)
 #endif /* FEATURE_FANCY_PING */
 
 
+int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ping_main(int argc UNUSED_PARAM, char **argv)
+{
+#if !ENABLE_FEATURE_FANCY_PING
+       return common_ping_main(AF_UNSPEC, argv);
+#else
+       return common_ping_main(0, argv);
+#endif
+}
+
 #if ENABLE_PING6
 int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ping6_main(int argc UNUSED_PARAM, char **argv)
 {
-       argv[0] = (char*)"-6";
-       return ping_main(0 /* argc+1 - but it's unused anyway */,
-                       argv - 1);
+# if !ENABLE_FEATURE_FANCY_PING
+       return common_ping_main(AF_INET6, argv);
+# else
+       return common_ping_main(OPT_IPV6, argv);
+# endif
 }
 #endif