summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorsmos <seth.mos@dds.nl>2012-06-18 19:43:37 +0200
committersmos <seth.mos@dds.nl>2012-06-18 19:43:37 +0200
commit61c4383d23cd86171f8249989a078db6f85fcb7c (patch)
tree6448532a39c84cfe5e4022fdb6fbe2b6f5efe0f4 /etc/inc
parent63127eeee6f93a97f5b0c2e5cbeec8d89b3aa79f (diff)
downloadpfsense-61c4383d23cd86171f8249989a078db6f85fcb7c.zip
pfsense-61c4383d23cd86171f8249989a078db6f85fcb7c.tar.gz
A few launch improvements so that configuring the DHCP6 client on the WAN it immediately kicks in.
With the fixed rc.newwanipv6 it should immediately spring to life. Redmine ticket #2414
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/interfaces.inc11
1 files changed, 6 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 19ac4eb..14df981 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3345,10 +3345,14 @@ function interface_dhcpv6_configure($interface = "wan") {
mwexec("/sbin/sysctl -w net.inet6.ip6.accept_rtadv=1");
log_error("Accept router advertisements on interface {$wanif} ");
mwexec("/sbin/ifconfig {$wanif} inet6 accept_rtadv");
- mwexec("/sbin/ifconfig {$wanif} inet6 defroute_rtadv");
+
+ /* run a filter configure so that the filter rules allow traffic before we launch the client */
+ filter_configure();
+ sleep(3);
/* fire up dhcp6c for IPv6 first, this backgrounds immediately */
mwexec("/usr/local/sbin/dhcp6c -d -c {$g['varetc_path']}/dhcp6c_{$interface}.conf {$wanif}");
+ sleep(1);
exec("/sbin/rtsol -d {$wanif} 2>&1", $out, $ret);
if(!empty($out)) {
foreach($out as $line) {
@@ -3363,10 +3367,7 @@ function interface_dhcpv6_configure($interface = "wan") {
}
}
}
- /* sleep a few seconds before returning to give the client some time
- * to configure a lan interface with a prefix */
- sleep(5);
-
+ /* worst case is that the rc.newwanipv6 handles setting up the track6 interface */
if($wancfg['ippaddrv6'] != "slaac") {
/* configure dependent interfaces */
foreach($iflist as $if => $ifname) {
OpenPOWER on IntegriCloud