wget: don't be careless with xstrdup'ing

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

diff --git a/networking/ping.c b/networking/ping.c
index 18fb926ad28ad8202a9c7ef1e6b89c6e059ea35d..a81472f9672bf3ffeb4c7b7bb10443c3a29250c9 100644 (file)
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -209,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);
 
@@ -235,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";
@@ -318,7 +318,7 @@ static void unpack(char *buf, int sz, struct sockaddr_in *from)
        } else
                if (icmppkt->icmp_type != ICMP_ECHO)
                        bb_error_msg("Warning: Got ICMP %d (%s)",
-                                       icmppkt->icmp_type, icmp_type_name (icmppkt->icmp_type));
+                                       icmppkt->icmp_type, icmp_type_name(icmppkt->icmp_type));
        fflush(stdout);
 }
 
@@ -330,8 +330,7 @@ static void ping(const char *host)
        pingsock = create_icmp_socket();
 
        if (sourceaddr.sin_addr.s_addr) {
-               if (bind(pingsock, (struct sockaddr*)&sourceaddr, sizeof(sourceaddr)) == -1)
-                       bb_error_msg_and_die("could not bind to address");
+               xbind(pingsock, (struct sockaddr*)&sourceaddr, sizeof(sourceaddr));
        }
 
        memset(&pingaddr, 0, sizeof(struct sockaddr_in));