diff options
| author | Petr Vorel <petr.vorel@gmail.com> | 2018-08-11 14:53:37 +0200 |
|---|---|---|
| committer | David Heidelberg <david@ixit.cz> | 2018-10-15 23:01:57 +0200 |
| commit | 340036f7cb8e7f1203561745d3c34d3621ef6906 (patch) | |
| tree | 96324a3cc1956f7700dcf6c243d6c6c9d85c3362 | |
| parent | b73976e5f19ea5ec61ddf3153cb0390e2227b112 (diff) | |
| download | iputils-340036f7cb8e7f1203561745d3c34d3621ef6906.tar.gz | |
ping: Fallback raw protocol for EPROTONOSUPPORT also on IPv4
Commit d141cb6 ("ping: work with older kernels that don't support ping
sockets") fixed #54 with handling EPROTONOSUPPORT for IPv6. But some
systems return EPROTONOSUPPORT also for IPv4 (Debian 9.5 based container
with kernel 4.10).
NOTE: inet_create() (IPv4) and inet6_create() (IPv6) implementations in
kernel also returns ESOCKTNOSUPPORT (Socket type not supported), but we
check that with assert:
assert(socktype == SOCK_DGRAM || socktype == SOCK_RAW);
Fixes: #129
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
| -rw-r--r-- | ping.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -136,10 +136,12 @@ static void create_socket(socket_st *sock, int family, int socktype, int protoco * * OpenVZ 2.6.32-042stab113.11 and possibly other older kernels return * EPROTONOSUPPORT for all IPv6 ping socket creation attempts due to lack - * of support in the kernel. Fallback to raw socket is necessary. - * - * https://github.com/iputils/iputils/issues/54 + * of support in the kernel [1]. Debian 9.5 based container with kernel 4.10 + * returns EPROTONOSUPPORT also for IPv4 [2]. Fallback to raw socket is + * necessary. * + * [1] https://github.com/iputils/iputils/issues/54 + * [2] https://github.com/iputils/iputils/issues/129 */ if (socktype == SOCK_DGRAM) sock->fd = socket(family, socktype, protocol); @@ -147,7 +149,7 @@ static void create_socket(socket_st *sock, int family, int socktype, int protoco /* Kernel doesn't support ping sockets. */ if (sock->fd == -1 && errno == EAFNOSUPPORT && family == AF_INET) do_fallback = 1; - if (sock->fd == -1 && errno == EPROTONOSUPPORT && family == AF_INET6) + if (sock->fd == -1 && errno == EPROTONOSUPPORT) do_fallback = 1; /* User is not allowed to use ping sockets. */ |