diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-09-22 22:22:29 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-09-22 22:22:29 +0000 |
| commit | 6fa4bdc672e0da8651a6d3fc5ff7226080f3a471 (patch) | |
| tree | 841aabb733ecb442d3b2afa5b9f4b482bfc300e5 | |
| parent | de27c94dd8c9ee8a63f98909b0f693e6d6b09528 (diff) | |
| download | pfsense-6fa4bdc672e0da8651a6d3fc5ff7226080f3a471.zip pfsense-6fa4bdc672e0da8651a6d3fc5ff7226080f3a471.tar.gz | |
Correct carp bringup sequence
| -rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
| -rwxr-xr-x | etc/rc.bootup | 4 | ||||
| -rwxr-xr-x | usr/local/captiveportal/index.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index fd19165..ca9fa0e 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -375,7 +375,7 @@ function interfaces_carp_bringup() { global $g; /* lets bring the carp interfaces up now */ if ($g['booting']) - sleep(1); + sleep(2); $carp_ints = find_number_of_created_carp_interfaces(); for($x=0; $x<$carp_ints; $x++) mwexec("/sbin/ifconfig carp{$x} up"); diff --git a/etc/rc.bootup b/etc/rc.bootup index 054c208..07d1542 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -148,7 +148,7 @@ filter_pflog_start(); /* bring up carp interfaces */ - interfaces_carp_bringup(); + interfaces_carp_configure(); /* setup altq + pf */ echo "Configuring firewall... "; @@ -219,7 +219,7 @@ unmute_kernel_msgs(); /* setup carp interfaces */ - interfaces_carp_configure(); + interfaces_carp_bringup(); mwexec("/sbin/pfctl -f /tmp/rules.debug"); diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php index a6a3581..bf4ab74 100755 --- a/usr/local/captiveportal/index.php +++ b/usr/local/captiveportal/index.php @@ -43,7 +43,7 @@ header("Pragma: no-cache"); $orig_host = $_ENV['HTTP_HOST']; $orig_request = $_ENV['CAPTIVE_REQPATH']; $lockfile = "{$g['varrun_path']}/captiveportal.lock"; -$clientip = $_ENV['REMOTE_ADDR']; +$clientip = $_SERVER['REMOTE_ADDR']; if (!$clientip) { /* not good - bail out */ |
