From d07ba72570dd5624913701fecf3244e1fa5c1438 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 2 Aug 2018 15:36:32 +0900 Subject: resolve: treat some icmp errors as disconnected Fixes #9773. (cherry picked from commit 68c597e9e4bb36ade966d9df54dfaa9f956230e9) --- src/basic/fd-util.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/basic/fd-util.h') diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h index 2e5616cb7..b2d5b11a9 100644 --- a/src/basic/fd-util.h +++ b/src/basic/fd-util.h @@ -84,8 +84,12 @@ int fd_duplicate_data_fd(int fd); #endif // 0 /* Hint: ENETUNREACH happens if we try to connect to "non-existing" special IP addresses, such as ::5 */ -#define ERRNO_IS_DISCONNECT(r) \ - IN_SET(r, ENOTCONN, ECONNRESET, ECONNREFUSED, ECONNABORTED, EPIPE, ENETUNREACH) +/* The kernel sends e.g., EHOSTUNREACH or ENONET to userspace in some ICMP error cases. + * See the icmp_err_convert[] in net/ipv4/icmp.c in the kernel sources */ +#define ERRNO_IS_DISCONNECT(r) \ + IN_SET(r, \ + ENOTCONN, ECONNRESET, ECONNREFUSED, ECONNABORTED, EPIPE, \ + ENETUNREACH, EHOSTUNREACH, ENOPROTOOPT, EHOSTDOWN, ENONET) /* Resource exhaustion, could be our fault or general system trouble */ #define ERRNO_IS_RESOURCE(r) \ -- cgit v1.2.3