Hi, On Wed, Jun 13, 2018 at 10:12:13PM +0800, Antonio Quartulli wrote: > From: Antonio Quartulli <anto...@openvpn.net> > > This patch ensures that the TAP driver on a windows host is still > configured, even though no IPv4 has been provided. > > In this case the TAP driver ioctl will be invoked with a fake > 0.0.0.0/0.0.0.0 IPv4 which will simply start the interface and > get it to a working state. > > Trac: #208 > Signed-off-by: Antonio Quartulli <anto...@openvpn.net>
Well...
> @@ -2642,7 +2642,11 @@ test_routes(const struct route_list *rl, const struct
> tuntap *tt)
> ret = true;
> adapter_up = true;
>
> - if (rl)
> + /* we do this test only if we have IPv4 routes to install, and if
> + * the tun/tap interface has seen IPv4 ifconfig - because if we
> + * have no IPv4, the check will always fail, failing tun init
> + */
> + if (rl && c->c1.tuntap->did_ifconfig_setup)
This code is a bit optimstic :-) - there is no "c" here...
route.c: In function 'test_routes':
route.c:2649:19: error: 'c' undeclared (first use in this function)
if (rl && c->c1.tuntap->did_ifconfig_setup)
^
... because it's just "tt" here, so "tt->did_ifconfig_setup" should
be fine... at least it compiled :-) - I've sent you a link to an
installer for testing.
Amended patch attached
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
From 7fd30a4c131fa8e45a972b7f312b651bd38f784b Mon Sep 17 00:00:00 2001 From: Antonio Quartulli <anto...@openvpn.net> Date: Wed, 13 Jun 2018 22:12:13 +0800 Subject: [PATCH] windows: properly configure TAP driver when no IPv4 is configured This patch ensures that the TAP driver on a windows host is still configured, even though no IPv4 has been provided. In this case the TAP driver ioctl will be invoked with a fake 0.0.0.0/0.0.0.0 IPv4 which will simply start the interface and get it to a working state. Trac: #208 Signed-off-by: Antonio Quartulli <anto...@openvpn.net> Acked-by: Gert Doering <g...@greenie.muc.de> Message-Id: <20180613141213.5962-...@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg17052.html Signed-off-by: Gert Doering <g...@greenie.muc.de> --- src/openvpn/route.c | 6 +++++- src/openvpn/tun.c | 24 +++++++++++++++++------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 8990a986..f6962848 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -2642,7 +2642,11 @@ test_routes(const struct route_list *rl, const struct tuntap *tt) ret = true; adapter_up = true; - if (rl) + /* we do this test only if we have IPv4 routes to install, and if + * the tun/tap interface has seen IPv4 ifconfig - because if we + * have no IPv4, the check will always fail, failing tun init + */ + if (rl && tt->did_ifconfig_setup) { struct route_ipv4 *r; for (r = rl->routes, len = 0; r; r = r->next, ++len) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 2e1c96e6..f9b9c716 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -5703,7 +5703,10 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun msg(M_FATAL, "ERROR: --dev tun also requires --ifconfig"); } - if (tt->topology == TOP_SUBNET) + /* send 0/0/0 to the TAP driver even if we have no IPv4 configured to + * ensure it is somehow initialized. + */ + if (!tt->did_ifconfig_setup || tt->topology == TOP_SUBNET) { in_addr_t ep[3]; BOOL status; @@ -5716,12 +5719,19 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun ep, sizeof(ep), ep, sizeof(ep), &len, NULL); - msg(status ? M_INFO : M_FATAL, "Set TAP-Windows TUN subnet mode network/local/netmask = %s/%s/%s [%s]", - print_in_addr_t(ep[1], IA_NET_ORDER, &gc), - print_in_addr_t(ep[0], IA_NET_ORDER, &gc), - print_in_addr_t(ep[2], IA_NET_ORDER, &gc), - status ? "SUCCEEDED" : "FAILED"); - + if (tt->did_ifconfig_setup) + { + msg(status ? M_INFO : M_FATAL, "Set TAP-Windows TUN subnet mode network/local/netmask = %s/%s/%s [%s]", + print_in_addr_t(ep[1], IA_NET_ORDER, &gc), + print_in_addr_t(ep[0], IA_NET_ORDER, &gc), + print_in_addr_t(ep[2], IA_NET_ORDER, &gc), + status ? "SUCCEEDED" : "FAILED"); + } + else + { + msg(status ? M_INFO : M_FATAL, "Set TAP-Windows TUN with fake IPv4 [%s]", + status ? "SUCCEEDED" : "FAILED"); + } } else { -- 2.17.1
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
