aboutsummaryrefslogtreecommitdiff
path: root/src/openvpn/tun.c
diff options
context:
space:
mode:
authorLev Stipakov2015-12-12 00:37:52 +0200
committerGert Doering2015-12-13 19:54:15 +0100
commit6417a6f8a01c702e7c8f19f01b696c3b0d2dc1f1 (patch)
treec80399a43b048cc485ad682c36763334b9066eb5 /src/openvpn/tun.c
parent4baec3ee10b8d6826d5f076a9832a92a5cfe3676 (diff)
downloadopenvpn-6417a6f8a01c702e7c8f19f01b696c3b0d2dc1f1.zip
openvpn-6417a6f8a01c702e7c8f19f01b696c3b0d2dc1f1.tar.gz
Use adapter index for add/delete_route_ipv6
Trac #637 Signed-off-by: Lev Stipakov <lstipakov@gmail.com> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1449873472-14954-1-git-send-email-lstipakov@gmail.com> URL: http://article.gmane.org/gmane.network.openvpn.devel/10759 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/tun.c')
-rw-r--r--src/openvpn/tun.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 014d988..efcd225 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -1306,11 +1306,13 @@ do_ifconfig (struct tuntap *tt,
{
char * saved_actual;
char iface[64];
+ DWORD idx;
if (!strcmp (actual, "NULL"))
msg (M_FATAL, "Error: When using --tun-ipv6, if you have more than one TAP-Windows adapter, you must also specify --dev-node");
- openvpn_snprintf(iface, sizeof(iface), "interface=%lu", get_adapter_index_flexible(actual));
+ idx = get_adapter_index_flexible(actual);
+ openvpn_snprintf(iface, sizeof(iface), "interface=%lu", idx);
/* example: netsh interface ipv6 set address interface=42 2001:608:8003::d store=active */
argv_printf (&argv,
@@ -1328,6 +1330,8 @@ do_ifconfig (struct tuntap *tt,
*/
saved_actual = tt->actual_name;
tt->actual_name = (char*) actual;
+ /* we use adapter_index in add_route_ipv6 */
+ tt->adapter_index = idx;
add_route_connected_v6_net(tt, es);
tt->actual_name = saved_actual;
}