From: "cron2 (Code Review)" Date: Thu, 31 Jul 2025 10:55:41 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277... Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="JcmkiFCyDwI="; 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: stipa Cc: plaisthos , flichtenheld , openvpn-devel --JcmkiFCyDwI= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/11= 20?usp=3Demail ) 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 Acked-by: Gert Doering Message-Id: <20250731104833.23305-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg32= 436.html Signed-off-by: Gert Doering --- M src/openvpn/options.c 1 file changed, 1 insertion(+), 0 deletions(-) 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: 3 Gerrit-Owner: stipa Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-MessageType: merged --JcmkiFCyDwI= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 submitted this change.

View Change

Fix --dns options for TAP adapter

Comm= it

2dfc4f ("dns: deal with --dhcp-options when --dns is act= ive")

has accidentally removed setting of the DHCP_OPTIONS_DHCP= _OPTIONAL
flag when copying --dns options. This flag is required to appl= y options
via DHCP string, which we do for TAP adapter. As a result, --d= ns options
stopped working for TAP.

Fix by setting this flag when= copying --dns options to tuntap_options.

Change-Id: Id95cd14095a03a= fb3140a03ae96e9f5679e4fe89
Signed-off-by: Lev Stipakov <lev@...515...= >
Acked-by: Gert Doering <gert@...1296...>
Message-Id: <2= 0250731104833.23305-1-gert@...1296...>
URL: https://www.mail-archive.= com/openvpn-devel@lists.sourceforge.net/msg32436.html
Signed-off-by: Ger= t Doering <gert@...1296...>
---
M src/openvpn/options.c
1 fi= le changed, 1 insertion(+), 0 deletions(-)

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 +3= 579,7 @@
{
ms= g(M_WARN, "WARNING: couldn't copy all --dns server addresses to TU= N/TAP");
}
+ tt->dhcp_options |=3D DHCP_OPTIONS_= DHCP_OPTIONAL;
return;
= }
}

To view, vis= it chang= e 1120. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id95cd14095a03afb3140a03ae96= e9f5679e4fe89
Gerrit-Change-Number: 1120
Gerrit-PatchSet: 3
Gerrit-Owner: stipa <lstipakov@...277...>= ;
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: merged
--JcmkiFCyDwI=--