FreeBSD: for topology subnet, put tun interface into IFF_BROADCAST mode
PATCH 1/2 FreeBSD: for topology subnet, put tun interface into IFF_BROADCAST mode
For reasons unknown, OpenVPN has always put FreeBSD tun(4) interfaces into point-to-point mode (IFF_POINTOPOINT), which means "local and remote address, no on-link subnet".
"--topology subnet" was emulated by adding a subnet-route to the "remote" (which was just picking a free address from the subnet).
This works well enough for classic tun(4) interfaces that have no next-hop resolution, and routes pointing to "that fake remote" only (because all routing is done inside OpenVPN and it does not matter how packets get there) - but for ovpn(4) interfaces, it breaks iroute setup, where the route next-hop must be an on-link address.
Thus, change interface to IFF_BROADCAST mode, and get rid of all the special code needed to "fake" subnet mode.
Tested with tun(4) and ovpn(4) on FreeBSD 14, client and server, and with tun(4) on FreeBSD 12 and 7.4
To actually work with ovpn(4) / FreeBSD DCO, a followup patch for kernel ovpn(4) and OpenVPN dco_freebsd.c is needed.
--- Changes.rst | 5 +++++ src/openvpn/tun.c | 37 ++++++++++++------------------------- 2 files changed, 17 insertions(+), 25 deletions(-)
Changes.rst +5 -0
@@ -163,6 +163,11 @@ User-visible Changes - :code:`link_mtu` parameter is removed from environment or replaced with 0 when scripts are called with parameters. This parameter is unreliable and no longer internally calculated. +- FreeBSD tun interfaces with ``--topology subnet`` are now put into real + subnet mode (IFF_BROADCAST instead of IFF_POINTOPOINT) - this might upset + software that enumerates interfaces, looking for "broadcast capable?" and + expecting certain results. Normal uses should not see any difference. + Overview of changes in 2.5 ==========================
src/openvpn/tun.c +12 -25
@@ -1479,43 +1479,23 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu,#elif defined(TARGET_FREEBSD ) || defined(TARGET_DRAGONFLY ) -in_addr_t remote_end;/* for "virtual" subnet topology */ -/* example: ifconfig tun2 10.2.0.2 10.2.0.1 mtu 1450 netmask 255.255.255.255 up */ -if (tun) +if (tun)/* point-to-point tun */ {argv_printf (&argv,"%s %s %s %s mtu %d netmask 255.255.255.255 up" ,IFCONFIG_PATH , ifname, ifconfig_local, ifconfig_remote_netmask, tun_mtu); } -else if (tt->type ==DEV_TYPE_TUN && tt->topology ==TOP_SUBNET ) - { - remote_end =create_arbitrary_remote ( tt ); -argv_printf (&argv,"%s %s %s %s mtu %d netmask %s up" ,IFCONFIG_PATH , - ifname, ifconfig_local,print_in_addr_t (remote_end,0 , &gc), - tun_mtu, ifconfig_remote_netmask); - } -else +else /* tun with topology subnet and tap mode (always subnet) */ { -argv_printf (&argv,"%s %s %s netmask %s mtu %d up" ,IFCONFIG_PATH , - ifname, ifconfig_local, ifconfig_remote_netmask, tun_mtu); +int netbits =netmask_to_netbits2 (tt->remote_netmask); +argv_printf (&argv,"%s %s %s/%d mtu %d up" ,IFCONFIG_PATH , + ifname, ifconfig_local, netbits, tun_mtu ); }argv_msg (M_INFO , &argv);openvpn_execve_check (&argv, es,S_FATAL ,"FreeBSD ifconfig failed" ); -/* Add a network route for the local tun interface */ -if (!tun && tt->type ==DEV_TYPE_TUN && tt->topology ==TOP_SUBNET ) - { -struct route_ipv4 r; -CLEAR (r); - r.flags =RT_DEFINED ; - r.network = tt->local & tt->remote_netmask; - r.netmask = tt->remote_netmask; - r.gateway = remote_end; -add_route (&r, tt,0 ,NULL , es,NULL ); - } -#elif defined(TARGET_AIX ) {/* AIX ifconfig will complain if it can't find ODM path in env */
@@ -2949,12 +2929,19 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tunif (tt->fd >=0 && tt->type ==DEV_TYPE_TUN ) { +/* see "Interface Flags" in ifnet(9) */ int i =IFF_POINTOPOINT |IFF_MULTICAST ; +if (tt->topology ==TOP_SUBNET ) + { + i =IFF_BROADCAST |IFF_MULTICAST ; + }if (ioctl (tt->fd,TUNSIFMODE , &i) <0 ) {msg (M_WARN |M_ERRNO ,"ioctl(TUNSIFMODE)" ); } + +/* multi_af mode for v4+v6, see "tun(4)" */ i =1 ;if (ioctl (tt->fd,TUNSIFHEAD , &i) <0 ) {
Signature · 1 line
2.37.3
PATCH 2/2 FreeBSD DCO: introduce real subnet mode
To be able to configure a FreeBSD interface to "subnet" mode (as opposed to point-to-point mode), it needs to have its if_iflags set to IFF_BROADCAST. For tun(4) interface this is done with the TUNSIFMODE ioctl(), but this does not work for more modern interfaces like ovpn(4) which communicate over a common SIOCSDRVSPEC ioctl() that contains a "cmd" and a "parameter list".
Introduce OVPN_SET_IFMODE cmd, add dco_set_ifmode() function to put kernel interface into IFF_BROADCAST or IFF_POINTOPOINT as needed.
(This needs a kernel patch to add the OVPN_SET_IFMODE on the other side - with an older kernel, OpenVPN will just fail now)
--- src/openvpn/dco_freebsd.c | 36 ++++++++++++++++++++++++++++++++++ src/openvpn/ovpn_dco_freebsd.h | 1 + 2 files changed, 37 insertions(+)
src/openvpn/dco_freebsd.c +36 -0
@@ -165,6 +165,34 @@ ovpn_dco_init(int mode, dco_context_t *dco)return true; } +static int +dco_set_ifmode (dco_context_t *dco,int ifmode) +{ +struct ifdrv drv; +nvlist_t *nvl; +int ret; + +msg (M_INFO ,"ifmode=%08x" , ifmode); + nvl =nvlist_create (0 ); +nvlist_add_number (nvl,"ifmode" , ifmode); + +CLEAR (drv); +snprintf (drv.ifd_name,IFNAMSIZ ,"%s" , dco->ifname); + drv.ifd_cmd =OVPN_SET_IFMODE ; + drv.ifd_data =nvlist_pack (nvl, &drv.ifd_len); + + ret =ioctl (dco->fd,SIOCSDRVSPEC , &drv); +if (ret) + { +msg (M_WARN |M_ERRNO ,"Failed to set ifmode" ); + } + +free (drv.ifd_data); +nvlist_destroy (nvl); + +return ret; +} +static int create_interface (struct tuntap *tt,const char *dev) {
@@ -205,6 +233,14 @@ create_interface(struct tuntap *tt, const char *dev)snprintf (tt->dco.ifname,IFNAMSIZ ,"%s" , ifr.ifr_data); tt->actual_name =string_alloc (tt->dco.ifname,NULL ); +/* see "Interface Flags" in ifnet(9) */ +int i =IFF_POINTOPOINT |IFF_MULTICAST ; +if (tt->topology ==TOP_SUBNET ) + { + i =IFF_BROADCAST |IFF_MULTICAST ; + } +dco_set_ifmode (&tt->dco, i); +return 0 ; }
src/openvpn/ovpn_dco_freebsd.h +1 -0
@@ -60,5 +60,6 @@ enum ovpn_key_cipher {#define OVPN_SEND_PKT _IO('D', 9)#define OVPN_POLL_PKT _IO('D', 10)#define OVPN_GET_PKT _IO('D', 11) +#define OVPN_SET_IFMODE _IO('D', 12)#endif /* ifndef _NET_IF_OVPN_H_ */
Signature · 1 line
2.37.3
Re: [Openvpn-devel] [PATCH 2/2] FreeBSD DCO: introduce real subnet mode
Quoted 95 lines · Gert Doering
To be able to configure a FreeBSD interface to "subnet" mode (as opposed to point-to-point mode), it needs to have its
if_iflagsset toIFF_BROADCAST. For tun(4) interface this is done with the TUNSIFMODEioctl(), but this does not work for more modern interfaces like ovpn(4) which communicate over a common SIOCSDRVSPECioctl()that contains a "cmd" and a "parameter list".Introduce
OVPN_SET_IFMODEcmd, adddco_set_ifmode()function to put kernel interface intoIFF_BROADCASTorIFF_POINTOPOINTas needed.(This needs a kernel patch to add the
OVPN_SET_IFMODEon the other side - with an older kernel, OpenVPN will just fail now)Signed-off-by Gert Doering <[email protected]...>--- src/openvpn/dco_freebsd.c | 36 ++++++++++++++++++++++++++++++++++ src/openvpn/ovpn_dco_freebsd.h | 1 + 2 files changed, 37 insertions(+)src/openvpn/dco_freebsd.c +36
-0@@ -165,6 +165,34 @@ ovpn_dco_init(int mode, dco_context_t *dco)return true; } +static int +dco_set_ifmode (dco_context_t *dco,int ifmode) +{ +struct ifdrv drv; +nvlist_t *nvl; +int ret; + +msg (M_INFO ,"ifmode=%08x" , ifmode); + nvl =nvlist_create (0 ); +nvlist_add_number (nvl,"ifmode" , ifmode); + +CLEAR (drv); +snprintf (drv.ifd_name,IFNAMSIZ ,"%s" , dco->ifname); + drv.ifd_cmd =OVPN_SET_IFMODE ; + drv.ifd_data =nvlist_pack (nvl, &drv.ifd_len); + + ret =ioctl (dco->fd,SIOCSDRVSPEC , &drv); +if (ret) + { +msg (M_WARN |M_ERRNO ,"Failed to set ifmode" ); + } + +free (drv.ifd_data); +nvlist_destroy (nvl); + +return ret; +} +static int create_interface (struct tuntap *tt,const char *dev) {@@ -205,6 +233,14 @@ create_interface(struct tuntap *tt, const char *dev)snprintf (tt->dco.ifname,IFNAMSIZ ,"%s" , ifr.ifr_data); tt->actual_name =string_alloc (tt->dco.ifname,NULL ); +/* see "Interface Flags" in ifnet(9) */ +int i =IFF_POINTOPOINT |IFF_MULTICAST ; +if (tt->topology ==TOP_SUBNET ) + { + i =IFF_BROADCAST |IFF_MULTICAST ; + } +dco_set_ifmode (&tt->dco, i); +return 0 ; }src/openvpn/ovpn_dco_freebsd.h +1
-0@@ -60,5 +60,6 @@ enum ovpn_key_cipher {#define OVPN_SEND_PKT _IO('D', 9)#define OVPN_POLL_PKT _IO('D', 10)#define OVPN_GET_PKT _IO('D', 11) +#define OVPN_SET_IFMODE _IO('D', 12)#endif /* ifndef _NET_IF_OVPN_H_ */ Signature · 8 lines
2.37.3 _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
[Openvpn-devel] [PATCH applied] Re: FreeBSD DCO: introduce real subnet mode
In reply to Gert DoeringThanks, Kristof for the review, and for merging the kernel side.
I have added the kernel commit ID to the commit message for this patch ("if the kernel is too old, SET_IFMODE will fail and topology subnet will not work") - and verified that this is indeed the result, p2p mode with net30 works, subnet fails. And of course, tested with a newer if_ovpn.ko, and all works :-)
I have also taken the liberty to remove the debug message printing the ifmode to-be-set, and to add the ifmode + 'dco_set_ifmode:' to the error message, so log file output is more useful.
Patch has been applied to the master branch.
commit 22bc63c78439ed23b974b8f822330d75ec79c7fc
Author: Gert Doering Date: Wed Oct 12 16:59:15 2022 +0200
FreeBSD DCO: introduce real subnet mode
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Kristof Provost <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg25395.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
Quoted 126 lines · Gert Doering
For reasons unknown, OpenVPN has always put FreeBSD tun(4) interfaces into point-to-point mode (
IFF_POINTOPOINT), which means "local and remote address, no on-link subnet"."--topology subnet" was emulated by adding a subnet-route to the "remote" (which was just picking a free address from the subnet).
This works well enough for classic tun(4) interfaces that have no next-hop resolution, and routes pointing to "that fake remote" only (because all routing is done inside OpenVPN and it does not matter how packets get there) - but for ovpn(4) interfaces, it breaks iroute setup, where the route next-hop must be an on-link address.
Thus, change interface to
IFF_BROADCASTmode, and get rid of all the special code needed to "fake" subnet mode.Tested with tun(4) and ovpn(4) on FreeBSD 14, client and server, and with tun(4) on FreeBSD 12 and 7.4
To actually work with ovpn(4) / FreeBSD DCO, a followup patch for kernel ovpn(4) and OpenVPN
dco_freebsd.cis needed.Signed-off-by Gert Doering <[email protected]...>--- Changes.rst | 5 +++++ src/openvpn/tun.c | 37 ++++++++++++------------------------- 2 files changed, 17 insertions(+), 25 deletions(-)Changes.rst +5
-0@@ -163,6 +163,11 @@ User-visible Changes - :code:`link_mtu` parameter is removed from environment or replaced with 0 when scripts are called with parameters. This parameter is unreliable and no longer internally calculated. +- FreeBSD tun interfaces with ``--topology subnet`` are now put into real + subnet mode (IFF_BROADCAST instead of IFF_POINTOPOINT) - this might upset + software that enumerates interfaces, looking for "broadcast capable?" and + expecting certain results. Normal uses should not see any difference. + Overview of changes in 2.5 ==========================src/openvpn/tun.c +12
-25@@ -1479,43 +1479,23 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu,#elif defined(TARGET_FREEBSD ) || defined(TARGET_DRAGONFLY ) -in_addr_t remote_end;/* for "virtual" subnet topology */ -/* example: ifconfig tun2 10.2.0.2 10.2.0.1 mtu 1450 netmask 255.255.255.255 up */ -if (tun) +if (tun)/* point-to-point tun */ {argv_printf (&argv,"%s %s %s %s mtu %d netmask 255.255.255.255 up" ,IFCONFIG_PATH , ifname, ifconfig_local, ifconfig_remote_netmask, tun_mtu); } -else if (tt->type ==DEV_TYPE_TUN && tt->topology ==TOP_SUBNET ) - { - remote_end =create_arbitrary_remote ( tt ); -argv_printf (&argv,"%s %s %s %s mtu %d netmask %s up" ,IFCONFIG_PATH , - ifname, ifconfig_local,print_in_addr_t (remote_end,0 , &gc), - tun_mtu, ifconfig_remote_netmask); - } -else +else /* tun with topology subnet and tap mode (always subnet) */ { -argv_printf (&argv,"%s %s %s netmask %s mtu %d up" ,IFCONFIG_PATH , - ifname, ifconfig_local, ifconfig_remote_netmask, tun_mtu); +int netbits =netmask_to_netbits2 (tt->remote_netmask); +argv_printf (&argv,"%s %s %s/%d mtu %d up" ,IFCONFIG_PATH , + ifname, ifconfig_local, netbits, tun_mtu ); }argv_msg (M_INFO , &argv);openvpn_execve_check (&argv, es,S_FATAL ,"FreeBSD ifconfig failed" ); -/* Add a network route for the local tun interface */ -if (!tun && tt->type ==DEV_TYPE_TUN && tt->topology ==TOP_SUBNET ) - { -struct route_ipv4 r; -CLEAR (r); - r.flags =RT_DEFINED ; - r.network = tt->local & tt->remote_netmask; - r.netmask = tt->remote_netmask; - r.gateway = remote_end; -add_route (&r, tt,0 ,NULL , es,NULL ); - } -#elif defined(TARGET_AIX ) {/* AIX ifconfig will complain if it can't find ODM path in env */ @@ -2949,12 +2929,19 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tunif (tt->fd >=0 && tt->type ==DEV_TYPE_TUN ) { +/* see "Interface Flags" in ifnet(9) */ int i =IFF_POINTOPOINT |IFF_MULTICAST ; +if (tt->topology ==TOP_SUBNET ) + { + i =IFF_BROADCAST |IFF_MULTICAST ; + }if (ioctl (tt->fd,TUNSIFMODE , &i) <0 ) {msg (M_WARN |M_ERRNO ,"ioctl(TUNSIFMODE)" ); } + +/* multi_af mode for v4+v6, see "tun(4)" */ i =1 ;if (ioctl (tt->fd,TUNSIFHEAD , &i) <0 ) {Signature · 8 lines
2.37.3 _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Thanks for the review, Kristof.
Just to be sure, I've run this through extensive client/server tests on FreeBSD 14 + 12.3 again. Still works :-)
(Except that this patch, as documented, breaks "topology subnet with DCO"
- to be fixed in the next commit)
Patch has been applied to the master branch.
commit 94db32616597497e57eb2fa6fab05297da314a53
Author: Gert Doering Date: Wed Oct 12 16:59:14 2022 +0200
FreeBSD: for topology subnet, put tun interface into IFF_BROADCAST mode
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Kristof Provost <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg25396.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering