diff options
| author | Denys Vlasenko | 2015-08-24 19:08:14 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2015-08-24 20:00:17 +0200 |
| commit | 2db782bc7be70c34a756e2bc6d4a53e8f47bab20 (patch) | |
| tree | 91d372a22639996578242a259eca0b163e705826 | |
| parent | 729b70646cc748e1e88ddaec3ed542adcf7fa3da (diff) | |
| download | busybox-2db782bc7be70c34a756e2bc6d4a53e8f47bab20.zip busybox-2db782bc7be70c34a756e2bc6d4a53e8f47bab20.tar.gz | |
Merge setsockopt error messages
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/arping.c | 2 | ||||
| -rw-r--r-- | networking/ping.c | 2 | ||||
| -rw-r--r-- | networking/traceroute.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/networking/arping.c b/networking/arping.c index 8be1aac..9ac4a7c 100644 --- a/networking/arping.c +++ b/networking/arping.c @@ -358,7 +358,7 @@ int arping_main(int argc UNUSED_PARAM, char **argv) saddr.sin_addr = dst; if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, &const_int_1, sizeof(const_int_1)) == -1) - bb_perror_msg("setsockopt(SO_DONTROUTE)"); + bb_perror_msg("setsockopt(%s)", "SO_DONTROUTE"); xconnect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr)); getsockname(probe_fd, (struct sockaddr *) &saddr, &alen); //never happens: diff --git a/networking/ping.c b/networking/ping.c index c475395..20489a0 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -756,7 +756,7 @@ static void ping6(len_and_sockaddr *lsa) } if (setsockopt(pingsock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt, sizeof(filt)) < 0) - bb_error_msg_and_die("setsockopt(ICMP6_FILTER)"); + bb_error_msg_and_die("setsockopt(%s)", "ICMP6_FILTER"); } #endif /*ICMP6_FILTER*/ diff --git a/networking/traceroute.c b/networking/traceroute.c index 8557136..e41d89e 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c @@ -475,7 +475,7 @@ send_probe(int seq, int ttl) if (dest_lsa->u.sa.sa_family == AF_INET6) { res = setsockopt(sndsock, SOL_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)); if (res < 0) - bb_perror_msg_and_die("setsockopt UNICAST_HOPS %d", ttl); + bb_perror_msg_and_die("setsockopt(%s) %d", "UNICAST_HOPS", ttl); out = outip; len = packlen; } else @@ -484,7 +484,7 @@ send_probe(int seq, int ttl) #if defined IP_TTL res = setsockopt(sndsock, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl)); if (res < 0) - bb_perror_msg_and_die("setsockopt ttl %d", ttl); + bb_perror_msg_and_die("setsockopt(%s) %d", "TTL", ttl); #endif out = outicmp; len = packlen - sizeof(*outip); @@ -929,7 +929,7 @@ common_traceroute_main(int op, char **argv) if (af == AF_INET6) { static const int two = 2; if (setsockopt(rcvsock, SOL_RAW, IPV6_CHECKSUM, &two, sizeof(two)) < 0) - bb_perror_msg_and_die("setsockopt RAW_CHECKSUM"); + bb_perror_msg_and_die("setsockopt(%s)", "IPV6_CHECKSUM"); xmove_fd(xsocket(af, SOCK_DGRAM, 0), sndsock); } else #endif @@ -972,7 +972,7 @@ common_traceroute_main(int op, char **argv) #endif #ifdef IP_TOS if ((op & OPT_TOS) && setsockopt(sndsock, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) { - bb_perror_msg_and_die("setsockopt tos %d", tos); + bb_perror_msg_and_die("setsockopt(%s) %d", "TOS", tos); } #endif #ifdef IP_DONTFRAG |