From 7272f6ee407d1d29eaee5a89160b134c991fcf55 Mon Sep 17 00:00:00 2001 From: stilez Date: Tue, 12 Jan 2016 08:20:45 +0000 Subject: redmine 5702 - change to use high level IPv4 functions where low level ip2long32() etc are used --- src/etc/inc/openvpn.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/etc') diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index 9dc83c5..b408953 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -1243,9 +1243,9 @@ function openvpn_resync_csc(& $settings) { $csc_conf .= "ifconfig-push {$ip} " . gen_subnet_mask($mask) . "\n"; } else { /* Because this is being pushed, the order from the client's point of view. */ - $baselong = ip2long32($ip) & gen_subnet_mask_long($mask); - $serverip = long2ip32($baselong + 1); - $clientip = long2ip32($baselong + 2); + $baselong = gen_subnetv4($ip, $mask); + $serverip = ip_after($baselong, 1); + $clientip = ip_after($baselong, 2); $csc_conf .= "ifconfig-push {$clientip} {$serverip}\n"; } } -- cgit v1.1 From 493e68074ab2b1f3e90c1e42e63ffa161888222d Mon Sep 17 00:00:00 2001 From: stilez Date: Wed, 13 Jan 2016 10:57:25 +0000 Subject: Remove spaces at EOL as requested --- src/etc/inc/openvpn.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/etc') diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index b408953..c7810a6 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -1243,9 +1243,9 @@ function openvpn_resync_csc(& $settings) { $csc_conf .= "ifconfig-push {$ip} " . gen_subnet_mask($mask) . "\n"; } else { /* Because this is being pushed, the order from the client's point of view. */ - $baselong = gen_subnetv4($ip, $mask); - $serverip = ip_after($baselong, 1); - $clientip = ip_after($baselong, 2); + $baselong = gen_subnetv4($ip, $mask); + $serverip = ip_after($baselong, 1); + $clientip = ip_after($baselong, 2); $csc_conf .= "ifconfig-push {$clientip} {$serverip}\n"; } } -- cgit v1.1