X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fifconfig.c;h=0b99402bd5db7c554551fe8ad518ec441e9d9385;hp=7688a3c67779b2e3eab7f399e81c42a3027cb0ac;hb=af81c436d6e11a53803747af7cc8ecfd449ccd4c;hpb=0b96b6967256803c739a6b0a89d54ab8d6f63335

diff --git a/src/ifconfig.c b/src/ifconfig.c
index 7688a3c6..0b99402b 100644
--- a/src/ifconfig.c
+++ b/src/ifconfig.c
@@ -1,6 +1,6 @@
 /*
     ifconfig.c -- Generate platform specific interface configuration commands
-    Copyright (C) 2016 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2016-2017 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -104,13 +104,6 @@ void ifconfig_address(FILE *out, const char *value) {
 		case SUBNET_IPV6: fprintf(out, "ip addr replace %s dev \"$INTERFACE\"\n", address_str); break;
 		default: return;
 	}
-#elif defined(HAVE_BSD)
-	switch(address.type) {
-		case SUBNET_MAC:  fprintf(out, "ifconfig \"$INTERFACE\" link %s\n", address_str); break;
-		case SUBNET_IPV4: fprintf(out, "ifconfig \"$INTERFACE\" %s\n", address_str); break;
-		case SUBNET_IPV6: fprintf(out, "ifconfig \"$INTERFACE\" inet6 %s\n", address_str); break;
-		default: return;
-	}
 #elif defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
 	switch(address.type) {
 		case SUBNET_MAC:  fprintf(out, "ip link set \"$INTERFACE\" address %s\n", address_str); break;
@@ -118,6 +111,13 @@ void ifconfig_address(FILE *out, const char *value) {
 		case SUBNET_IPV6: fprintf(out, "netsh inetface ipv6 set address \"$INTERFACE\" static %s\n", address_str); break;
 		default: return;
 	}
+#else // assume BSD
+	switch(address.type) {
+		case SUBNET_MAC:  fprintf(out, "ifconfig \"$INTERFACE\" link %s\n", address_str); break;
+		case SUBNET_IPV4: fprintf(out, "ifconfig \"$INTERFACE\" %s\n", address_str); break;
+		case SUBNET_IPV6: fprintf(out, "ifconfig \"$INTERFACE\" inet6 %s\n", address_str); break;
+		default: return;
+	}
 #endif
 }
 
@@ -152,8 +152,21 @@ void ifconfig_route(FILE *out, const char *value) {
 			default: return;
 		}
 	}
-#elif defined(HAVE_BSD)
-	// BSD route command is silly and doesn't accept an interface name as a destination.
+#elif defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
+	if(*gateway_str) {
+		switch(subnet.type) {
+			case SUBNET_IPV4: fprintf(out, "netsh inetface 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); break;
+			default: return;
+		}
+	} else {
+		switch(subnet.type) {
+			case SUBNET_IPV4: fprintf(out, "netsh inetface ipv4 add route %s \"%%INTERFACE%%\"\n", subnet_str); break;
+			case SUBNET_IPV6: fprintf(out, "netsh inetface ipv6 add route %s \"%%INTERFACE%%\"\n", subnet_str); break;
+			default: return;
+		}
+	}
+#else // assume BSD
 	if(!*gateway_str) {
 		switch(subnet.type) {
 			case SUBNET_IPV4:
@@ -180,19 +193,5 @@ void ifconfig_route(FILE *out, const char *value) {
 		case SUBNET_IPV6: fprintf(out, "route add -inet6 %s %s\n", subnet_str, gateway_str); break;
 		default: return;
 	}
-#elif defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
-	if(*gateway_str) {
-		switch(subnet.type) {
-			case SUBNET_IPV4: fprintf(out, "netsh inetface 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); break;
-			default: return;
-		}
-	} else {
-		switch(subnet.type) {
-			case SUBNET_IPV4: fprintf(out, "netsh inetface ipv4 add route %s \"%%INTERFACE%%\"\n", subnet_str); break;
-			case SUBNET_IPV6: fprintf(out, "netsh inetface ipv6 add route %s \"%%INTERFACE%%\"\n", subnet_str); break;
-			default: return;
-		}
-	}
 #endif
 }