summaryrefslogtreecommitdiffstats
path: root/etc/inc/interfaces.inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2013-07-23 09:56:38 +0000
committerErmal <eri@pfsense.org>2013-07-23 09:56:38 +0000
commit329024c8720ecc04c603989575d6eec9cb97bd83 (patch)
tree1237112b5d4bc714cd7ff44e34ebad14b81b94ea /etc/inc/interfaces.inc
parent338ade402396c68dec61762a01bdca5cd298be3c (diff)
downloadpfsense-329024c8720ecc04c603989575d6eec9cb97bd83.zip
pfsense-329024c8720ecc04c603989575d6eec9cb97bd83.tar.gz
Implement an option to allow using the IPv4 connectivity interface for sending the dhcpv6 information. Usually useful for ppp[oe] type links and some ISP
Diffstat (limited to 'etc/inc/interfaces.inc')
-rw-r--r--etc/inc/interfaces.inc12
1 files changed, 8 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index e8a7a58..7377d9c 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3916,11 +3916,15 @@ function get_real_interface($interface = "wan", $family = "all") {
case 'ppp':
case 'l2tp':
case 'pptp':
- $parents = get_parent_interface($interface);
- if (!empty($parents[0]))
- $wanif = $parents[0];
- else
+ if (isset($cfg['dhcp6usev4iface']))
$wanif = $cfg['if'];
+ else {
+ $parents = get_parent_interface($interface);
+ if (!empty($parents[0]))
+ $wanif = $parents[0];
+ else
+ $wanif = $cfg['if'];
+ }
break;
default:
if( is_array($cfg['wireless']) || preg_match($g['wireless_regex'], $cfg['if']))
OpenPOWER on IntegriCloud