summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstilez <stilez@users.noreply.github.com>2016-01-12 08:23:50 +0000
committerstilez <stilez@users.noreply.github.com>2016-01-12 08:23:50 +0000
commitc50634b5e821966bc4c4a0a30532171952868404 (patch)
tree49c30a1843b34393fe783aa396db5b63962aac68
parentf4c114d4a6fcfcd7e69e6a009db683d78d83189d (diff)
downloadpfsense-c50634b5e821966bc4c4a0a30532171952868404.zip
pfsense-c50634b5e821966bc4c4a0a30532171952868404.tar.gz
redmine 5702 - switch to high level IPv4 functions instead of low level ip2long32() etc
-rw-r--r--src/etc/inc/vpn.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc
index 50f0b01..8aa3cbd 100644
--- a/src/etc/inc/vpn.inc
+++ b/src/etc/inc/vpn.inc
@@ -1588,7 +1588,7 @@ function vpn_pppoe_configure(&$pppoecfg) {
for ($i = 0; $i < $pppoecfg['n_pppoe_units']; $i++) {
- $clientip = long2ip32(ip2long($pppoecfg['remoteip']) + $i);
+ $clientip = ip_after($pppoecfg['remoteip'], $i);
if (isset($pppoecfg['radius']['radiusissueips']) && isset($pppoecfg['radius']['server']['enable'])) {
$issue_ip_type = "set ipcp ranges {$pppoecfg['localip']}/32 0.0.0.0/0";
@@ -1827,7 +1827,7 @@ EOD;
for ($i = 0; $i < $l2tpcfg['n_l2tp_units']; $i++) {
- $clientip = long2ip32(ip2long($l2tpcfg['remoteip']) + $i);
+ $clientip = ip_after($l2tpcfg['remoteip'], $i);
if (isset ($l2tpcfg['radius']['radiusissueips']) && isset ($l2tpcfg['radius']['enable'])) {
$issue_ip_type = "set ipcp ranges {$l2tpcfg['localip']}/32 0.0.0.0/0";
OpenPOWER on IntegriCloud