Message ID | 20230220090601.983-1-lstipakov@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [Openvpn-devel,v2] Disabe DCO if proxy is set via management | expand |
Hi, On 20/02/2023 10:06, Lev Stipakov wrote: > From: Lev Stipakov <lev@openvpn.net> > > DCO doesn't support proxy and we already disable DCO > is proxy is set in profile. > > Signed-off-by: Lev Stipakov <lev@openvpn.net> Acked-by: Antonio Quartulli <a@unstable.cc> > --- > v2: use dco_enabled() helper function > > src/openvpn/init.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/src/openvpn/init.c b/src/openvpn/init.c > index b500d354..622239f6 100644 > --- a/src/openvpn/init.c > +++ b/src/openvpn/init.c > @@ -223,6 +223,12 @@ management_callback_proxy_cmd(void *arg, const char **p) > } > else if (p[2] && p[3]) > { > + if (dco_enabled(&c->options)) > + { > + msg(M_INFO, "Proxy set via management, disabling Data Channel Offload."); > + c->options.tuntap_options.disable_dco = true; > + } > + > if (streq(p[1], "HTTP")) > { > struct http_proxy_options *ho;
Patch looks reasonable. Not tested beyond "does it compile on Linux and MinGW?". Your patch has been applied to the master and release/2.6 branch. commit 45a1cb2ad85a50feded10dad706132bd8a7f6133 (master) commit 42cda5ad9e8542a48385eb2e0b7807773aa341f1 (release/2.6) Author: Lev Stipakov Date: Mon Feb 20 11:06:01 2023 +0200 Disable DCO if proxy is set via management Signed-off-by: Lev Stipakov <lev@openvpn.net> Acked-by: Antonio Quartulli <a@unstable.cc> Message-Id: <20230220090601.983-1-lstipakov@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26287.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index b500d354..622239f6 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -223,6 +223,12 @@ management_callback_proxy_cmd(void *arg, const char **p) } else if (p[2] && p[3]) { + if (dco_enabled(&c->options)) + { + msg(M_INFO, "Proxy set via management, disabling Data Channel Offload."); + c->options.tuntap_options.disable_dco = true; + } + if (streq(p[1], "HTTP")) { struct http_proxy_options *ho;