From: "stipa (Code Review)" Date: Thu, 31 Jul 2025 12:19:15 +0000 In-Reply-To: References: Reply-To: lstipakov@...277..., arne-openvpn@...1227..., heiko@...515..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <081d973d4c70fb608f1bcb381398322f58e37d39-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="Kl7UUdscERE="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Fix DNS options duplication on PUSH_UPDATE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: d12fk , openvpn-devel --Kl7UUdscERE= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos, stipa. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1121?usp=3Demail to look at the new patch set (#3). Change subject: Fix DNS options duplication on PUSH_UPDATE ...................................................................... Fix DNS options duplication on PUSH_UPDATE Commit 2dfc4f ("dns: deal with --dhcp-options when --dns is active") has removed reset of tuntap DNS options. Due to that, incoming --dns options are added to existing ones instead of overwriting them. It has also added a new storage for --dhcp-option. The push-update code didn't clear it and as a result, incoming --dhcp-option options were added to existing ones instead of overwriting them. Fixed by: - resetting tuntap DNS options (regression from abovementioned commit) - clearing dhcp options storage in push-update code GitHub: fixes OpenVPN/openvpn#804 Change-Id: Ife4d8fc5f8e2183e61226d66a76bbaa02c06f787 Signed-off-by: Lev Stipakov --- M src/openvpn/options.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/21/1121/3 diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 3753810..3ceada0 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3527,7 +3527,13 @@ #endif /* if defined(_WIN32) */ /* Copy --dns options to tuntap_options */ + const struct dns_domain *d =3D dns->search_domains; + if (d) + { + tt->domain_search_list_len =3D 0; + } + while (d && tt->domain_search_list_len + 1 < N_SEARCH_LIST_LEN) { tt->domain_search_list[tt->domain_search_list_len++] =3D d->name; @@ -3538,6 +3544,9 @@ msg(M_WARN, "WARNING: couldn't copy all --dns search-domains to TU= N/TAP"); } + tt->dns_len =3D 0; + tt->dns6_len =3D 0; + const struct dns_server *s =3D dns->servers; while (s) { @@ -6212,6 +6221,8 @@ } o->disable_nbt =3D 0; o->dhcp_options =3D 0; + + CLEAR(options->dns_options.from_dhcp); #if defined(TARGET_ANDROID) o->http_proxy_port =3D 0; o->http_proxy =3D NULL; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1121?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: Ife4d8fc5f8e2183e61226d66a76bbaa02c06f787 Gerrit-Change-Number: 1121 Gerrit-PatchSet: 3 Gerrit-Owner: stipa Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: d12fk Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-Attention: stipa Gerrit-MessageType: newpatchset --Kl7UUdscERE= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos, stipa. <= /p>

stipa uploaded patch set #3 to this change.

View Change

Fix DNS options duplication on PUSH_UPDATE

Commit

2dfc= 4f ("dns: deal with --dhcp-options when --dns is active")

= has removed reset of tuntap DNS options. Due to that, incoming --dns
opt= ions are added to existing ones instead of overwriting them.

It has = also added a new storage for --dhcp-option. The push-update
code didn= 9;t clear it and as a result, incoming --dhcp-option options
were added = to existing ones instead of overwriting them.

Fixed by:

- re= setting tuntap DNS options (regression from abovementioned commit)
- cl= earing dhcp options storage in push-update code

GitHub: fixes OpenVP= N/openvpn#804

Change-Id: Ife4d8fc5f8e2183e61226d66a76bbaa02c06f787Signed-off-by: Lev Stipakov <lev@...515...>
---
M src/openvpn= /options.c
1 file changed, 11 insertions(+), 0 deletions(-)

gi=
t pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/21/1121/3
<= pre style=3D"font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 3753810..3ceada0 100644
--- a/src/openvpn/options.c=
+++ b/src/openvpn/options.c
@@ -3527,7 +35= 27,13 @@
#endif /* if defined(_WIN32) */
=
/* Copy --dns options to tuntap_options */
= +
const st= ruct dns_domain *d =3D dns->search_domains;
+ if (d)
+ {
+ tt->domain_search_list_len =3D 0;
+ }
+
while (d && tt->domain_sear= ch_list_len + 1 < N_SEARCH_LIST_LEN)
{
tt->domain_search_list[tt->domain_search_list_len++] =3D= d->name;
@@ -3538,6 +3544,9 @@
= msg(M_WARN, "WARNING: couldn't copy all --dns search-domains to T= UN/TAP");
}

+ tt->dns_len =3D 0;
+ tt->dns6_len =3D 0;=
+
cons= t struct dns_server *s =3D dns->servers;
while (s)<= /span>
{
@@ -6212,6 +6221,8 @@
}

o->disable_nbt =3D 0;

o->dhcp_options =3D 0;
+
+ CLEAR(options->dns_options.from_dhcp); #if defined(TARGET_ANDROID)
o->http= _proxy_port =3D 0;
o->http_proxy =3D NULL;<= /span>

To view, visit change 1121. To unsubscribe,= or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ife4d8fc5f8e2183e61226d66a76= bbaa02c06f787
Gerrit-Change-Number: 1121
Gerrit-PatchSet: 3
Gerrit-Owner: stipa <lstipakov@...277...>= ;
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: d12fk <heiko@...515...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: stipa <lstipakov@...1663...= .>
Gerrit-MessageType: newpatchset
--Kl7UUdscERE=--