Commit 8b6108a8 authored by Ad Schellevis's avatar Ad Schellevis

(ipsec) remove failoverforcereload, when enabled it just calls...

(ipsec) remove failoverforcereload, when enabled it just calls ipsec_configure() twice, which doesn't look usefull
parent a801eb11
...@@ -38,20 +38,13 @@ require_once("interfaces.inc"); ...@@ -38,20 +38,13 @@ require_once("interfaces.inc");
/* make sure to wait until the boot scripts have finished */ /* make sure to wait until the boot scripts have finished */
if (file_exists('/var/run/booting')) { if (file_exists('/var/run/booting')) {
return; return;
} } elseif (isset($config['ipsec']['enable'])) {
if (isset($config['ipsec']['enable'])) {
sleep(15); sleep(15);
log_error("IPSEC: One or more IPsec tunnel endpoints has changed its IP. Refreshing."); log_error("IPSEC: One or more IPsec tunnel endpoints has changed its IP. Refreshing.");
} else } else {
return; return;
}
$ipseclck = lock('ipsecdns', LOCK_EX); $ipseclck = lock('ipsecdns', LOCK_EX);
ipsec_configure(); ipsec_configure();
if (isset($config['ipsec']['failoverforcereload'])) {
ipsec_force_reload();
}
unlock($ipseclck); unlock($ipseclck);
...@@ -49,7 +49,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -49,7 +49,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig["ipsec_{$lkey}"] = null; $pconfig["ipsec_{$lkey}"] = null;
} }
} }
$pconfig['failoverforcereload'] = isset($config['ipsec']['failoverforcereload']);
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') { } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
// save form data // save form data
$pconfig = $_POST; $pconfig = $_POST;
...@@ -75,12 +74,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { ...@@ -75,12 +74,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
} }
} }
if (isset($pconfig['failoverforcereload']) && $pconfig['failoverforcereload'] == "yes") {
$config['ipsec']['failoverforcereload'] = true;
} elseif (isset($config['ipsec']['failoverforcereload'])) {
unset($config['ipsec']['failoverforcereload']);
}
write_config(); write_config();
$savemsg = get_std_save_message(); $savemsg = get_std_save_message();
filter_configure(); filter_configure();
...@@ -167,19 +160,6 @@ endforeach; ?> ...@@ -167,19 +160,6 @@ endforeach; ?>
</div> </div>
</td> </td>
</tr> </tr>
<tr>
<td><a id="help_for_failoverforcereloadg" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IPsec Reload on Failover"); ?></td>
<td>
<input name="failoverforcereload" type="checkbox" id="failoverforcereload" value="yes" <?= !empty($pconfig['failoverforcereload']) ? "checked=\"checked\"" : "";?> />
<strong><?=gettext("Force IPsec Reload on Failover"); ?></strong>
<div class="hidden" for="help_for_failoverforcereloadg">
<?=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."); ?>
</div>
</td>
</tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment