webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

openvpnctrl: Save the binary from crashing with wrong input.

Browse Source 
See #10390.
This commit is contained in:
Michael Tremer
2013-07-17 18:53:13 +02:00
parent b5c00b8654
commit cdbe350442
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/misc-progs/openvpnctrl.c
View File

@@ -362,6 +362,10 @@ char* calcTransferNetAddress(const connection* conn) {
char *subnetmask = strdup(conn->transfer_subnet);
char *address = strsep(&subnetmask, "/");
if ((address == NULL) || (subnetmask == NULL)) {
goto ERROR;
}
in_addr_t _address = inet_addr(address);
in_addr_t _subnetmask = inet_addr(subnetmask);
_address &= _subnetmask;
@@ -496,12 +500,11 @@ 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);
if ((local_subnet_address) && (transfer_subnet_address)) {
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);
}
}
conn = conn->next;