Skip to content

Commit

Permalink
Make --dns options apply for tap-windows6 driver
Browse files Browse the repository at this point in the history
When tap-windows6 driver is used, both --dhcp-option and
--dns options are applied with DHCP. When processing --dns options,
we don't set "tuntap_options.dhcp_options" member, which is required
for DHCP string to be sent to the driver. As a result, --dns options
are not applied at all.

Fix by adding missing assignment of tuntap_options.dhcp_options.

Github: fixes OpenVPN/openvpn#447

Change-Id: I24f43ad319bd1ca530fe17442d02a97412eb75c7
Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Message-Id: <20231115120623.6442-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg27402.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 60def50)
  • Loading branch information
lstipakov authored and cron2 committed Nov 15, 2023
1 parent b90ec6d commit 0acba3c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/openvpn/options.c
Original file line number Diff line number Diff line change
Expand Up @@ -1372,6 +1372,7 @@ tuntap_options_copy_dns(struct options *o)
{
msg(M_WARN, "WARNING: couldn't copy all --dns search-domains to --dhcp-option");
}
tt->dhcp_options |= DHCP_OPTIONS_DHCP_REQUIRED;
}

if (dns->servers)
Expand Down Expand Up @@ -1409,6 +1410,7 @@ tuntap_options_copy_dns(struct options *o)
{
msg(M_WARN, "WARNING: couldn't copy all --dns server addresses to --dhcp-option");
}
tt->dhcp_options |= DHCP_OPTIONS_DHCP_OPTIONAL;
}
}
#else /* if defined(_WIN32) || defined(TARGET_ANDROID) */
Expand Down

0 comments on commit 0acba3c

Please sign in to comment.