FreeBSD-DCO: repair device iteration to find first free interface.
PATCH 1/1 FreeBSD-DCO: repair device iteration to find first free interface.
During review/update phase, FreeBSD/DCO's ability to find the first free tun interface on "--dev tun" got broken, due to two issues:
- create_interface() called msg(M_ERR|...), which is a fatal error and aborts OpenVPN, so "no retry with 'tun1' after 'tun0' failed"
Change to M_WARN|M_ERRNO (= warning level, add strerror(errno), return).
- open_tun_dco_generic() expects "-errno" as return value of open_tun_dco(), and breaks the loop on -EPERM. create_interface() was returning "-1" instead (ioctl() error signalling), which happens to be "-EPERM" on FreeBSD.
Change create_interface() to return -errno.
While at it, remove logging of errors from dco_freebsd.c::open_tun_dco() (because all errors from create_interface() would be already logged there), reducing open_tun_dco() to just a wrapper around create_interface().
--- src/openvpn/dco_freebsd.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)
src/openvpn/dco_freebsd.c +5 -12
@@ -178,7 +178,8 @@ create_interface(struct tuntap *tt, const char *dev) ret =ioctl (tt->dco.fd,SIOCIFCREATE2 , &ifr);if (ret) { -msg (M_ERR |M_ERRNO ,"Failed to create interface %s" , ifr.ifr_name); + ret = -errno; +msg (M_WARN |M_ERRNO ,"Failed to create interface %s (SIOCIFCREATE2)" , ifr.ifr_name);return ret; }
@@ -194,9 +195,10 @@ create_interface(struct tuntap *tt, const char *dev) ret =ioctl (tt->dco.fd,SIOCSIFNAME , &ifr);if (ret) { + ret = -errno;/* Delete the created interface again. */ (void )ioctl (tt->dco.fd,SIOCIFDESTROY , &ifr); -msg (M_ERR |M_ERRNO ,"Failed to create interface %s" , ifr.ifr_data); +msg (M_WARN |M_ERRNO ,"Failed to create interface %s (SIOCSIFNAME)" , ifr.ifr_data);return ret; }
@@ -229,16 +231,7 @@ remove_interface(struct tuntap *tt)int open_tun_dco (struct tuntap *tt,openvpn_net_ctx_t *ctx,const char *dev) { -int ret; - - ret =create_interface (tt, dev); - -if (ret <0 ) - { -msg (M_ERR ,"Failed to create interface" ); - } - -return ret; +return create_interface (tt, dev); }void
Signature · 1 line
2.37.1
Thanks!
Kristof
Quoted 70 lines · Gert Doering
During review/update phase, FreeBSD/DCO's ability to find the first free tun interface on "--dev tun" got broken, due to two issues:
-
create_interface()calledmsg(M_ERR|...), which is a fatal error and aborts OpenVPN, so "no retry with 'tun1' after 'tun0' failed"Change to M_WARN|M_ERRNO (= warning level, add strerror(errno), return).
-
open_tun_dco_generic()expects "-errno" as return value ofopen_tun_dco(), and breaks the loop on-EPERM.create_interface()was returning "-1" instead (ioctl()error signalling), which happens to be "-EPERM" on FreeBSD.Change
create_interface()to return -errno.While at it, remove logging of errors from
dco_freebsd.c::open_tun_dco()(because all errors fromcreate_interface()would be already logged there), reducingopen_tun_dco()to just a wrapper aroundcreate_interface().Signed-off-by Gert Doering <[email protected]...>--- src/openvpn/dco_freebsd.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)src/openvpn/dco_freebsd.c +5
-12@@ -178,7 +178,8 @@ create_interface(struct tuntap *tt, const char *dev) ret =ioctl (tt->dco.fd,SIOCIFCREATE2 , &ifr);if (ret) { -msg (M_ERR |M_ERRNO ,"Failed to create interface %s" , ifr.ifr_name); + ret = -errno; +msg (M_WARN |M_ERRNO ,"Failed to create interface %s (SIOCIFCREATE2)" , ifr.ifr_name);return ret; }@@ -194,9 +195,10 @@ create_interface(struct tuntap *tt, const char *dev) ret =ioctl (tt->dco.fd,SIOCSIFNAME , &ifr);if (ret) { + ret = -errno;/* Delete the created interface again. */ (void )ioctl (tt->dco.fd,SIOCIFDESTROY , &ifr); -msg (M_ERR |M_ERRNO ,"Failed to create interface %s" , ifr.ifr_data); +msg (M_WARN |M_ERRNO ,"Failed to create interface %s (SIOCSIFNAME)" , ifr.ifr_data);return ret; }@@ -229,16 +231,7 @@ remove_interface(struct tuntap *tt)int open_tun_dco (struct tuntap *tt,openvpn_net_ctx_t *ctx,const char *dev) { -int ret; - - ret =create_interface (tt, dev); - -if (ret <0 ) - { -msg (M_ERR ,"Failed to create interface" ); - } - -return ret; +return create_interface (tt, dev); }void Signature · 1 line
2.37.1
To avoid any fat fingers on my side, I've merged this and then subjected the resulting branch to a round of FreeBSD DCO server tests, which all behaved quite nicely :-) (iroute missing, because not merged yet, but the rest works - TCP [no DCO], UDP [DCO, if topology subnet], etc)
Aug 20 11:18:59 fbsd14 tun-udp-p2mp[79256]: GLOBAL_STATS,dco_enabled,1 Aug 20 11:18:59 fbsd14 tun-udp-p2mp-topology-subnet[79278]: GLOBAL_STATS,dco_enabled,1
Patch has been applied to the master branch.
commit efebdfe2de8dd5125fb42d646d03a958b7dc3eea
Author: Gert Doering Date: Fri Aug 19 20:24:39 2022 +0200
FreeBSD-DCO: repair device iteration to find first free interface.
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]/msg25034.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering