function filter_configure_xmlrpc($raw_params)
{
global $xmlrpc_g, $config;
$params = xmlrpc_params_to_php($raw_params);
if (!xmlrpc_auth($params)) {
xmlrpc_authfail();
return $xmlrpc_g['return']['authfail'];
}
filter_configure();
system_routing_configure();
setup_gateways_monitor();
relayd_configure();
require_once "openvpn.inc";
openvpn_resync_all();
if (isset($config['dnsmasq']['enable'])) {
services_dnsmasq_configure();
} elseif (isset($config['unbound']['enable'])) {
services_unbound_configure();
} else {
# Both calls above run services_dhcpd_configure(), then we just
# need to call it when they are not called to avoid restarting dhcpd
# twice, as described on ticket #3797
services_dhcpd_configure();
}
local_sync_accounts();
return $xmlrpc_g['return']['true'];
}
function filter_configure_xmlrpc($raw_params)
{
global $xmlrpc_g, $g, $config;
$params = xmlrpc_params_to_php($raw_params);
if (!xmlrpc_auth($params)) {
xmlrpc_authfail();
return $xmlrpc_g['return']['authfail'];
}
filter_configure();
system_routing_configure();
setup_gateways_monitor();
relayd_configure();
require_once "openvpn.inc";
openvpn_resync_all();
/* The DNS Resolver and the DNS Forwarder may both be active so long as
* they are running on different ports. See ticket #5882
*/
$need_dhcp_start = true;
if (isset($config['dnsmasq']['enable'])) {
/* Configure dnsmasq but tell it NOT to restart DHCP */
services_dnsmasq_configure(false);
} else {
/* kill any running dnsmasq since it is not enabled. */
if (file_exists("{$g['varrun_path']}/dnsmasq.pid")) {
sigkillbypid("{$g['varrun_path']}/dnsmasq.pid", "TERM");
}
}
if (isset($config['unbound']['enable'])) {
/* Configure unbound but tell it NOT to restart DHCP */
services_unbound_configure(false);
} else {
/* kill any running Unbound instance since it is not enabled. */
if (file_exists("{$g['varrun_path']}/unbound.pid")) {
sigkillbypid("{$g['varrun_path']}/unbound.pid", "TERM");
}
}
/* Call this separately since the above are manually set to skip the DHCP restart they normally perform.
* This avoids restarting dhcpd twice as described on ticket #3797
*/
services_dhcpd_configure();
local_sync_accounts();
return $xmlrpc_g['return']['true'];
}
/**
* Wrapper for filter_configure()
*
* @param string $username
* @param string $password
*
* @return bool
*/
public function filter_configure($username, $password)
{
$this->auth($username, $password);
global $g, $config;
filter_configure();
system_routing_configure();
setup_gateways_monitor();
relayd_configure();
require_once "openvpn.inc";
openvpn_resync_all();
/*
* The DNS Resolver and the DNS Forwarder may both be active so
* long as * they are running on different ports.
* See ticket #5882
*/
if (isset($config['dnsmasq']['enable'])) {
/* Configure dnsmasq but tell it NOT to restart DHCP */
services_dnsmasq_configure(false);
} else {
/* kill any running dnsmasq instance */
if (isvalidpid("{$g['varrun_path']}/dnsmasq.pid")) {
sigkillbypid("{$g['varrun_path']}/dnsmasq.pid", "TERM");
}
}
if (isset($config['unbound']['enable'])) {
/* Configure unbound but tell it NOT to restart DHCP */
services_unbound_configure(false);
} else {
/* kill any running Unbound instance */
if (isvalidpid("{$g['varrun_path']}/unbound.pid")) {
sigkillbypid("{$g['varrun_path']}/unbound.pid", "TERM");
}
}
/*
* Call this separately since the above are manually set to
* skip the DHCP restart they normally perform.
* This avoids restarting dhcpd twice as described on
* ticket #3797
*/
services_dhcpd_configure();
local_sync_accounts();
return true;
}
function filter_configure_xmlrpc($raw_params)
{
global $xmlrpc_g;
$params = xmlrpc_params_to_php($raw_params);
if (!xmlrpc_auth($params)) {
xmlrpc_authfail();
return $xmlrpc_g['return']['authfail'];
}
filter_configure();
system_routing_configure();
setup_gateways_monitor();
relayd_configure();
require_once "openvpn.inc";
openvpn_resync_all();
services_dhcpd_configure();
services_dnsmasq_configure();
local_sync_accounts();
return $xmlrpc_g['return']['true'];
}
