From c926b3b84317b220828c3d8b6275754c5003dfcf Mon Sep 17 00:00:00 2001 From: iczero Date: Tue, 16 Oct 2018 22:58:52 -0700 Subject: [PATCH] Fix tinc-up generation on windows - use `%INTERFACE%` instead of `$INTERFACE` on windows - correct typo in `netsh interface` (was `netsh inetface`) - remove `static` when setting ipv6 address --- src/ifconfig.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ifconfig.c b/src/ifconfig.c index 4b47ad13..5f614618 100644 --- a/src/ifconfig.c +++ b/src/ifconfig.c @@ -134,11 +134,11 @@ void ifconfig_address(FILE *out, const char *value) { break; case SUBNET_IPV4: - fprintf(out, "netsh inetface ipv4 set address \"$INTERFACE\" static %s\n", address_str); + fprintf(out, "netsh inetface ipv4 set address \"%%INTERFACE%%\" static %s\n", address_str); break; case SUBNET_IPV6: - fprintf(out, "netsh inetface ipv6 set address \"$INTERFACE\" static %s\n", address_str); + fprintf(out, "netsh inetface ipv6 set address \"%%INTERFACE%%\" %s\n", address_str); break; default: @@ -229,11 +229,11 @@ void ifconfig_route(FILE *out, const char *value) { if(*gateway_str) { switch(subnet.type) { case SUBNET_IPV4: - fprintf(out, "netsh inetface ipv4 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str); + fprintf(out, "netsh interface ipv4 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str); break; case SUBNET_IPV6: - fprintf(out, "netsh inetface ipv6 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str); + fprintf(out, "netsh interface ipv6 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str); break; default: @@ -242,11 +242,11 @@ void ifconfig_route(FILE *out, const char *value) { } else { switch(subnet.type) { case SUBNET_IPV4: - fprintf(out, "netsh inetface ipv4 add route %s \"%%INTERFACE%%\"\n", subnet_str); + fprintf(out, "netsh interface ipv4 add route %s \"%%INTERFACE%%\"\n", subnet_str); break; case SUBNET_IPV6: - fprintf(out, "netsh inetface ipv6 add route %s \"%%INTERFACE%%\"\n", subnet_str); + fprintf(out, "netsh interface ipv6 add route %s \"%%INTERFACE%%\"\n", subnet_str); break; default: -- 2.20.1