: FreeBSD DCO can use the socket for control packets
PATCH 1/1 : FreeBSD DCO can use the socket for control packets
Hi,
The next e-mail has a patch to teach OpenVPN it can pass control packets through the socket on FreeBSD. This patch does that, and also removes the now unused dco_do_write() implementation.
Best regards,
Kristof
PATCH 1/1 dco: pass control packets through the socket on FreeBSD
From: Kristof Provost <[email protected]...>
FreeBSD allows packets to be sent through the socket even when the if_dco driver is active, so prefer that path.
Also remove the FreeBSD dco_do_write() implementation, as this function will never be called any more on FreeBSD. Assert this.
--- src/openvpn/dco_freebsd.c | 33 ++++----------------------------- src/openvpn/forward.c | 7 +++++-- 2 files changed, 9 insertions(+), 31 deletions(-)
src/openvpn/dco_freebsd.c +4 -29
@@ -536,35 +536,10 @@ dco_do_read(dco_context_t *dco)int dco_do_write (dco_context_t *dco,int peer_id,struct buffer *buf) { -struct ifdrv drv; -nvlist_t *nvl; -int ret; - - nvl =nvlist_create (0 ); - -nvlist_add_binary (nvl,"packet" ,BSTR (buf),BLEN (buf)); -nvlist_add_number (nvl,"peerid" , peer_id); - -CLEAR (drv); -snprintf (drv.ifd_name,IFNAMSIZ ,"%s" , dco->ifname); - drv.ifd_cmd =OVPN_SEND_PKT ; - drv.ifd_data =nvlist_pack (nvl, &drv.ifd_len); - - ret =ioctl (dco->fd,SIOCSDRVSPEC , &drv); -if (ret) - { -msg (M_WARN |M_ERRNO ,"Failed to send control packet" ); - ret = -errno; - } -else - { - ret =BLEN (buf); - } - -free (drv.ifd_data); -nvlist_destroy (nvl); - -return ret; +/* Control packets are passed through the socket, so this should never get +* called. See should_use_dco_socket(). */ +assert (false); +return -EINVAL ; }bool
src/openvpn/forward.c +5 -2
@@ -1635,20 +1635,23 @@ process_ip_header(struct context *c, unsigned int flags, struct buffer *buf) } } -/* Linux-like DCO implementations pass the socket to the kernel and +/* Linux DCO implementations pass the socket to the kernel and * disallow usage of it from userland, so (control) packets sent and * received by OpenVPN need to go through the DCO interface. * * Windows DCO needs control packets to be sent via the normal * standard Overlapped I/O. * +* FreeBSD DCO allows control packets to pass through the socket in both +* directions. +* * Hide that complexity (...especially if more platforms show up * in the future...) in a small inline function. */ static inline bool should_use_dco_socket (struct link_socket_actual *actual) { -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(TARGET_LINUX )return actual->dco_installed;#else return false;
Signature · 1 line
2.38.1
Re: [Openvpn-devel] [PATCH] dco: pass control packets through the socket on FreeBSD
Hi,
Quoted 2 lines · Kristof Provost via Openvpn-devel
Also remove the FreeBSD
dco_do_write()implementation, as this function will never be called any more on FreeBSD. Assert this.
[..]
src/openvpn/dco_freebsd.c dco_do_read(dco_context_t *dco) · line 542
Quoted 3 lines
src/openvpn/dco_freebsd.c +3
-0+* called. See should_use_dco_socket(). */ +assert (false); +return -EINVAL ;
The patch works fine (tested on the FreeBSD 14 "current of a few weeks ago" server rig), *but* the coding police says that we need to have an "ASSERT(0)" here (uppercase)...
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...PATCH 1/1 dco: pass control packets through the socket on FreeBSD
In reply to Kristof ProvostFrom: Kristof Provost <[email protected]...>
FreeBSD allows packets to be sent through the socket even when the if_dco driver is active, so prefer that path.
Also remove the FreeBSD dco_do_write() implementation, as this function will never be called any more on FreeBSD. Assert this.
--- src/openvpn/dco_freebsd.c | 33 ++++----------------------------- src/openvpn/forward.c | 7 +++++-- 2 files changed, 9 insertions(+), 31 deletions(-)
src/openvpn/dco_freebsd.c +4 -29
@@ -536,35 +536,10 @@ dco_do_read(dco_context_t *dco)int dco_do_write (dco_context_t *dco,int peer_id,struct buffer *buf) { -struct ifdrv drv; -nvlist_t *nvl; -int ret; - - nvl =nvlist_create (0 ); - -nvlist_add_binary (nvl,"packet" ,BSTR (buf),BLEN (buf)); -nvlist_add_number (nvl,"peerid" , peer_id); - -CLEAR (drv); -snprintf (drv.ifd_name,IFNAMSIZ ,"%s" , dco->ifname); - drv.ifd_cmd =OVPN_SEND_PKT ; - drv.ifd_data =nvlist_pack (nvl, &drv.ifd_len); - - ret =ioctl (dco->fd,SIOCSDRVSPEC , &drv); -if (ret) - { -msg (M_WARN |M_ERRNO ,"Failed to send control packet" ); - ret = -errno; - } -else - { - ret =BLEN (buf); - } - -free (drv.ifd_data); -nvlist_destroy (nvl); - -return ret; +/* Control packets are passed through the socket, so this should never get +* called. See should_use_dco_socket(). */ +ASSERT (0 ); +return -EINVAL ; }bool
src/openvpn/forward.c +5 -2
@@ -1635,20 +1635,23 @@ process_ip_header(struct context *c, unsigned int flags, struct buffer *buf) } } -/* Linux-like DCO implementations pass the socket to the kernel and +/* Linux DCO implementations pass the socket to the kernel and * disallow usage of it from userland, so (control) packets sent and * received by OpenVPN need to go through the DCO interface. * * Windows DCO needs control packets to be sent via the normal * standard Overlapped I/O. * +* FreeBSD DCO allows control packets to pass through the socket in both +* directions. +* * Hide that complexity (...especially if more platforms show up * in the future...) in a small inline function. */ static inline bool should_use_dco_socket (struct link_socket_actual *actual) { -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(TARGET_LINUX )return actual->dco_installed;#else return false;
Signature · 1 line
2.38.1
[Openvpn-devel] [PATCH applied] Re: dco: pass control packets through the socket on FreeBSD
Straightforward enough :-) - we discussed this at the hackathon today, and FreeBSD DCO does not "consume" the socket, it just hooks into it and takes out "interesting" packet - so normal userland operation is still possible. Support for "floating client control message" is still missing, but that's shared with Linux DCO (and we'll see an API show up soonish).
Tested (v1) on FreeBSD 14 "-CURRENT a few weeks old", and unsurprisingly, everything still works fine. v2 only differs in assert(false) vs. ASSERT(0), so not tested again.
TODO on me: actually come up with an automated test case for float clients.
Your patch has been applied to the master branch.
commit 4cf58f4920b430481b772e5f9e9877f9686d3995
Author: Kristof Provost Date: Sat Nov 26 10:08:51 2022 +0100
dco: pass control packets through the socket on FreeBSD
Signed-off-by: Kristof Provost <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg25542.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering