diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/service-utils.inc | 10 | ||||
| -rw-r--r-- | etc/inc/vpn.inc | 7 |
2 files changed, 7 insertions, 10 deletions
diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index 446f60c..59bd7ec 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -334,7 +334,7 @@ function get_services() { if (isset($config['ipsec']['enable'])) { $pconfig = array(); - $pconfig['name'] = "racoon"; + $pconfig['name'] = "ipsec"; $pconfig['description'] = gettext("IPsec VPN"); $services[] = $pconfig; } @@ -542,7 +542,7 @@ function service_control_start($name, $extras) { case 'miniupnpd': upnp_action('start'); break; - case 'racoon': + case 'ipsec': vpn_ipsec_force_reload(); break; case 'sshd': @@ -616,8 +616,8 @@ function service_control_stop($name, $extras) { case 'sshd': killbyname("sshd"); break; - case 'racoon': - exec("killall -9 racoon"); + case 'ipsec': + exec("/usr/local/sbin/ipsec stop"); break; case 'openvpn': $vpnmode = $extras['vpnmode']; @@ -681,7 +681,7 @@ function service_control_restart($name, $extras) { case 'miniupnpd': upnp_action('restart'); break; - case 'racoon': + case 'ipsec': vpn_ipsec_force_reload(); break; case 'sshd': diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 5c85ced..0d875c4 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -132,7 +132,6 @@ function vpn_ipsec_configure($ipchg = false) } else { mwexec("/sbin/ifconfig enc0 up"); mwexec("/sbin/sysctl net.inet.ip.ipsec_in_use=1"); - /* needed for racoonctl admin socket */ /* needed for config files */ if (!is_dir("{$g['varetc_path']}/ipsec")) mkdir("{$g['varetc_path']}/ipsec"); @@ -844,8 +843,6 @@ EOD; /* Update configuration changes */ mwexec("/usr/local/sbin/ipsec update", false); } else { - /* start racoon */ - $ipsecdebug = isset($config['ipsec']['racoondebug']) ? "-d -v" : ""; mwexec("/usr/local/sbin/ipsec start", false); } if ($natfilterrules == true) @@ -899,14 +896,14 @@ function vpn_ipsec_force_reload($interface = "") { } } if (!$found) { - log_error(sprintf(gettext("Ignoring IPsec racoon daemon reload since there are no tunnels on interface %s"), $interface)); + log_error(sprintf(gettext("Ignoring IPsec reload since there are no tunnels on interface %s"), $interface)); return; } } /* if ipsec is enabled, start up again */ if (isset($ipseccfg['enable'])) { - log_error(gettext("Forcefully reloading IPsec racoon daemon")); + log_error(gettext("Forcefully reloading IPsec")); vpn_ipsec_configure(); } } |
