ping: don't measure times if ping payload is less than 8 bytes;

commonalize some ping code.


git-svn-id: svn://busybox.net/trunk/busybox@17999 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 8 insertions, 12 deletions

diff --git a/libbb/create_icmp6_socket.c b/libbb/create_icmp6_socket.c
index c3d1b5578..b90f3e9fd 100644
--- a/libbb/create_icmp6_socket.c
+++ b/libbb/create_icmp6_socket.c
@@ -10,8 +10,6 @@
 #include <sys/types.h>
 #include <netdb.h>
 #include <sys/socket.h>
-#include <errno.h>
-#include <unistd.h>
 #include "libbb.h"
 
 #ifdef CONFIG_FEATURE_IPV6
@@ -23,12 +21,12 @@ int create_icmp6_socket(void)
         proto = getprotobyname("ipv6-icmp");
         /* if getprotobyname failed, just silently force
          * proto->p_proto to have the correct value for "ipv6-icmp" */
-        if ((sock = socket(AF_INET6, SOCK_RAW,
-                        (proto ? proto->p_proto : IPPROTO_ICMPV6))) < 0) {
+        sock = socket(AF_INET6, SOCK_RAW,
+                        (proto ? proto->p_proto : IPPROTO_ICMPV6));
+        if (sock < 0) {
                 if (errno == EPERM)
                         bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-                else
-                        bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
         }
 
         /* drop root privs if running setuid */
diff --git a/libbb/create_icmp_socket.c b/libbb/create_icmp_socket.c
index 431c4d8a7..666454888 100644
--- a/libbb/create_icmp_socket.c
+++ b/libbb/create_icmp_socket.c
@@ -10,8 +10,6 @@
 #include <sys/types.h>
 #include <netdb.h>
 #include <sys/socket.h>
-#include <errno.h>
-#include <unistd.h>
 #include "libbb.h"
 
 int create_icmp_socket(void)
@@ -22,12 +20,12 @@ int create_icmp_socket(void)
         proto = getprotobyname("icmp");
         /* if getprotobyname failed, just silently force
          * proto->p_proto to have the correct value for "icmp" */
-        if ((sock = socket(AF_INET, SOCK_RAW,
-                        (proto ? proto->p_proto : 1))) < 0) {        /* 1 == ICMP */
+        sock = socket(AF_INET, SOCK_RAW,
+                        (proto ? proto->p_proto : 1)); /* 1 == ICMP */
+        if (sock < 0) {        
                 if (errno == EPERM)
                         bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
-                else
-                        bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+                bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
         }
 
         /* drop root privs if running setuid */