mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

No need to triger a vips re-configure explicitly but rather detect this during config merges. This is the best way to do this after fixing Ticket #601.

Browse Source
This commit is contained in:
Ermal 2010-08-20 16:21:11 +00:00
parent d09d53ac69
commit 2de2abe00c
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/rc.filter_synchronize
View File

@ -306,26 +306,8 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) {
log_error("Filter sync successfully completed with {$synchronizetoip}:{$port}.");
$numberofruns = 3;
}
/* signal a carp reload */
$cli = new XML_RPC_Client('/xmlrpc.php', $synchronizetoip, $port);
$msg = new XML_RPC_Message('pfsense.interfaces_carp_configure', $params);
$resp = $cli->send($msg, "900");
if(!$resp) {
$error = "A communications error occured while attempting CARP sync with username {$username} {$synchronizetoip}:{$port}.";
log_error($error);
file_notice("sync_settings", $error, "Settings Sync", "");
} elseif($resp->faultCode()) {
$error = "An error code was received while attempting CARP sync with username {$username} {$synchronizetoip}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
log_error($error);
file_notice("sync_settings", $error, "Settings Sync", "");
} else {
log_error("CARP sync successfully completed with {$synchronizetoip}:{$port}.");
$numberofruns = 3;
}
}
break;
break;
}
}
}

2
usr/local/www/xmlrpc.php
View File

@ -166,6 +166,7 @@ function restore_config_section_xmlrpc($raw_params) {
$config = array_merge($config, $params[0]);
$mergedkeys = implode(",", array_keys($params[0]));
write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys));
interfaces_vips_configure();
return $xmlrpc_g['return']['true'];
}
@ -219,6 +220,7 @@ function merge_config_section_xmlrpc($raw_params) {
$config = array_merge_recursive_unique($config, $params[0]);
$mergedkeys = implode(",", array_keys($params[0]));
write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client.");
interfaces_vips_configure();
return $xmlrpc_g['return']['true'];
}