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

Remove generating entries when <bridge> knob is set forinterfaces.

Browse Source 
It was awkward cause it tried to use the ip of the interface bridged with!
Furthemore we do bridging differently now so no need to keep that around too.
This commit is contained in:
Ermal Luçi 2008-07-30 16:53:28 +00:00
parent fe7d3a1bdd
commit ab900a0916
1 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
etc/inc/filter.inc
View File

@ -427,29 +427,14 @@ function generate_optcfg_array()
$oic = array();
$oic['if'] = get_real_wan_interface($if);
if ($oc['bridge']) {
if (isset($config['interfaces'][$oc['bridge']]['enable']) &&
is_ipaddr($config['interfaces'][$oc['bridge']]['ipaddr'])) {
$oic['ip'] = $config['interfaces'][$oc['bridge']]['ipaddr'];
$oic['sn'] = $config['interfaces'][$oc['bridge']]['subnet'];
$oic['sa'] = gen_subnet($oic['ip'], $oic['sn']);
}
$oic['descr'] = $ifdetail;
$oic['nonat'] = $oc['nonat'];
$oic['alias-address'] = $oc['alias-address'];
$oic['alias-subnet'] = $oc['alias-subnet'];
$oic['gateway'] = $oc['gateway'];
$oic['bridge'] = 1;
} else {
$oic['ip'] = $oc['ipaddr'];
$oic['sn'] = $oc['subnet'];
$oic['descr'] = $ifdetail;
$oic['sa'] = gen_subnet($oic['ip'], $oic['sn']);
$oic['nonat'] = $oc['nonat'];
$oic['alias-address'] = $oc['alias-address'];
$oic['alias-subnet'] = $oc['alias-subnet'];
$oic['gateway'] = $oc['gateway'];
}
$oic['ip'] = $oc['ipaddr'];
$oic['sn'] = $oc['subnet'];
$oic['descr'] = $ifdetail;
$oic['sa'] = gen_subnet($oic['ip'], $oic['sn']);
$oic['nonat'] = $oc['nonat'];
$oic['alias-address'] = $oc['alias-address'];
$oic['alias-subnet'] = $oc['alias-subnet'];
$oic['gateway'] = $oc['gateway'];
$FilterIflist[$if] = $oic;
}