From: "d12fk (Code Review)"
Date: Thu, 3 Jul 2025 19:41:36 +0000
References:
Reply-To: heiko@...515..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="kFr4GWJZkCE="; charset=UTF-8
Subject: [Openvpn-devel] [XS] Change in openvpn[master]: dns: do not run
updown scripts with lwipovpn
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , flichtenheld
Cc: openvpn-devel
--kFr4GWJZkCE=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1077?usp=3Demail
to review the following change.
Change subject: dns: do not run updown scripts with lwipovpn
......................................................................
dns: do not run updown scripts with lwipovpn
Running the script doesn't make sense with the AFUNIX dev node, so we
simply clear any scripts that have been set before.
Change-Id: I7e9a0c668e0950257632452cfd9eeb236f0120f2
Signed-off-by: Heiko Hund
---
M src/openvpn/options.c
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/77/1077/1
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index af097f8..0662b49 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -61,6 +61,7 @@
#include "xkey_common.h"
#include "dco.h"
#include "options_util.h"
+#include "tun_afunix.h"
#include
@@ -3593,6 +3594,13 @@
struct gc_arena gc =3D gc_new();
struct dns_options *dns =3D &o->dns_options;
+ if (is_tun_afunix(o->dev_node))
+ {
+ /* Disable running dns-updown script with lwipovpn */
+ dns->updown_flags =3D DNS_UPDOWN_NO_FLAGS;
+ dns->updown =3D NULL;
+ }
+
if (dns->servers || dns_updown_user_set(dns) || dns_updown_forced(dns))
{
/* Clean up env from --dhcp-option DNS config */
--=20
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1077?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I7e9a0c668e0950257632452cfd9eeb236f0120f2
Gerrit-Change-Number: 1077
Gerrit-PatchSet: 1
Gerrit-Owner: d12fk
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: flichtenheld
Gerrit-MessageType: newchange
--kFr4GWJZkCE=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
d12fk would like plaisthos and flichtenheld to review t=
his change.
V=
iew Change
dns: do not run updown scripts with lwipovpn
Running =
the script doesn't make sense with the AFUNIX dev node, so we
simply=
clear any scripts that have been set before.
Change-Id: I7e9a0c668e=
0950257632452cfd9eeb236f0120f2
Signed-off-by: Heiko Hund <heiko@...2375...=
62...>
---
M src/openvpn/options.c
1 file changed, 8 insertions=
(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openv=
pn refs/changes/77/1077/1
diff --git a/src/openvpn/options.c b/src/=
openvpn/options.c
index af097f8..0662b49 100644
<=
span>--- a/src/openvpn/options.c
+++ b/src/openvpn/options.=
c
@@ -61,6 +61,7 @@
#include "xkey_co=
mmon.h"
#include "dco.h"
#=
include "options_util.h"
+#include "tun_afunix.h"
#include <ctype.h>
@@ -359=
3,6 +3594,13 @@
struct gc_arena gc =3D gc_new();
struct dns_options *dns =3D &o->dns_options;<=
br>
+ if (i=
s_tun_afunix(o->dev_node))
+ {
+ =
/* Disable running dns-updown script with lwipovpn */
+ dns->updown_flags =3D DNS=
_UPDOWN_NO_FLAGS;
+ =
dns->updown =3D NULL;
+ }
+
if (dns->servers || dns_updown_user_set(dns) || dns_u=
pdown_forced(dns))
{
/* Clean=
up env from --dhcp-option DNS config */
<=
p>To view, visit change 1077. To unsubscribe, or for help writing mail filters=
, visit settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I7e9a0c668e0950257632452cfd9=
eeb236f0120f2
Gerrit-Change-Number: 1077
Gerrit-PatchSet: 1
Gerrit-Owner: d12fk <heiko@...515...> =
div>
Gerrit-Reviewer: flichtenheld <frank@...2716...=
1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-MessageType: newchange
--kFr4GWJZkCE=--