Releasing 1.1pre15.

[tinc] / src / ifconfig.c

diff --git a/src/ifconfig.c b/src/ifconfig.c
index 953499a..0b99402 100644 (file)
--- 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
@@ -89,30 +89,34 @@ void ifconfig_address(FILE *out, const char *value) {
        subnet_t address = {};
        char address_str[MAXNETSTR];
        if(!str2net(&address, value) || !net2str(address_str, sizeof address_str, &address)) {
-               fprintf(stderr, "Could not parse Ifconfig statement\n");
+               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;
+               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;
-       }
-#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;
                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;
+               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
 }
@@ -139,15 +143,30 @@ void ifconfig_route(FILE *out, const char *value) {
                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;
+                       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;
+                       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;
                }
        }
-#elif defined(HAVE_BSD)
-       // BSD route command is silly and doesn't accept an interface name as a destination.
+#else // assume BSD
        if(!*gateway_str) {
                switch(subnet.type) {
                        case SUBNET_IPV4:
@@ -164,6 +183,7 @@ void ifconfig_route(FILE *out, const char *value) {
                                }
                                net2str(gateway_str, sizeof gateway_str, &ipv6);
                                break;
+                       default: return;
                }
                char *slash = strchr(gateway_str, '/'); if(slash) *slash = 0;
        }
@@ -171,18 +191,7 @@ void ifconfig_route(FILE *out, const char *value) {
        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;
-               }
-       } 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
 }