From: Maxim Khon <fjoe@samodelkin.net>
Date: Mon, 18 Aug 2025 12:05:42 +0000 (+0000)
Subject: Use SSH_TUN_COMPAT_AF on FreeBSD.
X-Git-Tag: V_10_1_P1~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67a8bf4e4057597170bfa923fe2ce5bf90c43974;p=thirdparty%2Fopenssh-portable.git

Use SSH_TUN_COMPAT_AF on FreeBSD.

Otherwise tun forwarding from other OSes fails as soon as the first IPv6
message is sent by the other side (which is usually a Router Solicitation
ICMPv6 message which is sent as soon as the interface is up): all other
OS'es use SSH_TUN_COMPAT_AF or SSH_TUN_PREPEND_AF which effectively uses
OpenBSD AF_INET/AF_INET6 values.
---

diff --git a/configure.ac b/configure.ac
index df3869324..530875e85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1120,6 +1120,8 @@ mips-sony-bsd|mips-sony-newsos4)
 *-*-freebsd*)
 	AC_DEFINE([LOCKED_PASSWD_PREFIX], ["*LOCKED*"], [Account locked with pw(1)])
 	AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way])
+	AC_DEFINE([SSH_TUN_COMPAT_AF], [1],
+	    [Use tunnel device compatibility to OpenBSD])
 	AC_CHECK_HEADER([net/if_tap.h], ,
 	    AC_DEFINE([SSH_TUN_NO_L2], [1], [No layer 2 tunnel support]))
 	AC_DEFINE([BROKEN_GLOB], [1], [FreeBSD glob does not do what we need])