diff options
Diffstat (limited to 'networking/ping.c')
-rw-r--r-- | networking/ping.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/networking/ping.c b/networking/ping.c index b534c74c7..a47342fee 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -184,8 +184,8 @@ create_icmp_socket(void) | |||
184 | sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */ | 184 | sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */ |
185 | if (sock < 0) { | 185 | if (sock < 0) { |
186 | if (errno == EPERM) | 186 | if (errno == EPERM) |
187 | bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); | 187 | bb_simple_error_msg_and_die(bb_msg_perm_denied_are_you_root); |
188 | bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); | 188 | bb_simple_perror_msg_and_die(bb_msg_can_not_create_raw_socket); |
189 | } | 189 | } |
190 | 190 | ||
191 | xmove_fd(sock, pingsock); | 191 | xmove_fd(sock, pingsock); |
@@ -235,7 +235,7 @@ static void ping4(len_and_sockaddr *lsa) | |||
235 | #endif | 235 | #endif |
236 | if (c < 0) { | 236 | if (c < 0) { |
237 | if (errno != EINTR) | 237 | if (errno != EINTR) |
238 | bb_perror_msg("recvfrom"); | 238 | bb_simple_perror_msg("recvfrom"); |
239 | continue; | 239 | continue; |
240 | } | 240 | } |
241 | if (c >= 76) { /* ip + icmp */ | 241 | if (c >= 76) { /* ip + icmp */ |
@@ -280,7 +280,7 @@ static void ping6(len_and_sockaddr *lsa) | |||
280 | #endif | 280 | #endif |
281 | if (c < 0) { | 281 | if (c < 0) { |
282 | if (errno != EINTR) | 282 | if (errno != EINTR) |
283 | bb_perror_msg("recvfrom"); | 283 | bb_simple_perror_msg("recvfrom"); |
284 | continue; | 284 | continue; |
285 | } | 285 | } |
286 | if (c >= ICMP_MINLEN) { /* icmp6_hdr */ | 286 | if (c >= ICMP_MINLEN) { /* icmp6_hdr */ |
@@ -482,7 +482,7 @@ static void sendping_tail(void (*sp)(int), int size_pkt) | |||
482 | * it doesn't matter */ | 482 | * it doesn't matter */ |
483 | sz = xsendto(pingsock, G.snd_packet, size_pkt, &pingaddr.sa, sizeof(pingaddr)); | 483 | sz = xsendto(pingsock, G.snd_packet, size_pkt, &pingaddr.sa, sizeof(pingaddr)); |
484 | if (sz != size_pkt) | 484 | if (sz != size_pkt) |
485 | bb_error_msg_and_die(bb_msg_write_error); | 485 | bb_simple_error_msg_and_die(bb_msg_write_error); |
486 | 486 | ||
487 | if (pingcount == 0 || G.ntransmitted < pingcount) { | 487 | if (pingcount == 0 || G.ntransmitted < pingcount) { |
488 | /* Didn't send all pings yet - schedule next in -i SEC interval */ | 488 | /* Didn't send all pings yet - schedule next in -i SEC interval */ |
@@ -723,7 +723,7 @@ static void ping4(len_and_sockaddr *lsa) | |||
723 | if (source_lsa) { | 723 | if (source_lsa) { |
724 | if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF, | 724 | if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF, |
725 | &source_lsa->u.sa, source_lsa->len)) | 725 | &source_lsa->u.sa, source_lsa->len)) |
726 | bb_error_msg_and_die("can't set multicast source interface"); | 726 | bb_simple_error_msg_and_die("can't set multicast source interface"); |
727 | xbind(pingsock, &source_lsa->u.sa, source_lsa->len); | 727 | xbind(pingsock, &source_lsa->u.sa, source_lsa->len); |
728 | } | 728 | } |
729 | 729 | ||
@@ -757,7 +757,7 @@ static void ping4(len_and_sockaddr *lsa) | |||
757 | (struct sockaddr *) &from, &fromlen); | 757 | (struct sockaddr *) &from, &fromlen); |
758 | if (c < 0) { | 758 | if (c < 0) { |
759 | if (errno != EINTR) | 759 | if (errno != EINTR) |
760 | bb_perror_msg("recvfrom"); | 760 | bb_simple_perror_msg("recvfrom"); |
761 | continue; | 761 | continue; |
762 | } | 762 | } |
763 | c = unpack4(G.rcv_packet, c, &from); | 763 | c = unpack4(G.rcv_packet, c, &from); |
@@ -838,7 +838,7 @@ static void ping6(len_and_sockaddr *lsa) | |||
838 | c = recvmsg(pingsock, &msg, 0); | 838 | c = recvmsg(pingsock, &msg, 0); |
839 | if (c < 0) { | 839 | if (c < 0) { |
840 | if (errno != EINTR) | 840 | if (errno != EINTR) |
841 | bb_perror_msg("recvfrom"); | 841 | bb_simple_perror_msg("recvfrom"); |
842 | continue; | 842 | continue; |
843 | } | 843 | } |
844 | for (mp = CMSG_FIRSTHDR(&msg); mp; mp = CMSG_NXTHDR(&msg, mp)) { | 844 | for (mp = CMSG_FIRSTHDR(&msg); mp; mp = CMSG_NXTHDR(&msg, mp)) { |