Convert sizeof foo to sizeof(foo).

[tinc] / src / ifconfig.c

diff --git a/src/ifconfig.c b/src/ifconfig.c
index 7688a3c..c03fef4 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
@@ -88,7 +88,7 @@ static subnet_t ipv4, ipv6;
 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)) {
+       if(!str2net(&address, value) || !net2str(address_str, sizeof(address_str), &address)) {
                fprintf(stderr, "Could not parse address in Ifconfig statement\n");
                return;
        }
@@ -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
 }
 
@@ -127,12 +127,12 @@ void ifconfig_route(FILE *out, const char *value) {
        char *sep = strchr(value, ' ');
        if(sep)
                *sep++ = 0;
-       if(!str2net(&subnet, value) || !net2str(subnet_str, sizeof subnet_str, &subnet) || subnet.type == SUBNET_MAC) {
+       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) {
-               if(!str2net(&gateway, sep) || !net2str(gateway_str, sizeof gateway_str, &gateway) || gateway.type != subnet.type) {
+               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;
                }
@@ -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:
@@ -161,14 +174,14 @@ void ifconfig_route(FILE *out, const char *value) {
                                        fprintf(stderr, "Route requested but no Ifconfig\n");
                                        return;
                                }
-                               net2str(gateway_str, sizeof gateway_str, &ipv4);
+                               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);
+                               net2str(gateway_str, sizeof(gateway_str), &ipv6);
                                break;
                        default: return;
                }
@@ -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
 }