diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-05-06 00:13:12 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-05-06 00:13:12 +0000 |
| commit | 66f59ea2df3a5b810d7bdfffca3b57106659b32f (patch) | |
| tree | a676d964fecfcdbc0a3c94953f5688ac08f25e3c | |
| parent | 6b70c7c84ed3ee87c2765c586d5c1c90018db120 (diff) | |
| download | pfsense-66f59ea2df3a5b810d7bdfffca3b57106659b32f.zip pfsense-66f59ea2df3a5b810d7bdfffca3b57106659b32f.tar.gz | |
Cleanups
| -rw-r--r-- | etc/inc/filter.inc | 7 | ||||
| -rw-r--r-- | etc/inc/interfaces.inc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index f7d8914..a6d6c88 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -179,7 +179,7 @@ function filter_configure() { } else { //if(php_check_syntax($text, $error_message) == false) if($g['booting'] == true) { - echo " {$file} "; + echo "{$file} "; } eval($text); echo " .. "; @@ -189,6 +189,11 @@ function filter_configure() { } } + /* lets bring the carp interfaces up now */ + $carp_ints = find_number_of_created_carp_interfaces(); + for($x=0; $x<$carp_ints; $x++) + mwexec("/sbin/ifconfig carp{$carp_instances_counter} up"); + if ($g['booting']) echo "Done\n"; return 0; diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index e84009b..e2f37d7 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -285,6 +285,7 @@ function interfaces_carp_configure() { mwexec("/sbin/ifconfig pfsync0 syncif " . $carp_sync_int); mwexec("/sbin/ifconfig {$carp_sync_int} up"); mwexec("/sbin/ifconfig pfsync0 up"); + mwexec("echo pass all proto pfsync from any to any | pfctl -"); $pfsync_instances_counter++; } } @@ -299,7 +300,6 @@ function interfaces_carp_configure() { $password = " pass " . $carp['password']; } mwexec("/sbin/ifconfig carp" . $carp_instances_counter . " " . $carp['ipaddress'] . "/" . $carp['netmask'] . " broadcast " . $broadcast_address . " vhid " . $carp['vhid'] . " advskew " . $carp['advskew'] . $password); - mwexec("/sbin/ifconfig carp{$carp_instances_counter} up"); $carp_instances_counter++; } } |
