diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-01-17 13:21:25 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-01-17 13:21:25 +0100 |
| commit | f6e6c3b5a5997ffc67d96785bbde76bcec072890 (patch) | |
| tree | f6b32027c56b89df39e257a12b191dbf649bdfa6 /sysdep/bsd | |
| parent | 017da76b729cc36c4a3416995b06386235660f42 (diff) | |
Fix IP_HDRINCL usage on FreeBSD 11
FreeBSD 11 changed endianity of ip_len field from host order to network
order. Also DragonFly BSD allegedly expects network order here.
Thanks to Olivier Cochard-Labbé for the patch.
Diffstat (limited to 'sysdep/bsd')
| -rw-r--r-- | sysdep/bsd/sysio.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdep/bsd/sysio.h b/sysdep/bsd/sysio.h index 2610a47b..9b10e6e8 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 } |