Project

General

Profile

« Previous | Next » 

Revision 5128e0fe

Added by Ermal LUÇI about 12 years ago

For ppp interfaces the real interface is not present anymore in the xml config section of the interface. Due to this do some more work on extracting the real interface when ipv4 is pppoe/ppp/... and ipv6 configuration files will use the wrong interface to request information from provider. Reported-by: http://forum.pfsense.org/index.php/topic,64483.0.html

View differences:

etc/inc/interfaces.inc
3902 3902
				$wanif = "{$interface}_stf";
3903 3903
				break;
3904 3904
			default:
3905
				if( is_array($cfg['wireless']) || preg_match($g['wireless_regex'], $cfg['if']))
3906
					$wanif = interface_get_wireless_clone($cfg['if']);
3907
				else
3908
					$wanif = $cfg['if'];
3905
				switch ($cfg['ipaddr']) {
3906
				case 'pppoe':
3907
				case 'ppp':
3908
				case 'l2tp':
3909
				case 'pptp':
3910
					$parents = get_parent_interface($interface);
3911
					if (!empty($parents[0]))
3912
						$wanif = $parents[0];
3913
					else
3914
						$wanif = $cfg['if'];
3915
					break;
3916
				default:
3917
					if( is_array($cfg['wireless']) || preg_match($g['wireless_regex'], $cfg['if']))
3918
						$wanif = interface_get_wireless_clone($cfg['if']);
3919
					else
3920
						$wanif = $cfg['if'];
3921
					break;
3922
				}
3909 3923
				break;
3910 3924
			}
3911 3925
		} else {

Also available in: Unified diff