42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 8d50c14252031c5f5d0d222f6d21acdc396035b0 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Fri, 6 Nov 2020 14:30:25 +0100
|
|
Subject: [PATCH] errno: ETIMEDOUT is also a connection error
|
|
|
|
Conflict: NA
|
|
Reference:https://github.com/systemd/systemd/commit/8d50c14252031c5f5d0d222f6d21acdc396035b0
|
|
|
|
---
|
|
src/basic/errno-util.h | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h
|
|
index 0ca650f48f..383615c288 100644
|
|
--- a/src/basic/errno-util.h
|
|
+++ b/src/basic/errno-util.h
|
|
@@ -50,7 +50,10 @@ static inline int errno_or_else(int fallback) {
|
|
/* Hint #1: ENETUNREACH happens if we try to connect to "non-existing" special IP addresses, such as ::5.
|
|
*
|
|
* Hint #2: 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 */
|
|
+ * icmp_err_convert[] in net/ipv4/icmp.c in the kernel sources.
|
|
+ *
|
|
+ * Hint #3: When asynchronous connect() on TCP fails because the host never acknowledges a single packet,
|
|
+ * kernel tells us that with ETIMEDOUT, see tcp(7). */
|
|
static inline bool ERRNO_IS_DISCONNECT(int r) {
|
|
return IN_SET(abs(r),
|
|
ECONNABORTED,
|
|
@@ -66,7 +69,8 @@ static inline bool ERRNO_IS_DISCONNECT(int r) {
|
|
ENOTCONN,
|
|
EPIPE,
|
|
EPROTO,
|
|
- ESHUTDOWN);
|
|
+ ESHUTDOWN,
|
|
+ ETIMEDOUT);
|
|
}
|
|
|
|
/* Transient errors we might get on accept() that we should ignore. As per error handling comment in
|
|
--
|
|
2.23.0
|
|
|