From 3851094fc6d349ca3973c3eba4e3faf20ce8abbb Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sun, 24 Jul 2005 22:35:05 +0000 Subject: * Drop kick reboots bye bye --- usr/local/www/services_dhcp_relay.php | 8 +++----- usr/local/www/services_dyndns.php | 15 +++++++-------- usr/local/www/services_proxyarp.php | 8 +++----- usr/local/www/system_advanced.php | 18 ++++++++---------- usr/local/www/system_routes.php | 8 ++++---- usr/local/www/vpn_ipsec.php | 17 +++++++---------- usr/local/www/vpn_openvpn.php | 5 +---- usr/local/www/vpn_openvpn_cli.php | 12 +++--------- usr/local/www/vpn_openvpn_cli_edit.php | 7 +------ usr/local/www/vpn_pptp.php | 10 +++++----- 10 files changed, 42 insertions(+), 66 deletions(-) diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index 43db595..6228d23 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -126,11 +126,9 @@ if ($_POST) { write_config(); $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = services_dhcrelay_configure(); - config_unlock(); - } + config_lock(); + $retval = services_dhcrelay_configure(); + config_unlock(); $savemsg = get_std_save_message($retval); } diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php index 5846f1c..835b70b 100755 --- a/usr/local/www/services_dyndns.php +++ b/usr/local/www/services_dyndns.php @@ -114,14 +114,13 @@ if ($_POST) { write_config(); $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - /* nuke the cache file */ - config_lock(); - services_dyndns_reset(); - $retval = services_dyndns_configure(); - $retval |= services_dnsupdate_process(); - config_unlock(); - } + + /* nuke the cache file */ + config_lock(); + services_dyndns_reset(); + $retval = services_dyndns_configure(); + $retval |= services_dnsupdate_process(); + config_unlock(); $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/services_proxyarp.php b/usr/local/www/services_proxyarp.php index c8d5fc9..1dd6cd0 100755 --- a/usr/local/www/services_proxyarp.php +++ b/usr/local/www/services_proxyarp.php @@ -44,11 +44,9 @@ if ($_POST) { $pconfig = $_POST; $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = services_proxyarp_configure(); - config_unlock(); - } + config_lock(); + $retval = services_proxyarp_configure(); + config_unlock(); $savemsg = get_std_save_message($retval); if ($retval == 0) { diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index 30350e9..117fb43 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -160,16 +160,14 @@ if ($_POST) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = filter_configure(); - if(stristr($retval, "error") <> true) - $savemsg = get_std_save_message($retval); - else - $savemsg = $retval; - $retval |= interfaces_optional_configure(); - config_unlock(); - } + config_lock(); + $retval = filter_configure(); + if(stristr($retval, "error") <> true) + $savemsg = get_std_save_message($retval); + else + $savemsg = $retval; + $retval |= interfaces_optional_configure(); + config_unlock(); $etc_ttys = return_filename_as_array("/etc/ttys"); $boot_loader_rc = return_filename_as_array("/boot/loader.rc"); diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index cdad0a8..ac091e2 100755 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -46,10 +46,10 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - $retval = system_routing_configure(); - $retval |= filter_configure(); - } + + $retval = system_routing_configure(); + $retval |= filter_configure(); + $savemsg = get_std_save_message($retval); if ($retval == 0) { if (file_exists($d_staticroutesdirty_path)) { diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php index f2d3086..f6ea76b 100755 --- a/usr/local/www/vpn_ipsec.php +++ b/usr/local/www/vpn_ipsec.php @@ -43,8 +43,7 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) - $retval = vpn_ipsec_configure(); + $retval = vpn_ipsec_configure(); $savemsg = get_std_save_message($retval); if ($retval == 0) { if (file_exists($d_ipsecconfdirty_path)) @@ -58,13 +57,12 @@ if ($_POST) { write_config(); $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = vpn_ipsec_configure(); - config_unlock(); - /* reload the filter in the background */ - mwexec_bg("/etc/rc.filter_configure"); - } + config_lock(); + $retval = vpn_ipsec_configure(); + config_unlock(); + /* reload the filter in the background */ + mwexec_bg("/etc/rc.filter_configure"); + $savemsg = get_std_save_message($retval); if ($retval == 0) { if (file_exists($d_ipsecconfdirty_path)) @@ -77,7 +75,6 @@ if ($_GET['act'] == "del") { if ($a_ipsec[$_GET['id']]) { unset($a_ipsec[$_GET['id']]); write_config(); - touch($d_ipsecconfdirty_path); header("Location: vpn_ipsec.php"); exit; } diff --git a/usr/local/www/vpn_openvpn.php b/usr/local/www/vpn_openvpn.php index dfa64e1..a70c55a 100755 --- a/usr/local/www/vpn_openvpn.php +++ b/usr/local/www/vpn_openvpn.php @@ -89,7 +89,7 @@ if ($_POST) { /* Make sure that the tunnel interface type has not changed */ if ($server['tun_iface'] != $_POST['tun_iface']){ $server['tun_iface'] = $_POST['tun_iface']; - touch($d_sysrebootreqd_path); + } $server['bind_iface'] = $_POST['bind_iface']; @@ -99,11 +99,9 @@ if ($_POST) { /* Make sure the IP address and/or prefix have not changed */ if ($server['ipblock'] != $_POST['ipblock']){ $server['ipblock'] = $_POST['ipblock']; - touch($d_sysrebootreqd_path); } if ($server['prefix'] != $_POST['prefix']){ $server['prefix'] = $_POST['prefix']; - touch($d_sysrebootreqd_path); } $server['maxcli'] = $_POST['maxcli']; @@ -155,7 +153,6 @@ include("head.inc");

-
diff --git a/usr/local/www/vpn_openvpn_cli.php b/usr/local/www/vpn_openvpn_cli.php index 61a5131..c574483 100755 --- a/usr/local/www/vpn_openvpn_cli.php +++ b/usr/local/www/vpn_openvpn_cli.php @@ -42,15 +42,9 @@ $ovpncli =& $config['ovpn']['client']['tunnel']; if ($_POST['apply']) { $retval = 0; - if (file_exists($d_sysrebootreqd_path)) { - /* Rewrite interface definitions */ - $retval = ovpn_client_iface(); - } - else{ - ovpn_lock(); - $retval = ovpn_config_client(); - ovpn_unlock(); - } + ovpn_lock(); + $retval = ovpn_config_client(); + ovpn_unlock(); if (file_exists($d_ovpnclidirty_path)) unlink($d_ovpnclidirty_path); $savemsg = get_std_save_message($retval); diff --git a/usr/local/www/vpn_openvpn_cli_edit.php b/usr/local/www/vpn_openvpn_cli_edit.php index 04c3eed..8221e2a 100755 --- a/usr/local/www/vpn_openvpn_cli_edit.php +++ b/usr/local/www/vpn_openvpn_cli_edit.php @@ -131,18 +131,15 @@ if (isset($_POST['pull'])) { $input_errors[] = "Run out of devices for a tunnel of type {$_POST['type']}"; else $ovpnent['if'] = $nxt_if; - /* Need to reboot in order to create interfaces cleanly */ - touch($d_sysrebootreqd_path); + } /* Has the enable/disable state changed? */ if (isset($ovpnent['enable']) && isset($_POST['disabled'])) { - touch($d_sysrebootreqd_path); touch($d_ovpnclidirty_path); ovpn_client_kill($id); ovpn_client_iface_del($id); } if (!isset($ovpnent['enable']) && !isset($_POST['disabled'])) { - touch($d_sysrebootreqd_path); touch($d_ovpnclidirty_path); } } @@ -155,8 +152,6 @@ if (isset($_POST['pull'])) { else $ovpnent['if'] = $nxt_if; $ovpnent['cport'] = getnxt_port(); - /* I think we have to reboot to have the interface created cleanly */ - touch($d_sysrebootreqd_path); } $ovpnent['type'] = $_POST['type']; $ovpnent['proto'] = $_POST['proto']; diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index b08788f..e36b0d8 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -112,11 +112,11 @@ if ($_POST) { write_config(); $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = vpn_pptpd_configure(); - config_unlock(); - } + + config_lock(); + $retval = vpn_pptpd_configure(); + config_unlock(); + $savemsg = get_std_save_message($retval); } } -- cgit v1.1