diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-04-16 18:29:42 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-04-16 18:29:42 +0000 |
| commit | 6dd9b0154e4da222d12b814e4338b1181296df77 (patch) | |
| tree | d34a26d986f99f74a09f4b184150fa6b1c12df62 /etc/inc/filter.inc | |
| parent | 6a74c90e9d12a5ad6e8b16e8c22fa60b658f0a85 (diff) | |
| download | pfsense-6dd9b0154e4da222d12b814e4338b1181296df77.zip pfsense-6dd9b0154e4da222d12b814e4338b1181296df77.tar.gz | |
First try to cope with the new ability of mpd to rename its interfaces.
This is just a s/ng0/typeof connection0/ for now.
The major work should be done to allow all optX and lan to be pppoe or pptp interafaces and take just assign the network interface accordingly. It simplifies a lot o things but this has to be done.
This would propperly identifying interfaces and not hardcoding names around.
Diffstat (limited to 'etc/inc/filter.inc')
| -rw-r--r-- | etc/inc/filter.inc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 07fb879..c52eba9 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -335,9 +335,12 @@ function filter_generate_aliases() { if($config['interfaces']['lan']) $aliases .= "lan = \"{ {$config['interfaces']['lan']['if']}{$lan_aliases} }\"\n"; - if($config['interfaces']['wan']['ipaddr'] == "pppoe" or $config['interfaces']['wan']['ipaddr'] == "pptp") { - $aliases .= "ng0 = \"{ " . $config['interfaces']['wan']['if'] . " " . get_real_wan_interface() . " }\" \n"; - $aliases .= "wan = \"{ " . $config['interfaces']['wan']['if'] . "{$wan_aliases} ng0 }\"\n"; + if($config['interfaces']['wan']['ipaddr'] == "pppoe") { + $aliases .= "pppoe0 = \"{ " . $config['interfaces']['wan']['if'] . " " .get_real_wan_interface() . " }\" \n"; + $aliases .= "wan = \"{ " . $config['interfaces']['wan']['if'] . "{$wan_aliases} pppoe0 }\"\n"; + } else if ($config['interfaces']['wan']['ipaddr'] == "pptp") { + $aliases .= "pptp0 = \"{ " . $config['interfaces']['wan']['if'] . " " . get_real_wan_interface() . " }\" \n"; + $aliases .= "wan = \"{ " . $config['interfaces']['wan']['if'] . "{$wan_aliases} pptp0 }\"\n"; } else { $aliases .= "wan = \"{ " . get_real_wan_interface() . "{$wan_aliases} }\"\n"; } |
