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/+/428?usp=email
to review the following change.
Change subject: Warn if pushed options require DHCP
......................................................................
Warn if pushed options require DHCP
Some pushed options (such as DOMAIN-SEARCH) require
DHCP server to work. Warn user that some options
will not work if the current driver (such as dco-win)
doesn't support DHCP.
Change-Id: Ie512544329a91fae15409cb18f29d8be617051a1
Signed-off-by: Lev Stipakov <l...@openvpn.net>
---
M src/openvpn/options.c
M src/openvpn/tun.c
2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/28/428/1
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index abd2e0c..b34e2f6 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -2477,10 +2477,10 @@
if (options->tuntap_options.dhcp_options & DHCP_OPTIONS_DHCP_REQUIRED)
{
- const char *prefix = "Some dhcp-options require DHCP server";
+ const char *prefix = "Some --dhcp-option or --dns options require DHCP
server";
if (options->windows_driver != WINDOWS_DRIVER_TAP_WINDOWS6)
{
- msg(M_USAGE, "%s, which is not supported by selected %s driver",
+ msg(M_USAGE, "%s, which is not supported by the selected %s
driver",
prefix, print_windows_driver(options->windows_driver));
}
else if (options->tuntap_options.ip_win32_type != IPW32_SET_DHCP_MASQ
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index f857ed1..1b79d42 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -6826,6 +6826,13 @@
open_tun(const char *dev, const char *dev_type, const char *dev_node, struct
tuntap *tt,
openvpn_net_ctx_t *ctx)
{
+ if ((tt->options.dhcp_options & DHCP_OPTIONS_DHCP_REQUIRED)
+ && tt->windows_driver != WINDOWS_DRIVER_TAP_WINDOWS6)
+ {
+ msg(M_WARN, "Some --dhcp-option or --dns options require DHCP server,
which is not supported by the selected %s driver. They will be ignored.",
+ print_windows_driver(tt->windows_driver));
+ }
+
/* dco-win already opened the device, which handle we treat as socket */
if (tuntap_is_dco_win(tt))
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/428?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: Ie512544329a91fae15409cb18f29d8be617051a1
Gerrit-Change-Number: 428
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
