diff options
| author | Bernhard Schmidt <berni@debian.org> | 2018-10-14 22:51:08 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2018-10-14 22:51:08 +0200 |
| commit | 87c2fd4310e5b345102d7a4915dc5e3a65052305 (patch) | |
| tree | b7dc3d6d209bdb926c9e1ece7f9639aa1724b39e /src/openvpn/tun.c | |
| parent | 3804bc2606a92e2f2f4b3a2b043af0d77d92b386 (diff) | |
Revert "Merge branch 'stretch' of ssh://git.debian.org/git/collab-maint/openvpn into stretch"
This reverts commit 3804bc2606a92e2f2f4b3a2b043af0d77d92b386, reversing
changes made to 678cfd249add7ca758e4c41933c7b730132c99f4.
Diffstat (limited to 'src/openvpn/tun.c')
| -rw-r--r-- | src/openvpn/tun.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index a4f7779..f812844 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -840,7 +840,7 @@ delete_route_connected_v6_net(struct tuntap *tt, #endif /* if defined(_WIN32) || defined(TARGET_DARWIN) || defined(TARGET_NETBSD) || defined(TARGET_OPENBSD) */ #if defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY) \ - || defined(TARGET_OPENBSD) || defined(__FreeBSD_kernel__) + || defined(TARGET_OPENBSD) /* we can't use true subnet mode on tun on all platforms, as that * conflicts with IPv6 (wants to use ND then, which we don't do), * but the OSes want "a remote address that is different from ours" @@ -1408,7 +1408,7 @@ do_ifconfig(struct tuntap *tt, add_route_connected_v6_net(tt, es); } -#elif defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY) || defined(__FreeBSD_kernel__) +#elif defined(TARGET_FREEBSD) || defined(TARGET_DRAGONFLY) in_addr_t remote_end; /* for "virtual" subnet topology */ @@ -2762,7 +2762,7 @@ read_tun(struct tuntap *tt, uint8_t *buf, int len) } } -#elif defined(TARGET_FREEBSD)||defined(__FreeBSD_kernel__) +#elif defined(TARGET_FREEBSD) static inline int freebsd_modify_read_write_return(int len) |