diff options
| author | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
| commit | d9e2c1714bc55f546702a8660f62e8cff2716aa4 (patch) | |
| tree | 069b2f5369ad4bf9c7e60806b47f5dd42e409c78 /usr/local/www/firewall_nat_edit.php | |
| parent | 30ade8461e65922c8d8a22d3b9ba5b07bb2912e0 (diff) | |
| parent | c0ed686f9441b7019722954020057b23fe2f6603 (diff) | |
| download | pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.zip pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
usr/local/www/interfaces.php
Not sure why there was a conflict since the last change to this file was May 20.
Diffstat (limited to 'usr/local/www/firewall_nat_edit.php')
| -rwxr-xr-x | usr/local/www/firewall_nat_edit.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index 11744ae..d7806b1 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -625,10 +625,10 @@ include("fbegin.inc"); ?> <?php if (is_array($config['virtualip']['vip'])): foreach ($config['virtualip']['vip'] as $sn): if ($sn['mode'] == "proxyarp" && $sn['type'] == "network"): - $baseip = ip2long($sn['subnet']) & ip2long(gen_subnet_mask($sn['subnet_bits'])); + $baseip = ip2long32($sn['subnet']) & ip2long(gen_subnet_mask($sn['subnet_bits'])); for ($i = $sn['subnet_bits'] - 1; $i <= 32; $i++): - $snip = long2ip($baseip); + $snip = long2ip32($baseip); ?> <option value="<?=$snip;?>" <?php if ($snip == $pconfig['dst']) echo "selected"; ?>><?=htmlspecialchars("{$snip} ({$sn['descr']})");?></option> <?php $baseip = $baseip + 1; ?> |
