diff options
| author | Ermal Luçi <eri@pfsense.org> | 2008-07-14 20:43:59 +0000 |
|---|---|---|
| committer | Ermal Luçi <eri@pfsense.org> | 2008-07-14 20:43:59 +0000 |
| commit | 67ee1ec5ec2fe7722d0039aa98da72c4f58107f9 (patch) | |
| tree | eca381dbf3e8a85aa1083e6c54a59b33a82b040f /etc/rc.banner | |
| parent | cbdf9821cc0c9cd09d27732aba5e1f293faf9921 (diff) | |
| download | pfsense-67ee1ec5ec2fe7722d0039aa98da72c4f58107f9.zip pfsense-67ee1ec5ec2fe7722d0039aa98da72c4f58107f9.tar.gz | |
* Merge multiple PPPoE/PPTP interfaces from RELENG_1_MULTI_ANYTHING
* Much improved rule generation speed
* Many bug fixing in general of the interface handling
NOTE: this is only half part of the changes the other half will come after
Diffstat (limited to 'etc/rc.banner')
| -rwxr-xr-x | etc/rc.banner | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/etc/rc.banner b/etc/rc.banner index a11208a..2b9dc5f 100755 --- a/etc/rc.banner +++ b/etc/rc.banner @@ -62,18 +62,22 @@ $ifconf =& $config['interfaces'][$ifinfo['friendly']]; /* look for 'special cases' */ switch($ifconf['ipaddr']) { + case "carpdev-dhcp": + $ifinfo['class'] = "(CarpDEV)"; + break; case "dhcp": $ifinfo['class'] = "(DHCP)"; break; case "pppoe": $ifinfo['class'] = "(PPPoE)"; - $ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr']; + //$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr']; break; case "pptp": $ifinfo['class'] = "(PPTP)"; - $ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr']; + //$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr']; break; } + $ifinfo['ipaddr'] = get_current_wan_address($ifinfo['friendly']); $tobanner = $friendly; /* does this interface have an extra description? */ if($ifconf['descr']) { |
