X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fifconfig.c;h=742d2ebe1a61d8e91e780401564a47d3f69fe789;hb=d6b45d005530496e48325a6174ecdd889a17bfc1;hp=4331f16d5f74bb2c2dde49901d93fc659d01e286;hpb=6d0452896673c36226c24144d4bde824a49c3950;p=tinc

diff --git a/src/ifconfig.c b/src/ifconfig.c
index 4331f16d..742d2ebe 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-2018 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
@@ -71,10 +71,12 @@ void ifconfig_dhcp(FILE *out) {
 }
 
 void ifconfig_dhcp6(FILE *out) {
+	(void)out;
 	fprintf(stderr, "DHCPv6 requested, but not supported by tinc on this platform\n");
 }
 
 void ifconfig_slaac(FILE *out) {
+	(void)out;
 	// It's the default?
 }
 
@@ -86,102 +88,219 @@ bool ifconfig_footer(FILE *out) {
 static subnet_t ipv4, ipv6;
 
 void ifconfig_address(FILE *out, const char *value) {
-	subnet_t address = {};
+	subnet_t address = {0};
 	char address_str[MAXNETSTR];
-	if(!str2net(&address, value) || !net2str(address_str, sizeof address_str, &address)) {
-		fprintf(stderr, "Could not parse Ifconfig statement\n");
+
+	if(!str2net(&address, value) || !net2str(address_str, sizeof(address_str), &address)) {
+		fprintf(stderr, "Could not parse address in Ifconfig statement\n");
 		return;
 	}
+
 	switch(address.type) {
-		case SUBNET_IPV4: ipv4 = address; break;
-		case SUBNET_IPV6: ipv6 = address; break;
+	case SUBNET_IPV4:
+		ipv4 = address;
+		break;
+
+	case SUBNET_IPV6:
+		ipv6 = address;
+		break;
+
+	default:
+		return;
 	}
+
 #if defined(HAVE_LINUX)
+
 	switch(address.type) {
-		case SUBNET_MAC:  fprintf(out, "ip link set \"$INTERFACE\" address %s\n", address_str); break;
-		case SUBNET_IPV4: fprintf(out, "ip addr replace %s dev \"$INTERFACE\"\n", address_str); break;
-		case SUBNET_IPV6: fprintf(out, "ip addr replace %s dev \"$INTERFACE\"\n", address_str); break;
+	case SUBNET_MAC:
+		fprintf(out, "ip link set \"$INTERFACE\" address %s\n", address_str);
+		break;
+
+	case SUBNET_IPV4:
+		fprintf(out, "ip addr replace %s dev \"$INTERFACE\"\n", address_str);
+		break;
+
+	case SUBNET_IPV6:
+		fprintf(out, "ip addr replace %s dev \"$INTERFACE\"\n", address_str);
+		break;
+
+	default:
+		return;
 	}
-#elif defined(HAVE_BSD)
+
+#elif defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
+
 	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;
+	case SUBNET_MAC:
+		fprintf(out, "ip link set \"$INTERFACE\" address %s\n", address_str);
+		break;
+
+	case SUBNET_IPV4:
+		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%%\" %s\n", address_str);
+		break;
+
+	default:
+		return;
 	}
-#elif defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
+
+#else // assume BSD
+
 	switch(address.type) {
-		case SUBNET_MAC:  fprintf(out, "ip link set \"$INTERFACE\" address %s\n", address_str); break;
-		case SUBNET_IPV4: 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); break;
+	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
 }
 
 void ifconfig_route(FILE *out, const char *value) {
-	subnet_t subnet = {}, gateway = {};
+	subnet_t subnet = {0}, gateway = {0};
 	char subnet_str[MAXNETSTR] = "", gateway_str[MAXNETSTR] = "";
-	const char *sep = strchr(value, ' ');
-	if(!str2net(&subnet, value) || !net2str(subnet_str, sizeof subnet_str, &subnet) || subnet.type == SUBNET_MAC) {
-		fprintf(stderr, "Could not parse Ifconfig statement\n");
+	char *sep = strchr(value, ' ');
+
+	if(sep) {
+		*sep++ = 0;
+	}
+
+	if(!str2net(&subnet, value) || !net2str(subnet_str, sizeof(subnet_str), &subnet) || subnet.type == SUBNET_MAC) {
+		fprintf(stderr, "Could not parse subnet in Route statement\n");
 		return;
 	}
+
 	if(sep) {
-		sep++;
-		if(!str2net(&gateway, sep) || !net2str(gateway_str, sizeof gateway_str, &gateway) || gateway.type != subnet.type) {
-			fprintf(stderr, "Could not parse Ifconfig statement\n");
+		if(!str2net(&gateway, sep) || !net2str(gateway_str, sizeof(gateway_str), &gateway) || gateway.type != subnet.type) {
+			fprintf(stderr, "Could not parse gateway in Route statement\n");
 			return;
 		}
-		char *slash = strchr(gateway_str, '/'); if(slash) *slash = 0;
+
+		char *slash = strchr(gateway_str, '/');
+
+		if(slash) {
+			*slash = 0;
+		}
 	}
+
 #if defined(HAVE_LINUX)
+
 	if(*gateway_str) {
 		switch(subnet.type) {
-			case SUBNET_IPV4: fprintf(out, "ip route add %s via %s dev \"$INTERFACE\"\n", subnet_str, gateway_str); break;
-			case SUBNET_IPV6: fprintf(out, "ip route add %s via %s dev \"$INTERFACE\"\n", subnet_str, gateway_str); break;
+		case SUBNET_IPV4:
+			fprintf(out, "ip route add %s via %s dev \"$INTERFACE\" onlink\n", subnet_str, gateway_str);
+			break;
+
+		case SUBNET_IPV6:
+			fprintf(out, "ip route add %s via %s dev \"$INTERFACE\" onlink\n", subnet_str, gateway_str);
+			break;
+
+		default:
+			return;
 		}
 	} else {
 		switch(subnet.type) {
-			case SUBNET_IPV4: fprintf(out, "ip route add %s dev \"$INTERFACE\"\n", subnet_str); break;
-			case SUBNET_IPV6: fprintf(out, "ip route add %s dev \"$INTERFACE\"\n", subnet_str); break;
-		}
-	}
-#elif defined(HAVE_BSD)
-	// BSD route command is silly and doesn't accept an interface name as a destination.
-	if(!*gateway_str) {
-		switch(subnet.type) {
-			case SUBNET_IPV4:
-				if(!ipv4.type) {
-					fprintf(stderr, "Route requested but no Ifconfig\n");
-					return;
-				}
-				net2str(gateway_str, sizeof gateway_str, &ipv4);
-				break;
-			case SUBNET_IPV6:
-				if(!ipv6.type) {
-					fprintf(stderr, "Route requested but no Ifconfig\n");
-					return;
-				}
-				net2str(gateway_str, sizeof gateway_str, &ipv6);
-				break;
+		case SUBNET_IPV4:
+			fprintf(out, "ip route add %s dev \"$INTERFACE\"\n", subnet_str);
+			break;
+
+		case SUBNET_IPV6:
+			fprintf(out, "ip route add %s dev \"$INTERFACE\"\n", subnet_str);
+			break;
+
+		default:
+			return;
 		}
-		char *slash = strchr(gateway_str, '/'); if(slash) *slash = 0;
 	}
 
-	switch(subnet.type) {
-		case SUBNET_IPV4: fprintf(out, "route add %s %s\n", subnet_str, gateway_str); break;
-		case SUBNET_IPV6: fprintf(out, "route add -inet6 %s %s\n", subnet_str, gateway_str); break;
-	}
 #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;
+		case SUBNET_IPV4:
+			fprintf(out, "netsh interface ipv4 add route %s \"%%INTERFACE%%\" %s\n", subnet_str, gateway_str);
+			break;
+
+		case SUBNET_IPV6:
+			fprintf(out, "netsh interface 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;
+		case SUBNET_IPV4:
+			fprintf(out, "netsh interface ipv4 add route %s \"%%INTERFACE%%\"\n", subnet_str);
+			break;
+
+		case SUBNET_IPV6:
+			fprintf(out, "netsh interface ipv6 add route %s \"%%INTERFACE%%\"\n", subnet_str);
+			break;
+
+		default:
+			return;
+		}
+	}
+
+#else // assume BSD
+
+	if(!*gateway_str) {
+		switch(subnet.type) {
+		case SUBNET_IPV4:
+			if(!ipv4.type) {
+				fprintf(stderr, "Route requested but no Ifconfig\n");
+				return;
+			}
+
+			net2str(gateway_str, sizeof(gateway_str), &ipv4);
+			break;
+
+		case SUBNET_IPV6:
+			if(!ipv6.type) {
+				fprintf(stderr, "Route requested but no Ifconfig\n");
+				return;
+			}
+
+			net2str(gateway_str, sizeof(gateway_str), &ipv6);
+			break;
+
+		default:
+			return;
+		}
+
+		char *slash = strchr(gateway_str, '/');
+
+		if(slash) {
+			*slash = 0;
 		}
 	}
+
+	switch(subnet.type) {
+	case SUBNET_IPV4:
+		fprintf(out, "route add %s %s\n", subnet_str, gateway_str);
+		break;
+
+	case SUBNET_IPV6:
+		fprintf(out, "route add -inet6 %s %s\n", subnet_str, gateway_str);
+		break;
+
+	default:
+		return;
+	}
+
 #endif
 }