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/+/1121?usp=email
to review the following change.
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 once instead of overwriting them.
Fixed by:
- reseting tuntap DNS options (regression from abovementioned commit)
- clearing dhcp options storage in push-update code
Change-Id: Ife4d8fc5f8e2183e61226d66a76bbaa02c06f787
Signed-off-by: Lev Stipakov <l...@openvpn.net>
---
M src/openvpn/options.c
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/21/1121/1
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 3753810..8ce57ff 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 = dns->search_domains;
+ if (d)
+ {
+ tt->domain_search_list_len = 0;
+ }
+
while (d && tt->domain_search_list_len + 1 < N_SEARCH_LIST_LEN)
{
tt->domain_search_list[tt->domain_search_list_len++] = d->name;
@@ -3539,6 +3545,12 @@
}
const struct dns_server *s = dns->servers;
+ if (s)
+ {
+ tt->dns_len = 0;
+ tt->dns6_len = 0;
+ }
+
while (s)
{
bool non_standard_server_port = false;
@@ -6212,6 +6224,8 @@
}
o->disable_nbt = 0;
o->dhcp_options = 0;
+
+ CLEAR(options->dns_options.from_dhcp);
#if defined(TARGET_ANDROID)
o->http_proxy_port = 0;
o->http_proxy = NULL;
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1121?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ife4d8fc5f8e2183e61226d66a76bbaa02c06f787
Gerrit-Change-Number: 1121
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <lstipa...@gmail.com>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
