diff options
| author | Tom Gundersen <teg@jklm.no> | 2016-01-25 20:28:38 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2016-01-25 20:28:38 +0100 |
| commit | f49ce89edf37a20abed923782dd8176d6c0e7166 (patch) | |
| tree | 5174563e958ef5be22eebd7d9b848d37e724a911 /src/basic | |
| parent | 164228707d7785a27316e2f28be7068044127016 (diff) | |
| parent | 6c1e69f9456d022f14dd00737126cfa4d9cca10c (diff) | |
Merge pull request #2392 from poettering/dnssec18
eightteenth dnssec patch
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/fd-util.h | 3 | ||||
| -rw-r--r-- | src/basic/missing.h | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h index 973413ff42..20890e3279 100644 --- a/src/basic/fd-util.h +++ b/src/basic/fd-util.h @@ -74,5 +74,6 @@ void cmsg_close_all(struct msghdr *mh); bool fdname_is_valid(const char *s); +/* 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) + IN_SET(r, ENOTCONN, ECONNRESET, ECONNREFUSED, ECONNABORTED, EPIPE, ENETUNREACH) diff --git a/src/basic/missing.h b/src/basic/missing.h index c187afa287..6ed2133ed1 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -1149,3 +1149,14 @@ static inline key_serial_t request_key(const char *type, const char *description #ifndef PR_CAP_AMBIENT_CLEAR_ALL #define PR_CAP_AMBIENT_CLEAR_ALL 4 #endif + +/* The following two defines are actually available in the kernel headers for longer, but we define them here anyway, + * since that makes it easier to use them in conjunction with the glibc net/if.h header which conflicts with + * linux/if.h. */ +#ifndef IF_OPER_UNKNOWN +#define IF_OPER_UNKNOWN 0 +#endif + +#ifndef IF_OPER_UP +#define IF_OPER_UP 6 +#endif |