mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'mainline/master'

Browse Source
This commit is contained in:
Renato Botelho 2010-04-15 09:49:52 -03:00
commit 65ebfd9855
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/inc/captiveportal.inc
View File

@ -43,8 +43,6 @@
/* include all configuration functions */
require_once("config.inc");
require_once("functions.inc");
require_once("radius_authentication.inc");
require_once("radius_accounting.inc");
require_once("radius.inc");
require_once("voucher.inc");

7
etc/inc/upgrade_config.inc
View File

@ -785,8 +785,11 @@ function upgrade_042_to_043() {
/* Update all filter rules which might reference this gateway */
$j = 0;
foreach($config['filter']['rule'] as $rule) {
if(is_ipaddr($rule['gateway']) && ($rule['gateway'] == $config['gateways']['gateway_item'][$i]['gateway'])) {
$config['filter']['rule'][$j]['gateway'] = $config['gateways']['gateway_item'][$i]['name'];
if(is_ipaddr($rule['gateway'])) {
if ($rule['gateway'] == $config['gateways']['gateway_item'][$i]['gateway'])
$config['filter']['rule'][$j]['gateway'] = $config['gateways']['gateway_item'][$i]['name'];
else if ($rule['gateway'] == $ifname)
$config['filter']['rule'][$j]['gateway'] = $config['gateways']['gateway_item'][$i]['name'];
}
$j++;
}

2
usr/local/captiveportal/radius_accounting.inc
View File

@ -47,6 +47,8 @@ RADIUS ACCOUNTING START
-----------------------
*/
PEAR::loadExtension('bcmath');
function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers, $clientip, $clientmac) {
global $config;

4
usr/local/www/firewall_nat_out_edit.php
View File

@ -434,6 +434,10 @@ any)</td>
foreach ($config['virtualip']['vip'] as $sn):
if ($sn['mode'] == "proxyarp" && $sn['type'] == "network"):
$baseip = ip2long($sn['subnet']) & ip2long(gen_subnet_mask($sn['subnet_bits']));
$snip = long2ip($baseip);
?>
<option value="<?=$snip;?>" <?php if ($snip == $pconfig['target']) echo "selected"; ?>><?=htmlspecialchars("{$snip} ({$sn['descr']})");?></option>
<?php
for ($i = $sn['subnet_bits']; $i <= 32; $i++):
$baseip = $baseip + 1;
$snip = long2ip($baseip);