summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/interfaces.inc6
-rw-r--r--etc/inc/zeromq.inc2
-rw-r--r--etc/phpshellsessions/enablecarp2
-rwxr-xr-xetc/rc.bootup1
-rw-r--r--usr/local/www/carp_status.php2
-rw-r--r--usr/local/www/exec.php2
-rwxr-xr-xusr/local/www/system_hasync.php2
-rwxr-xr-xusr/local/www/xmlrpc.php2
8 files changed, 10 insertions, 9 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 715f144..684babd 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1942,12 +1942,12 @@ EOD;
return 1;
}
-function interfaces_carp_setup() {
+function interfaces_sync_setup() {
global $g, $config;
if (isset($config['system']['developerspew'])) {
$mt = microtime();
- echo "interfaces_carp_setup() being called $mt\n";
+ echo "interfaces_sync_setup() being called $mt\n";
}
if ($g['booting']) {
@@ -2129,7 +2129,7 @@ function interfaces_vips_configure($interface = "") {
}
}
if ($carp_setuped == true)
- interfaces_carp_setup();
+ interfaces_sync_setup();
if ($anyproxyarp == true)
interface_proxyarp_configure();
}
diff --git a/etc/inc/zeromq.inc b/etc/inc/zeromq.inc
index db40ce9..65589d0 100644
--- a/etc/inc/zeromq.inc
+++ b/etc/inc/zeromq.inc
@@ -273,7 +273,7 @@ function interfaces_carp_configure_zeromq($raw_params) {
$params = $raw_params;
if(zeromq_auth($raw_params) == false)
return ZEROMQ_AUTH_FAIL;
- interfaces_carp_setup();
+ interfaces_sync_setup();
interfaces_vips_configure();
return ZEROMQ_FASLE;
}
diff --git a/etc/phpshellsessions/enablecarp b/etc/phpshellsessions/enablecarp
index d486c04..b1c4a43 100644
--- a/etc/phpshellsessions/enablecarp
+++ b/etc/phpshellsessions/enablecarp
@@ -14,5 +14,5 @@ if(is_array($config['virtualip']['vip'])) {
}
}
}
-interfaces_carp_setup();
+interfaces_sync_setup();
set_single_sysctl("net.inet.carp.allow", "1");
diff --git a/etc/rc.bootup b/etc/rc.bootup
index 69eb486..1b150e3 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -265,6 +265,7 @@ echo "done.\n";
if(!$debugging)
mute_kernel_msgs();
interfaces_configure();
+interfaces_sync_setup();
if(!$debugging)
unmute_kernel_msgs();
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index d53cf50..869cc1b 100644
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -83,7 +83,7 @@ if($_POST['disablecarp'] <> "") {
}
}
}
- interfaces_carp_setup();
+ interfaces_sync_setup();
set_single_sysctl('net.inet.carp.allow', '1');
$status = 1;
}
diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php
index 1963508..f3849b9 100644
--- a/usr/local/www/exec.php
+++ b/usr/local/www/exec.php
@@ -318,7 +318,7 @@ if (!isBlank($_POST['txtPHPCommand'])) {
<td valign="top" class="label">
<input type="submit" class="button" value="<?=gettext("Execute"); ?>" />
<p>
- <strong><?=gettext("Example"); ?>:</strong> interfaces_carp_setup();
+ <strong><?=gettext("Example"); ?>:</strong> interfaces_sync_setup();
</p>
</td>
</tr>
diff --git a/usr/local/www/system_hasync.php b/usr/local/www/system_hasync.php
index 17eff62..6a7f4ac 100755
--- a/usr/local/www/system_hasync.php
+++ b/usr/local/www/system_hasync.php
@@ -80,7 +80,7 @@ if ($_POST) {
$a_hasync['username'] = $pconfig['username'];
$a_hasync['password'] = $pconfig['password'];
write_config("Updated High Availability Sync configuration");
- interfaces_carp_setup();
+ interfaces_sync_setup();
header("Location: system_hasync.php");
exit();
}
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 93733cc..51bf1db 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -274,7 +274,7 @@ function restore_config_section_xmlrpc($raw_params) {
pfSense_interface_deladdress($oldvipif, $oldvipar['subnet']);
}
if ($carp_setuped == true)
- interfaces_carp_setup();
+ interfaces_sync_setup();
if ($anyproxyarp == true)
interface_proxyarp_configure();
}
OpenPOWER on IntegriCloud