Revision 15a73ba8
Added by Ermal LUÇI about 12 years ago
| etc/inc/interfaces.inc | ||
|---|---|---|
| 4202 | 4202 |
$wanif = "{$interface}_stf";
|
| 4203 | 4203 |
break; |
| 4204 | 4204 |
default: |
| 4205 |
if( is_array($cfg['wireless']) || preg_match($g['wireless_regex'], $cfg['if'])) |
|
| 4206 |
$wanif = interface_get_wireless_clone($cfg['if']); |
|
| 4207 |
else |
|
| 4208 |
$wanif = $cfg['if']; |
|
| 4205 |
switch ($cfg['ipaddr']) {
|
|
| 4206 |
case 'pppoe': |
|
| 4207 |
case 'ppp': |
|
| 4208 |
case 'l2tp': |
|
| 4209 |
case 'pptp': |
|
| 4210 |
$parents = get_parent_interface($interface); |
|
| 4211 |
if (!empty($parents[0])) |
|
| 4212 |
$wanif = $parents[0]; |
|
| 4213 |
else |
|
| 4214 |
$wanif = $cfg['if']; |
|
| 4215 |
break; |
|
| 4216 |
default: |
|
| 4217 |
if( is_array($cfg['wireless']) || preg_match($g['wireless_regex'], $cfg['if'])) |
|
| 4218 |
$wanif = interface_get_wireless_clone($cfg['if']); |
|
| 4219 |
else |
|
| 4220 |
$wanif = $cfg['if']; |
|
| 4221 |
break; |
|
| 4222 |
} |
|
| 4209 | 4223 |
break; |
| 4210 | 4224 |
} |
| 4211 | 4225 |
} else {
|
Also available in: Unified diff
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