From c25a575f1dba3140afc769eb9946e2e40895d86b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 26 Dec 2005 02:51:18 +0000
Subject: [PATCH] Remove auto establish.  It's never worked.

---
 etc/inc/vpn.inc                  | 15 ---------------
 usr/local/www/vpn_ipsec_edit.php | 11 ++---------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 6439890b20..e72a994d80 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -552,21 +552,6 @@ EOD;
 			
 			/* start racoon */
 			mwexec("/usr/local/sbin/racoon -f {$g['varetc_path']}/racoon.conf");
-			
-			usleep(100);
-			
-			if (is_array($ipseccfg['tunnel'])) {
-				foreach ($ipseccfg['tunnel'] as $tunnel) {
-					if (isset($tunnel['auto'])) {
-						$remotehost = substr($tunnel['remote-subnet'],0,strpos($tunnel['remote-subnet'],"/"));
-						$srchost = vpn_endpoint_determine($tunnel, $curwanip);
-						if ($srchost) {
-							log_error("Bringing ipsec tunnel up with ping -c 10 -S {$srchost} {$remotehost}");
-							mwexec_bg("/sbin/ping -c 10 -S {$srchost} {$remotehost}");
-						}
-					}
-				}
-			}
 		}
 	}
 
diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php
index c213b4b88d..4e421095a7 100755
--- a/usr/local/www/vpn_ipsec_edit.php
+++ b/usr/local/www/vpn_ipsec_edit.php
@@ -187,7 +187,7 @@ if ($_POST) {
 
 	if (!$input_errors) {
 		$ipsecent['disabled'] = $_POST['disabled'] ? true : false;
-		$ipsecent['auto'] = $_POST['auto'] ? true : false;
+		//$ipsecent['auto'] = $_POST['auto'] ? true : false;
 		$ipsecent['interface'] = $pconfig['interface'];
 		pconfig_to_address($ipsecent['local-subnet'], $_POST['localnet'], $_POST['localnetmask']);
 		$ipsecent['remote-subnet'] = $_POST['remotenet'] . "/" . $_POST['remotebits'];
@@ -304,14 +304,7 @@ function methodsel_change() {
                     <span class="vexpl">Set this option to disable this tunnel without
 					removing it from the list.</span></td>
                 </tr>
-				<tr> 
-				  <td width="22%" valign="top" class="vncellreq">Auto-establish</td>
-				  <td width="78%" class="vtable"> 
-					<input name="auto" type="checkbox" id="auto" value="yes" <?php if ($pconfig['auto']) echo "checked"; ?>>
-					<strong>Automatically establish this tunnel</strong><br>
-					<span class="vexpl">Set this option to automatically re-establish this tunnel after reboots/reconfigures. If this is not set, the tunnel is established on demand.</span></td>
-				</tr>
-				<tr> 
+		<tr> 
                   <td width="22%" valign="top" class="vncellreq">Interface</td>
                   <td width="78%" class="vtable"><select name="interface" class="formfld">
                       <?php $interfaces = array('wan' => 'WAN', 'lan' => 'LAN');