: FreeBSD DCO support
PATCH 1/1 : FreeBSD DCO support
Hi,
Here's the latest revision of the FreeBSD DCO patch, as well as three DCO-related fixes.
Best regards,
Kristof
PATCH 1/4 Handle (DCO) timeouts in client mode
From: Kristof Provost <[email protected]...>
Handle the DCO driver telling us that the peer went away, even if we're not running in multi-instance mode.
--- src/openvpn/forward.c | 6 ++++++ 1 file changed, 6 insertions(+)
src/openvpn/forward.c +6 -0
@@ -1111,6 +1111,12 @@ process_incoming_dco(struct context *c)dco_do_read (dco); +if (dco->dco_message_type ==OVPN_CMD_DEL_PEER ) + { +trigger_ping_timeout_signal (c); +return ; + } +if (dco->dco_message_type !=OVPN_CMD_PACKET ) { msg(D_DCO_DEBUG, "%s: received message of type %u - ignoring", __func__,
Signature · 1 line
2.36.0
Re: [Openvpn-devel] [PATCH 1/4] Handle (DCO) timeouts in client mode
Hi,
Quoted 6 lines · Kristof Provost via Openvpn-devel
From: Kristof Provost <[email protected]...>
Handle the DCO driver telling us that the peer went away, even if we're not running in multi-instance mode.
Signed-off-by Kristof Provost <[email protected]...>
I squashed this change in the dco branch.
Thanks a lot!
Regards,
Signature · 1 line
Antonio Quartulli
PATCH 2/4 rework do_up() for correct order of DCO operations
In reply to Kristof ProvostFrom: Kristof Provost <[email protected]...>
We must create the peer before we can dco_set_peer or dco_new_key. On the other hand, we must first process options, because those may change our peer id and we should create the peer with the correct id.
Split up do_deferred_options() in do_deferred_options() and finish_options(). Call any DCO configuration operations (i.e. dco_set_peer()/dco_new_key()) after we've created the peer (i.e. dco_new_peer()).
--- src/openvpn/init.c | 112 +++++++++++++++++++++++++------------------- src/openvpn/init.h | 2 + src/openvpn/multi.c | 2 + 3 files changed, 68 insertions(+), 48 deletions(-)
src/openvpn/init.c +64 -48
@@ -2100,26 +2100,26 @@ do_up(struct context *c, bool pulled_options, unsigned int option_types_found) } } -if ((c->mode ==MODE_POINT_TO_POINT ) && c->c2.did_open_tun) +if (pulled_options) { -/* If we are in DCO mode we need to set the new peer options now */ -int ret =dco_p2p_add_new_peer (c); -if (ret <0 ) +if (!do_deferred_options (c, option_types_found)) { -msg (D_DCO ,"Cannot add peer to DCO: %s" ,strerror (-ret)); +msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" );return false; } } - -if (pulled_options) +if (c->mode ==MODE_POINT_TO_POINT ) { -if (!do_deferred_options (c, option_types_found)) +/* If we are in DCO mode we need to set the new peer options now */ +int ret =dco_p2p_add_new_peer (c); +if (ret <0 ) { -msg (D_PUSH_ERRORS ,"ERROR: Failed to apply push options" ); +msg (D_DCO ,"Cannot add peer to DCO: %s" ,strerror (-ret));return false; } } -else if (c->mode ==MODE_POINT_TO_POINT ) + +if (!pulled_options && c->mode ==MODE_POINT_TO_POINT ) {if (!do_deferred_p2p_ncp (c)) {
@@ -2128,6 +2128,13 @@ do_up(struct context *c, bool pulled_options, unsigned int option_types_found) } } + +if (!finish_options (c)) + { +msg (D_TLS_ERRORS ,"ERROR: Failed to finish option processing" ); +return false; + } +if (c->c2.did_open_tun) { c->c1.pulled_options_digest_save = c->c2.pulled_options_digest;
@@ -2344,49 +2351,58 @@ do_deferred_options(struct context *c, const unsigned int found) {return false; } -struct frame *frame_fragment =NULL ; + } + +return true; +} + +bool +finish_options (struct context *c) +{ +if (!c->options.pull || !dco_enabled (&c->options)) + { +return true; + } + +struct frame *frame_fragment =NULL ;#ifdef ENABLE_FRAGMENT -if (c->options.ce.fragment) - { - frame_fragment = &c->c2.frame_fragment; - } +if (c->options.ce.fragment) + { + frame_fragment = &c->c2.frame_fragment; + }#endif -struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE ]; -if (!tls_session_update_crypto_params (c->c2.tls_multi, session, - &c->options, &c->c2.frame, - frame_fragment, -get_link_socket_info (c))) - { -msg (D_TLS_ERRORS ,"OPTIONS ERROR: failed to import crypto options" ); -return false; - } +struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE ]; +if (!tls_session_update_crypto_params (c->c2.tls_multi, session, + &c->options, &c->c2.frame, + frame_fragment, +get_link_socket_info (c))) + { +msg (D_TLS_ERRORS ,"OPTIONS ERROR: failed to import crypto options" ); +return false; + } -if (dco_enabled (&c->options)) - { -/* Check if the pushed options are compatible with DCO if we have -* DCO enabled */ -if (!check_dco_pull_options (&c->options)) - { -msg (D_TLS_ERRORS ,"OPTIONS ERROR: pushed options are incompatible with " -"data channel offload. Use --disable-dco to connect" -"to this server" ); -return false; - } +/* Check if the pushed options are compatible with DCO if we have +* DCO enabled */ +if (!check_dco_pull_options (&c->options)) + { +msg (D_TLS_ERRORS ,"OPTIONS ERROR: pushed options are incompatible with " +"data channel offload. Use --disable-dco to connect" +"to this server" ); +return false; + } -if (c->options.ping_send_timeout || c->c2.frame.mss_fix) - { -int ret =dco_set_peer (&c->c1.tuntap->dco, - c->c2.tls_multi->peer_id, - c->options.ping_send_timeout, - c->options.ping_rec_timeout, - c->c2.frame.mss_fix); -if (ret <0 ) - { -msg (D_DCO ,"Cannot set DCO peer: %s" ,strerror (-ret)); -return false; - } - } +if (c->options.ping_send_timeout || c->c2.frame.mss_fix) + { +int ret =dco_set_peer (&c->c1.tuntap->dco, + c->c2.tls_multi->peer_id, + c->options.ping_send_timeout, + c->options.ping_rec_timeout, + c->c2.frame.mss_fix); +if (ret <0 ) + { +msg (D_DCO ,"Cannot set DCO peer: %s" ,strerror (-ret)); +return false; } }return true;
src/openvpn/init.h +2 -0
@@ -97,6 +97,8 @@ void reset_coarse_timers(struct context *c);bool do_deferred_options (struct context *c,const unsigned int found); +bool finish_options (struct context *c); +void inherit_context_child (struct context *dest,const struct context *src);
src/openvpn/multi.c +2 -0
@@ -2452,6 +2452,8 @@ multi_client_connect_late_setup(struct multi_context *m, mi->context.c2.tls_multi->multi_state =CAS_FAILED ; } +finish_options (&mi->context); +/* send push reply if ready */ if (mi->context.c2.push_request_received) {
Signature · 1 line
2.36.0
Re: [Openvpn-devel] [PATCH 2/4] rework do_up() for correct order of DCO operations
Quoted 221 lines · Kristof Provost
From: Kristof Provost <[email protected]...>
We must create the peer before we can
dco_set_peerordco_new_key. On the other hand, we must first process options, because those may change our peer id and we should create the peer with the correct id.Split up
do_deferred_options()indo_deferred_options()andfinish_options(). Call any DCO configuration operations (i.e. dco_set_peer()/dco_new_key()) after we've created the peer (i.e.dco_new_peer()).Signed-off-by Kristof Provost <[email protected]...>--- src/openvpn/init.c | 112 +++++++++++++++++++++++++------------------- src/openvpn/init.h | 2 + src/openvpn/multi.c | 2 + 3 files changed, 68 insertions(+), 48 deletions(-)src/openvpn/init.c +1
-2@@ -2100,26 +2100,26 @@ do_up(struct context *c, bool pulled_options, unsigned int option_types_found) } } -if ((c->mode ==MODE_POINT_TO_POINT ) && c->c2.did_open_tun) +if (pulled_options) { -/* If we are in DCO mode we need to set the new peer options now */
src/openvpn/init.c +1
-3-int ret =dco_p2p_add_new_peer (c); -if (ret <0 ) +if (!do_deferred_options (c, option_types_found)) { - msg(D_DCO, "Cannot add peer to DCO: %s",strerror(-ret));
+ msg(D_PUSH_ERRORS, "ERROR: Failed to apply pushoptions"); return false; } }src/openvpn/init.c +2
-3- -if (pulled_options) +if (c->mode ==MODE_POINT_TO_POINT ) { -if (!do_deferred_options (c, option_types_found)) +/* If we are in DCO mode we need to set the new peer options now */
src/openvpn/init.c +2
-1+int ret =dco_p2p_add_new_peer (c); +if (ret <0 ) { - msg(D_PUSH_ERRORS, "ERROR: Failed to apply pushoptions");
+ msg(D_DCO, "Cannot add peer to DCO: %s",strerror(-ret)); return false; } }src/openvpn/init.c +9
-1-else if (c->mode ==MODE_POINT_TO_POINT ) + +if (!pulled_options && c->mode ==MODE_POINT_TO_POINT ) {if (!do_deferred_p2p_ncp (c)) {@@ -2128,6 +2128,13 @@ do_up(struct context *c, bool pulled_options, unsigned int option_types_found) } } + +if (!finish_options (c)) + { +msg (D_TLS_ERRORS ,"ERROR: Failed to finish option processing"); +return false; + } +if (c->c2.did_open_tun){ c->c1.pulled_options_digest_save =
c->c2.pulled_options_digest;src/openvpn/init.c +27
-17@@ -2344,49 +2351,58 @@ do_deferred_options(struct context *c, const unsigned int found) {return false; } -struct frame *frame_fragment =NULL ; + } + +return true; +} + +bool +finish_options (struct context *c) +{ +if (!c->options.pull || !dco_enabled (&c->options)) + { +return true; + } + +struct frame *frame_fragment =NULL ;#ifdef ENABLE_FRAGMENT -if (c->options.ce.fragment) - { - frame_fragment = &c->c2.frame_fragment; - } +if (c->options.ce.fragment) + { + frame_fragment = &c->c2.frame_fragment; + }#endif -struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE ]; -if (!tls_session_update_crypto_params (c->c2.tls_multi, session, - &c->options, &c->c2.frame, - frame_fragment, - get_link_socket_info(c))) - { -msg (D_TLS_ERRORS ,"OPTIONS ERROR: failed to import crypto options"); -return false; - } + struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE ]; +if (!tls_session_update_crypto_params (c->c2.tls_multi, session, + &c->options, &c->c2.frame, + frame_fragment, +get_link_socket_info (c))) + { +msg (D_TLS_ERRORS ,"OPTIONS ERROR: failed to import crypto options"); +return false; + } - if (dco_enabled(&c->options)) - { -/* Check if the pushed options are compatible with DCO if we have
src/openvpn/init.c +0
-4-* DCO enabled */ -if (!check_dco_pull_options (&c->options)) - { - msg(D_TLS_ERRORS, "OPTIONS ERROR: pushed options areincompatible with "
- "data channel offload. Use --disable-dco to
connect"src/openvpn/init.c +5
-3- "to this server"); -return false; - } +/* Check if the pushed options are compatible with DCO if we have +* DCO enabled */ +if (!check_dco_pull_options (&c->options)) + { + msg(D_TLS_ERRORS, "OPTIONS ERROR: pushed options areincompatible with "
src/openvpn/init.c +4
-10+"data channel offload. Use --disable-dco to connect" + "to this server"); +return false; + } -if (c->options.ping_send_timeout || c->c2.frame.mss_fix) - { -int ret =dco_set_peer (&c->c1.tuntap->dco, - c->c2.tls_multi->peer_id, - c->options.ping_send_timeout, - c->options.ping_rec_timeout, - c->c2.frame.mss_fix); -if (ret <0 ) - { - msg(D_DCO, "Cannot set DCO peer: %s",strerror(-ret));
src/openvpn/init.c +11
-3-return false; - } - } +if (c->options.ping_send_timeout || c->c2.frame.mss_fix) + { +int ret =dco_set_peer (&c->c1.tuntap->dco, + c->c2.tls_multi->peer_id, + c->options.ping_send_timeout, + c->options.ping_rec_timeout, + c->c2.frame.mss_fix); +if (ret <0 ) + { +msg (D_DCO ,"Cannot set DCO peer: %s" ,strerror (-ret)); +return false; } }return true;src/openvpn/init.h +2
-0@@ -97,6 +97,8 @@ void reset_coarse_timers(struct context *c);bool do_deferred_options (struct context *c,const unsigned int found); +bool finish_options (struct context *c); +void inherit_context_child (struct context *dest,const struct context *src);src/openvpn/multi.c +2
-0@@ -2452,6 +2452,8 @@ multi_client_connect_late_setup(struct multi_context *m, mi->context.c2.tls_multi->multi_state =CAS_FAILED ; } +finish_options (&mi->context); +/* send push reply if ready */ if (mi->context.c2.push_request_received)
Quoted 2 lines
{This patch isn’t quite right. It works well for DCO, but breaks non-DCO. It fails to call tls_session_update_crypto_params() if DCO is disabled. It needs this on top of it:
commit ee846144a46b20b889ab1966246f789f3266c2f9 (HEAD -> tmp_v10) Author: Kristof Provost <[email protected]...> Date: Thu May 5 19:36:13 2022 +0200 Fix finish_options() to perform the required work for non-DCO modes We still need to run tls_session_update_crypto_params(), even when DCO is not enabled. diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 7083b803..ab59cbd7 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2374,7 +2374,7 @@ do_deferred_options(struct context *c, const unsigned int found) bool finish_options(struct context *c) { - if (!c->options.pull || !dco_enabled(&c->options)) + if (!c->options.pull) { return true; } @@ -2399,7 +2399,7 @@ finish_options(struct context *c) /* Check if the pushed options are compatible with DCO if we have * DCO enabled */ - if (!check_dco_pull_options(&c->options)) + if (dco_enabled(&c->options) && !check_dco_pull_options(&c->options)) { msg(D_TLS_ERRORS, "OPTIONS ERROR: pushed options are incompatible with " "data channel offload. Use --disable-dco to connect" @@ -2407,7 +2407,7 @@ finish_options(struct context *c) return false; } - if (c->options.ping_send_timeout || c->c2.frame.mss_fix) + if (dco_enabled(&c->options) && (c->options.ping_send_timeout || c->c2.frame.mss_fix)) { int ret = dco_set_peer(&c->c1.tuntap->dco, c->c2.tls_multi->peer_id,
I’ll post an updated series in due course, but wanted to point this issue out already.
Kristof
PATCH 3/4 Ensure dynamic_name is always populated
In reply to Kristof ProvostFrom: Kristof Provost <[email protected]...>
It's always used for open_tun_dco(), so we must ensure it's populated, even if 'dev_node' is set.
--- src/openvpn/tun.c | 1 + 1 file changed, 1 insertion(+)
src/openvpn/tun.c +1 -0
@@ -1755,6 +1755,7 @@ open_tun_generic(const char *dev, const char *dev_type, const char *dev_node,if (dev_node) {openvpn_snprintf (tunname,sizeof (tunname),"%s" , dev_node); +strncpynt (dynamic_name, dev,sizeof (dynamic_name)); }else {
Signature · 1 line
2.36.0
Re: [Openvpn-devel] [PATCH 3/4] Ensure dynamic_name is always populated
Hi,
Quoted 6 lines · Kristof Provost via Openvpn-devel
From: Kristof Provost <[email protected]...>
It's always used for
open_tun_dco(), so we must ensure it's populated, even if 'dev_node' is set.Signed-off-by Kristof Provost <[email protected]...
I squashed this change in the dco branch.
Thanks a lot!
Regards,
Signature · 1 line
Antonio Quartulli
PATCH 4/4 ovpn-dco: introduce FreeBSD data-channel offload support
In reply to Kristof ProvostFrom: Kristof Provost <[email protected]...>
Implement data-channel offload for FreeBSD. The implementation and flow is very similar to that of the Linux DCO support.
--- configure.ac | 6 +- src/openvpn/Makefile.am | 1 + src/openvpn/dco_freebsd.c | 636 +++++++++++++++++++++++++++++++++ src/openvpn/dco_freebsd.h | 59 +++ src/openvpn/dco_internal.h | 1 + src/openvpn/forward.c | 8 +- src/openvpn/mtcp.c | 6 +- src/openvpn/mudp.c | 2 +- src/openvpn/multi.c | 2 +- src/openvpn/options.c | 8 +- src/openvpn/ovpn_dco_freebsd.h | 64 ++++ src/openvpn/tun.c | 8 +- src/openvpn/tun.h | 6 + 13 files changed, 789 insertions(+), 18 deletions(-) create mode 100644 src/openvpn/dco_freebsd.c create mode 100644 src/openvpn/dco_freebsd.h create mode 100644 src/openvpn/ovpn_dco_freebsd.h
configure.ac +5 -1
@@ -787,7 +787,11 @@ dnl AC_DEFINE(ENABLE_DCO, 1, [Enable data channel offload for Linux]) AC_MSG_NOTICE([Enabled ovpn-dco support for Linux]) ;; - + *-*-freebsd*) + LIBS="${LIBS} -lnv" + AC_DEFINE(ENABLE_DCO, 1, [Enable data channel offload for FreeBSD]) + AC_MSG_NOTICE([Enabled ovpn-dco support for FreeBSD]) + ;; *-mingw*) AC_MSG_NOTICE([NOTE: --enable-dco ignored on Windows because it's always enabled]) ;;
src/openvpn/Makefile.am +1 -0
@@ -54,6 +54,7 @@ openvpn_SOURCES = \ crypto_openssl.c crypto_openssl.h \ crypto_mbedtls.c crypto_mbedtls.h \ dco.c dco.h dco_internal.h \ + dco_freebsd.c dco_freebsd.h \ dco_linux.c dco_linux.h \ dco_win.c dco_win.h \ dhcp.c dhcp.h \
src/openvpn/dco_freebsd.c new file +636 -0
636 lines not on this page · raw message
src/openvpn/dco_freebsd.h new file +59 -0
59 lines not on this page · raw message
src/openvpn/dco_internal.h +1 -0
@@ -27,6 +27,7 @@#if defined(ENABLE_DCO ) +#include "dco_freebsd.h" #include "dco_linux.h" #include "dco_win.h"
src/openvpn/forward.c +4 -4
@@ -1105,7 +1105,7 @@ process_incoming_link(struct context *c)static void process_incoming_dco (struct context *c) { -#if defined(ENABLE_DCO ) && defined(TARGET_LINUX ) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ))struct link_socket_info *lsi =get_link_socket_info (c);dco_context_t *dco = &c->c1.tuntap->dco;
@@ -1658,7 +1658,7 @@ process_outgoing_link(struct context *c)socks_preprocess_outgoing_link (c, &to_addr, &size_delta);/* Send packet */ -#ifdef TARGET_LINUX +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )if (c->c2.link_socket->info.dco_installed) { size = dco_do_write(&c->c1.tuntap->dco,
@@ -1933,7 +1933,7 @@ io_wait_dowork(struct context *c, const unsigned int flags)#ifdef ENABLE_ASYNC_PUSH static int file_shift =FILE_SHIFT ;#endif -#ifdef TARGET_LINUX +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )static int dco_shift =DCO_SHIFT ;/* Event from DCO linux kernel module */ #endif
@@ -2043,7 +2043,7 @@ io_wait_dowork(struct context *c, const unsigned int flags)*/ socket_set (c->c2.link_socket, c->c2.event_set, socket, (void *)&socket_shift,NULL );tun_set (c->c1.tuntap, c->c2.event_set, tuntap, (void *)&tun_shift,NULL ); -#if defined(TARGET_LINUX ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )if (socket &EVENT_READ && c->c2.did_open_tun) {dco_event_set (&c->c1.tuntap->dco, c->c2.event_set, (void *)&dco_shift);
src/openvpn/mtcp.c +3 -3
@@ -281,7 +281,7 @@ multi_tcp_wait(const struct context *c, }#endif tun_set (c->c1.tuntap, mtcp->es,EVENT_READ ,MTCP_TUN , persistent); -#if defined(TARGET_LINUX ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )dco_event_set (&c->c1.tuntap->dco, mtcp->es,MTCP_DCO );#endif
@@ -400,7 +400,7 @@ multi_tcp_wait_lite(struct multi_context *m, struct multi_instance *mi, const intv_clear (&c->c2.timeval);/* ZERO-TIMEOUT */ -#if defined(TARGET_LINUX ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )if (mi && mi->context.c2.link_socket->info.dco_installed) {/* If we got a socket that has been handed over to the kernel
@@ -763,7 +763,7 @@ multi_tcp_process_io(struct multi_context *m)multi_tcp_action (m, mi,TA_INITIAL , false); } } -#if defined(ENABLE_DCO ) && defined(TARGET_LINUX ) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ))/* incoming data on DCO? */ else if (e->arg == MTCP_DCO) {
src/openvpn/mudp.c +1 -1
@@ -227,7 +227,7 @@ multi_process_io_udp(struct multi_context *m)multi_process_file_closed (m, mpp_flags); }#endif -#if defined(ENABLE_DCO ) && defined(TARGET_LINUX ) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) else if (status & DCO_READ) {if (!IS_SIG (&m->top))
src/openvpn/multi.c +1 -1
@@ -3158,7 +3158,7 @@ multi_signal_instance(struct multi_context *m, struct multi_instance *mi, const }#endif -#if defined(ENABLE_DCO ) && defined(TARGET_LINUX ) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ))static void process_incoming_dco_packet (struct multi_context *m,struct multi_instance *mi,dco_context_t *dco) {
src/openvpn/options.c +4 -4
@@ -181,7 +181,7 @@ static const char usage_message[] =" does not begin with \"tun\" or \"tap\".\n" "--dev-node node : Explicitly set the device node rather than using\n" " /dev/net/tun, /dev/tun, /dev/tap, etc.\n" -#if defined(ENABLE_DCO ) && defined(TARGET_LINUX ) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) "--disable-dco : Do not attempt using Data Channel Offload.\n"#endif "--lladdr hw : Set the link layer address of the tap device.\n"
@@ -1680,7 +1680,7 @@ show_settings(const struct options *o)SHOW_STR (dev);SHOW_STR (dev_type);SHOW_STR (dev_node); -#if defined(ENABLE_DCO ) && defined(TARGET_LINUX ) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ))SHOW_BOOL (tuntap_options.disable_dco);#endif SHOW_STR (lladdr);
@@ -3442,7 +3442,7 @@ options_postprocess_mutate(struct options *o) }/* check if any option should force disabling DCO */ -#if defined(TARGET_LINUX ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) o->tuntap_options.disable_dco =dco_check_option_conflict (D_DCO , o);#endif
@@ -5805,7 +5805,7 @@ add_option(struct options *options,#endif else if (streq(p[0], "disable-dco") || streq(p[0], "dco-disable")) { -#if defined(TARGET_LINUX ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) options->tuntap_options.disable_dco = true;#endif }
src/openvpn/ovpn_dco_freebsd.h new file +64 -0
64 lines not on this page · raw message
src/openvpn/tun.c +4 -4
@@ -1797,7 +1797,7 @@ open_tun_generic(const char *dev, const char *dev_type, const char *dev_node, "/dev/%s%d", dev, i);openvpn_snprintf (dynamic_name,sizeof (dynamic_name),"%s%d" , dev, i); -#ifdef TARGET_LINUX +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )if (!tt->options.disable_dco) {if (open_tun_dco (tt, ctx, dynamic_name) ==0 )
@@ -1832,7 +1832,7 @@ open_tun_generic(const char *dev, const char *dev_type, const char *dev_node, } } -#ifdef TARGET_LINUX +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )if (!tt->options.disable_dco) {if (!dynamic_opened)
@@ -2012,7 +2012,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun {open_null (tt); } -#if defined(TARGET_LINUX ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) else if (!tt->options.disable_dco) {open_tun_generic (dev, dev_type,NULL , true, tt, ctx);
@@ -2268,7 +2268,7 @@ close_tun(struct tuntap *tt, openvpn_net_ctx_t *ctx)net_ctx_reset (ctx); } -#ifdef TARGET_LINUX +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )if (!tt->options.disable_dco) {close_tun_dco (tt, ctx);
src/openvpn/tun.h +6 -0
@@ -145,6 +145,12 @@ struct tuntap_options {bool disable_dco; }; +#elif defined(TARGET_FREEBSD ) + +struct tuntap_options { +bool disable_dco; +}; +#else /* if defined(_WIN32) || defined(TARGET_ANDROID) */ struct tuntap_options {
Signature · 1 line
2.36.0