diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-07-30 16:53:28 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-07-30 16:53:28 +0000 |
| commit | ab900a0916ff5bf2dde0784b9bbe6bac8208dd3d (patch) | |
| tree | fb3afb2145d3419f8404ff5fb0b13babab37df33 | |
| parent | fe7d3a1bdd75ce614c5dd688c57e9e0d90fb8094 (diff) | |
| download | pfsense-ab900a0916ff5bf2dde0784b9bbe6bac8208dd3d.zip pfsense-ab900a0916ff5bf2dde0784b9bbe6bac8208dd3d.tar.gz | |
Remove generating entries when <bridge> knob is set forinterfaces.
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.
| -rw-r--r-- | etc/inc/filter.inc | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 97eb065..cf02e66 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -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; } |
