diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-02-08 14:34:48 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-02-08 14:34:48 +0100 |
| commit | c259669fa33ca13b5c6ae60eb8ffa0874ddc01b2 (patch) | |
| tree | 09003c2fa4d614b1e4f1fb10d16fba21acb56b4d /sysdep | |
| parent | 82f42ea09176afdb67ab119258d714e8c8e54d12 (diff) | |
| parent | da65a3d898fde0ce567782d86919a66e29916ed7 (diff) | |
Merge branch 'master' into int-new
Diffstat (limited to 'sysdep')
| -rw-r--r-- | sysdep/bsd/sysio.h | 5 | ||||
| -rw-r--r-- | sysdep/linux/netlink.c | 1 | ||||
| -rw-r--r-- | sysdep/unix/io.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sysdep/bsd/sysio.h b/sysdep/bsd/sysio.h index 0c5f8fbb..0e895e20 100644 --- a/sysdep/bsd/sysio.h +++ b/sysdep/bsd/sysio.h @@ -9,6 +9,7 @@ #include <net/if_dl.h> #include <netinet/in_systm.h> // Workaround for some BSDs #include <netinet/ip.h> +#include <sys/param.h> #ifdef __NetBSD__ @@ -179,8 +180,8 @@ sk_prepare_ip_header(sock *s, void *hdr, int dlen) ip->ip_src = ipa_to_in4(s->saddr); ip->ip_dst = ipa_to_in4(s->daddr); -#ifdef __OpenBSD__ - /* OpenBSD expects ip_len in network order, other BSDs expect host order */ +#if (defined __OpenBSD__) || (defined __DragonFly__) || (defined __FreeBSD__ && (__FreeBSD_version >= 1100030)) + /* Different BSDs have different expectations of ip_len endianity */ ip->ip_len = htons(ip->ip_len); #endif } diff --git a/sysdep/linux/netlink.c b/sysdep/linux/netlink.c index ee2cd125..554f2c97 100644 --- a/sysdep/linux/netlink.c +++ b/sysdep/linux/netlink.c @@ -1608,6 +1608,7 @@ nl_async_hook(sock *sk, uint size UNUSED) * One day we might react to it by asking for route table * scan in near future. */ + log(L_WARN "Kernel dropped some netlink messages, will resync on next scan."); return 1; /* More data are likely to be ready */ } else if (errno != EWOULDBLOCK) diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index c8916378..6722fc69 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -2631,7 +2631,8 @@ io_loop(void) if (pfd[s->index].revents & (POLLHUP | POLLERR)) { sk_err(s, pfd[s->index].revents); - goto next2; + if (s != current_sock) + goto next2; } current_sock = sk_next(s); |