openvpnctrl: SNAT transfer networks.

diff --git a/src/misc-progs/openvpnctrl.c b/src/misc-progs/openvpnctrl.c
index 4b098a696a320419cf966915b74640ca5d3f0bc9..e16700959810b6b010cdb829773052bc99e976b9 100644 (file)
--- a/src/misc-progs/openvpnctrl.c
+++ b/src/misc-progs/openvpnctrl.c
@@ -359,29 +359,26 @@ void createAllChains(void) {
 }
 
 char* calcTransferNetAddress(const connection* conn) {
-       char *subnetmask = strdup(conn->transfer_subnet);
-       char *address = strsep(&subnetmask, "/");
+       char *address = strdup(conn->transfer_subnet);
+       address = strsep(&address, "/");
 
-       in_addr_t _address    = inet_addr(address);
-       in_addr_t _subnetmask = inet_addr(subnetmask);
-       _address &= _subnetmask;
+       struct in_addr address_info;
+       if (!inet_aton(address, &address_info)) {
+               goto ERROR;
+       }
 
-       if (strcmp(conn->role, "server") == 0) {
-               _address += 1 << 24;
-       } else if (strcmp(conn->role, "client") == 0) {
-               _address += 2 << 24;
+       if (strcmp(conn->role, "server")) {
+               address_info.s_addr += 1 << 24;
+       } else if (strcmp(conn->role, "client")) {
+               address_info.s_addr += 2 << 24;
        } else {
                goto ERROR;
        }
 
-       struct in_addr address_info;
-       address_info.s_addr = _address;
-
-       return inet_ntoa(address_info);
+       address = inet_ntoa(address_info);
+       return address;
 
 ERROR:
-       fprintf(stderr, "Could not determine transfer net address: %s\n", conn->name);
-
        free(address);
        return NULL;
 }
@@ -431,8 +428,6 @@ char* getLocalSubnetAddress(const connection* conn) {
        }
 
 ERROR:
-       fprintf(stderr, "Could not determine local subnet address: %s\n", conn->name);
-
        freekeyvalues(kv);
        return NULL;
 }
@@ -496,9 +491,6 @@ void setFirewallRules(void) {
                        local_subnet_address = getLocalSubnetAddress(conn);
                        transfer_subnet_address = calcTransferNetAddress(conn);
 
-                       if ((!local_subnet_address) || (!transfer_subnet_address))
-                               continue;
-
                        snprintf(command, STRING_SIZE, "/sbin/iptables -t nat -A %s -s %s -j SNAT --to-source %s",
                                OVPNNAT, transfer_subnet_address, local_subnet_address);
                        executeCommand(command);