Move the IPsec settings from System > Advanced, Misc tab to "Advanced Settings" tab under VPN > IPsec.

1 files changed, 2 insertions, 122 deletions

diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 5f220a0..d583efd 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -47,7 +47,6 @@ require("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
-require_once("ipsec.inc");
 require_once("vpn.inc");
 require_once("vslb.inc");
 
@@ -59,14 +58,6 @@ $pconfig['harddiskstandby'] = $config['system']['harddiskstandby'];
 $pconfig['lb_use_sticky'] = isset($config['system']['lb_use_sticky']);
 $pconfig['srctrack'] = $config['system']['srctrack'];
 $pconfig['gw_switch_default'] = isset($config['system']['gw_switch_default']);
-$pconfig['preferoldsa_enable'] = isset($config['ipsec']['preferoldsa']);
-foreach ($ipsec_loglevels as $lkey => $ldescr) {
-	if (!empty($config['ipsec']["ipsec_{$lkey}"]))
-		$pconfig["ipsec_{$lkey}"] = $config['ipsec']["ipsec_{$lkey}"];
-}
-$pconfig['failoverforcereload'] = isset($config['ipsec']['failoverforcereload']);
-$pconfig['maxmss_enable'] = isset($config['system']['maxmss_enable']);
-$pconfig['maxmss'] = $config['system']['maxmss'];
 $pconfig['powerd_enable'] = isset($config['system']['powerd_enable']);
 $pconfig['crypto_hardware'] = $config['system']['crypto_hardware'];
 $pconfig['thermal_hardware'] = $config['system']['thermal_hardware'];
@@ -76,7 +67,6 @@ $pconfig['skip_rules_gw_down'] = isset($config['system']['skip_rules_gw_down']);
 $pconfig['use_mfs_tmpvar'] = isset($config['system']['use_mfs_tmpvar']);
 $pconfig['use_mfs_tmp_size'] = $config['system']['use_mfs_tmp_size'];
 $pconfig['use_mfs_var_size'] = $config['system']['use_mfs_var_size'];
-$pconfig['noinstalllanspd'] = $config['system']['noinstalllanspd'];
 $pconfig['pkg_nochecksig'] = isset($config['system']['pkg_nochecksig']);
 
 $pconfig['powerd_ac_mode'] = "hadp";
@@ -160,46 +150,11 @@ if ($_POST) {
 		else
 			unset($config['system']['gw_switch_default']);
 
-		if($_POST['preferoldsa_enable'] == "yes")
-			$config['ipsec']['preferoldsa'] = true;
-		elseif (isset($config['ipsec']['preferoldsa']))
-			unset($config['ipsec']['preferoldsa']);
-
-		if($_POST['failoverforcereload'] == "yes")
-			$config['ipsec']['failoverforcereload'] = true;
-		elseif (isset($config['ipsec']['failoverforcereload']))
-			unset($config['ipsec']['failoverforcereload']);
-
-		if (is_array($config['ipsec'])) {
-			foreach ($ipsec_loglevels as $lkey => $ldescr) {
-				if (empty($_POST["ipsec_{$lkey}"])) {
-					if (isset($config['ipsec']["ipsec_{$lkey}"]))
-						unset($config['ipsec']["ipsec_{$lkey}"]);
-				} else
-					$config['ipsec']["ipsec_{$lkey}"] = $_POST["ipsec_{$lkey}"];
-			}
-		}
-		if($_POST['noinstalllanspd'] == "yes") {
-			if (!isset($pconfig['noinstalllanspd']))
-			$config['system']['noinstalllanspd'] = true;
-		} else {
-			if (isset($config['system']['noinstalllanspd']))
-			unset($config['system']['noinstalllanspd']);
-		}
-
 		if($_POST['pkg_nochecksig'] == "yes")
 			$config['system']['pkg_nochecksig'] = true;
 		elseif (isset($config['system']['pkg_nochecksig']))
 			unset($config['system']['pkg_nochecksig']);
 
-		if($_POST['maxmss_enable'] == "yes") {
-			$config['system']['maxmss_enable'] = true;
-			$config['system']['maxmss'] = $_POST['maxmss'];
-		} else {
-			unset($config['system']['maxmss_enable']);
-			unset($config['system']['maxmss']);
-		}
-
 		if($_POST['powerd_enable'] == "yes")
 			$config['system']['powerd_enable'] = true;
 		else
@@ -263,9 +218,6 @@ if ($_POST) {
 		activate_powerd();
 		load_crypto();
 		load_thermal_hardware();
-		vpn_ipsec_configure_preferoldsa();
-		vpn_ipsec_configure();
-		vpn_ipsec_configure_loglevels();
 		if ($need_relayd_restart)
 			relayd_configure();
 	}
@@ -292,12 +244,6 @@ function sticky_checked(obj) {
 	else
 		jQuery('#srctrack').attr('disabled','true');
 }
-function maxmss_checked(obj) {
-	if (obj.checked)
-		jQuery('#maxmss').attr('disabled',false);
-	else
-		jQuery('#maxmss').attr('disabled','true');
-}
 function tmpvar_checked(obj) {
 	if (obj.checked) {
 		jQuery('#use_mfs_tmp_size').attr('disabled',false);
@@ -511,75 +457,9 @@ function tmpvar_checked(obj) {
 								<td colspan="2" valign="top" class="listtopic"><?=gettext("IP Security"); ?></td>
 							</tr>
 							<tr>
-								<td width="22%" valign="top" class="vncell"><?=gettext("LAN security associsations"); ?></td>
+								<td width="22%" valign="top" class="vncell">&nbsp;</td>
 								<td width="78%" class="vtable">
-									<input name="noinstalllanspd" type="checkbox" id="noinstalllanspd" value="yes" <?php if ($pconfig['noinstalllanspd']) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Do not install LAN SPD"); ?></strong>
-									<br />
-									<?=gettext("By default, if IPSec is enabled negating SPD are inserted to provide protection. " .
-									"This behaviour can be changed by enabling this setting which will prevent installing these SPDs."); ?>
-								</td>
-							</tr>
-							<tr>
-								<td width="22%" valign="top" class="vncell"><?=gettext("Security Associations"); ?></td>
-								<td width="78%" class="vtable">
-									<input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if ($pconfig['preferoldsa_enable']) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Prefer older IPsec SAs"); ?></strong>
-									<br />
-									<?=gettext("By default, if several SAs match, the newest one is " .
-									"preferred if it's at least 30 seconds old. Select this " .
-									"option to always prefer old SAs over new ones."); ?>
-								</td>
-							</tr>
-							<tr>
-								<td width="22%" valign="top" class="vncell"><?=gettext("IPsec Debug"); ?></td>
-								<td width="78%" class="vtable">
-									<strong><?=gettext("Start IPSec in debug mode based on sections selected"); ?></strong>
-									<br />
-									<table>
-								<?php foreach ($ipsec_loglevels as $lkey => $ldescr): ?>
-									<tr>
-										<td width="22%" valign="top" class="vncell"><?=$ldescr;?></td>
-										<td width="78%" valign="top" class="vncell">
-										<?php	echo "<select name=\"ipsec_{$lkey}\" id=\"ipsec_{$lkey}\">\n";
-											foreach (array("Silent", "Audit", "Control", "Diag", "Raw", "Highest") as $lidx => $lvalue) {
-												echo "<option value=\"{$lidx}\" ";
-												 if ($pconfig["ipsec_{$lkey}"] == $lidx)
-													echo "selected=\"selected\"";
-												echo ">{$lvalue}</option>\n";
-											}
-										?>
-											</select>
-										</td>
-									</tr>
-								<?php endforeach; ?>
-									</table>
-									<br /><?=gettext("Launches IPSec in debug mode so that more verbose logs " .
-									"will be generated to aid in troubleshooting."); ?>
-								</td>
-							</tr>
-							<tr>
-								<td width="22%" valign="top" class="vncell"><?=gettext("IPsec Reload on Failover"); ?></td>
-								<td width="78%" class="vtable">
-									<input name="failoverforcereload" type="checkbox" id="failoverforcereload" value="yes" <?php if ($pconfig['failoverforcereload']) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Force IPsec Reload on Failover"); ?></strong>
-									<br />
-									<?=gettext("In some circumstances using a gateway group as the interface for " .
-									"an IPsec tunnel does not function properly, and IPsec must be forcefully reloaded " .
-									"when a failover occurs. Because this will disrupt all IPsec tunnels, this behavior" .
-									" is disabled by default. Check this box to force IPsec to fully reload on failover."); ?>
-								</td>
-							</tr>
-							<tr>
-								<td width="22%" valign="top" class="vncell"><?=gettext("Maximum MSS"); ?></td>
-								<td width="78%" class="vtable">
-									<input name="maxmss_enable" type="checkbox" id="maxmss_enable" value="yes" <?php if ($pconfig['maxmss_enable'] == true) echo "checked=\"checked\""; ?> onclick="maxmss_checked(this)" />
-									<strong><?=gettext("Enable MSS clamping on VPN traffic"); ?></strong>
-									<br />
-									<input name="maxmss" id="maxmss" value="<?php if ($pconfig['maxmss'] <> "") echo $pconfig['maxmss']; else "1400"; ?>" class="formfld unknown" <?php if ($pconfig['maxmss_enable'] == false) echo "disabled=\"disabled\""; ?> />
-									<br />
-									<?=gettext("Enable MSS clamping on TCP flows over VPN. " .
-									"This helps overcome problems with PMTUD on IPsec VPN links. If left blank, the default value is 1400 bytes. "); ?>
+									<?=gettext("These settings have moved to <a href=\"vpn_ipsec_settings.php\">VPN &gt; IPsec on the Advanced Settings tab</a>."); ?>
 								</td>
 							</tr>
 							<tr>