From: "stipa (Code Review)"
Date: Thu, 31 Jul 2025 09:48:16 +0000
In-Reply-To:
References:
Reply-To: lstipakov@...277..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...,
gert@...1296...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="tlD36K4zFGI="; charset=UTF-8
Subject: [Openvpn-devel] [XS] Change in openvpn[master]: Fix --dns options
for TAP adapter
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , flichtenheld
Cc: openvpn-devel
--tlD36K4zFGI=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, plaisthos, stipa.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1120?usp=3Demail
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review-1 by cron2
Change subject: Fix --dns options for TAP adapter
......................................................................
Fix --dns options for TAP adapter
Commit
2dfc4f ("dns: deal with --dhcp-options when --dns is active")
has accidentally removed setting of the DHCP_OPTIONS_DHCP_OPTIONAL
flag when copying --dns options. This flag is required to apply options
via DHCP string, which we do for TAP adapter. As a result, --dns options
stopped working for TAP.
Fix by setting this flag when copying --dns options to tuntap_options.
Change-Id: Id95cd14095a03afb3140a03ae96e9f5679e4fe89
Signed-off-by: Lev Stipakov
---
M src/openvpn/options.c
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/20/1120/2
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 53be6f5..3753810 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3579,6 +3579,7 @@
{
msg(M_WARN, "WARNING: couldn't copy all --dns server addre=
sses to TUN/TAP");
}
+ tt->dhcp_options |=3D DHCP_OPTIONS_DHCP_OPTIONAL;
return;
}
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1120?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: Id95cd14095a03afb3140a03ae96e9f5679e4fe89
Gerrit-Change-Number: 1120
Gerrit-PatchSet: 2
Gerrit-Owner: stipa
Gerrit-Reviewer: cron2
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: cron2
Gerrit-Attention: flichtenheld
Gerrit-Attention: stipa
Gerrit-MessageType: newpatchset
--tlD36K4zFGI=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, plaisthos, s=
tipa.
The following approvals got outdated and were removed:
Code-Review-1 by cron2
Fix --dns options for TAP adapter
Commit <=
br> 2dfc4f ("dns: deal with --dhcp-options when --dns is active&quo=
t;)
has accidentally removed setting of the DHCP_OPTIONS_DHCP_OPTION=
AL flag when copying --dns options. This flag is required to apply optio=
ns via DHCP string, which we do for TAP adapter. As a result, --dns opti=
ons stopped working for TAP.
Fix by setting this flag when copyin=
g --dns options to tuntap_options.
Change-Id: Id95cd14095a03afb3140a=
03ae96e9f5679e4fe89 Signed-off-by: Lev Stipakov <lev@...515...> --- M src/openvpn/options.c 1 file changed, 1 insertion(+), 0 deleti=
ons(-)