diff options
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/pkg/carp.xml | 2 | ||||
| -rw-r--r-- | usr/local/pkg/carp_settings.xml | 2 | ||||
| -rwxr-xr-x | usr/local/www/carp_status.php | 1 | ||||
| -rwxr-xr-x | usr/local/www/firewall_virtual_ip.php | 1 | ||||
| -rwxr-xr-x | usr/local/www/firewall_virtual_ip_edit.php | 3 | ||||
| -rwxr-xr-x | usr/local/www/interfaces.php | 5 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_lan.php | 3 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_opt.php | 3 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_wan.php | 5 | ||||
| -rwxr-xr-x | usr/local/www/xmlrpc.php | 1 |
10 files changed, 2 insertions, 24 deletions
diff --git a/usr/local/pkg/carp.xml b/usr/local/pkg/carp.xml index 305ea03..0f536a4 100644 --- a/usr/local/pkg/carp.xml +++ b/usr/local/pkg/carp.xml @@ -219,13 +219,11 @@ </custom_php_command_before_form> <custom_add_php_command_late> interfaces_carp_configure(); - interfaces_carp_bringup(); </custom_add_php_command_late> <custom_php_resync_config_command> </custom_php_resync_config_command> <custom_delete_php_command> interfaces_carp_configure(); - interfaces_carp_bringup(); </custom_delete_php_command> <custom_php_deinstall_command> unlink_if_exists("/usr/local/pkg/carp*"); diff --git a/usr/local/pkg/carp_settings.xml b/usr/local/pkg/carp_settings.xml index cd232a0..49e3e1a 100644 --- a/usr/local/pkg/carp_settings.xml +++ b/usr/local/pkg/carp_settings.xml @@ -167,8 +167,6 @@ </field> </fields> <custom_add_php_command_late> - /* resync */ - interfaces_carp_bringup(); /* setup carp interfaces */ interfaces_carp_configure(); /* force a filter configure for syncing */ diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index 453f2fc..5a407db 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -49,7 +49,6 @@ if($_POST['disablecarp'] <> "") { $savemsg = "CARP has been enabled."; mwexec("/sbin/sysctl net.inet.carp.allow=1"); interfaces_carp_configure(); - interfaces_carp_bringup(); } } diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index e794410..1bf1ec9 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -55,7 +55,6 @@ if ($_POST) { $retval = services_proxyarp_configure(); /* Bring up any configured CARP interfaces */ interfaces_carp_configure(); - interfaces_carp_bringup(); $retval |= filter_configure(); config_unlock(); } diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index d06a811..4863a33 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -153,9 +153,6 @@ if ($_POST) { touch($d_vipconfdirty_path); - /* bring up carp interfaces */ - interfaces_carp_bringup(); - /* setup carp interfaces */ interfaces_carp_configure(); diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index fbede8c..4265783 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -261,10 +261,7 @@ if ($_POST) { /* setup carp interfaces */ interfaces_carp_configure(); - - /* bring up carp interfaces */ - interfaces_carp_bringup(); - + $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index 2da25b7..8f9f119 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -275,9 +275,6 @@ if ($_POST['apply'] <> "") { /* setup carp interfaces */ interfaces_carp_configure(); - /* bring up carp interfaces */ - interfaces_carp_bringup(); - unlink($d_landirty_path); } diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php index d733383..36d5f29 100755 --- a/usr/local/www/interfaces_opt.php +++ b/usr/local/www/interfaces_opt.php @@ -207,9 +207,6 @@ if ($_POST) { /* setup carp interfaces */ interfaces_carp_configure(); - - /* bring up carp interfaces */ - interfaces_carp_bringup(); /* sync filter configuration */ filter_configure(); diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php index fbede8c..4265783 100755 --- a/usr/local/www/interfaces_wan.php +++ b/usr/local/www/interfaces_wan.php @@ -261,10 +261,7 @@ if ($_POST) { /* setup carp interfaces */ interfaces_carp_configure(); - - /* bring up carp interfaces */ - interfaces_carp_bringup(); - + $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 792539a..5a22542 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -178,7 +178,6 @@ function interfaces_carp_configure_xmlrpc($raw_params) { global $xmlrpc_g; $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) return new XML_RPC_Response(new XML_RPC_Value("auth_failure", $XML_RPC_String)); - interfaces_carp_bringup(); interfaces_carp_configure(); return new XML_RPC_Response(new XML_RPC_Value(true, $XML_RPC_Boolean)); } |
