From: Kristof Provost <k...@freebsd.org>
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.
Signed-off-by: Kristof Provost <kprov...@netgate.com>
---
src/openvpn/dco_freebsd.c | 33 ++++-----------------------------
src/openvpn/forward.c | 7 +++++--
2 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c
index 8e5ee436..4e03f52e 100644
--- a/src/openvpn/dco_freebsd.c
+++ b/src/openvpn/dco_freebsd.c
@@ -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
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index 622be841..1dcaabd8 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -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;
--
2.38.1
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
