diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-03-03 13:03:45 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-03-03 13:04:18 -0600 |
| commit | 12d7d9e71e85308daeebf9533700d37f14fcc41b (patch) | |
| tree | e19a99177a557f5c8f17741f7dd51a20c84ac5e2 /src/etc/inc | |
| parent | ffb8625fb38169ed43c79999e7754a9372ea9d85 (diff) | |
| download | pfsense-12d7d9e71e85308daeebf9533700d37f14fcc41b.zip pfsense-12d7d9e71e85308daeebf9533700d37f14fcc41b.tar.gz | |
Revert "Always send a -HUP to dhcp6c in interfaces_track6_configure for DHCP6 WAN types. Doing so isn't any more disruptive than what it's already doing, and that ensures track6 interfaces don't lose their IPv6 IPs. Ticket #5945"
This reverts commit 471b81f8f7b0a5fe22019aed955e5374e3411dbf.
Diffstat (limited to 'src/etc/inc')
| -rw-r--r-- | src/etc/inc/interfaces.inc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 8908a9a..2929ca3 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -3529,10 +3529,18 @@ function interface_track6_configure($interface = "lan", $wancfg, $linkupevent = interface_track6_6rd_configure($interface, $wancfg); break; case "dhcp6": - $parentrealif = get_real_interface($wancfg['track6-interface']); - $pidv6 = find_dhcp6c_process($parentrealif); - if ($pidv6) { - posix_kill($pidv6, SIGHUP); + if ($linkupevent == true) { + /* + * NOTE: Usually come here from rc.linkup calling so just call directly instead of generating event + * Instead of disrupting all other v4 configuration just restart DHCPv6 client for now + * + * XXX: Probably DHCPv6 client should handle this automagically itself? + */ + $parentrealif = get_real_interface($wancfg['track6-interface']); + $pidv6 = find_dhcp6c_process($parentrealif); + if ($pidv6) { + posix_kill($pidv6, SIGHUP); + } } break; } |
