Project

General

Profile

« Previous | Next » 

Revision 67ee1ec5

Added by Ermal Luçi almost 17 years ago

  • 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

View differences:

etc/rc.banner
62 62 
			$ifconf =& $config['interfaces'][$ifinfo['friendly']];
63 63 
			/* look for 'special cases' */
64 64 
			switch($ifconf['ipaddr']) {
65 
			case "carpdev-dhcp":
66 
				$ifinfo['class'] = "(CarpDEV)";
67 
				break;
65 68 
			case "dhcp":
66 69 
				$ifinfo['class'] = "(DHCP)";
67 70 
				break;
68 71 
			case "pppoe":
69 72 
				$ifinfo['class'] = "(PPPoE)";
70 
				$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr'];
73 
				//$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr'];
71 74 
				break;
72 75 
			case "pptp":
73 76 
				$ifinfo['class'] = "(PPTP)";
74 
				$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr'];
77 
				//$ifinfo['ipaddr'] = $iflist[$g['pppoe_interface']]['ipaddr'];
75 78 
				break;
76 79 
			}
80 
			$ifinfo['ipaddr'] = get_current_wan_address($ifinfo['friendly']);
77 81 
			$tobanner = $friendly;
78 82 
			/* does this interface have an extra description? */
79 83 
			if($ifconf['descr']) {

Also available in: Unified diff