Allow CARP addresses to be the IPSEC endpoint. This cleans up the code GREATLY and removes the FAILOVER IPSEC hack.

2 files changed, 15 insertions, 4 deletions

diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index fca3a55..e149666 100755
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -152,9 +152,14 @@ include("head.inc");
                   <td class="listr" ondblclick="document.location='vpn_ipsec_edit.php?id=<?=$i;?>'"><?=$spans;?>
 				  <?php if ($ipsecent['interface']) {
 							$iflabels = array('lan' => 'LAN', 'wan' => 'WAN');
-							  for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
+                 	        $carpips = find_number_of_needed_carp_interfaces();
+                         	    for($i=0; $i<$carpips; $i++) {
+                       			$carpip = find_interface_ip("carp" . $i);
+                      	 		$iflabels['carp' . $i] = "CARP{$i} - $carpip"; 
+                     		    }
+							for ($j = 1; isset($config['interfaces']['opt' . $j]); $j++)
 								$iflabels['opt' . $j] = $config['interfaces']['opt' . $j]['descr'];
-							  $if = htmlspecialchars($iflabels[$ipsecent['interface']]);
+							$if = htmlspecialchars($iflabels[$ipsecent['interface']]);
 						} else
 							$if = "WAN";
 
diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php
index 2b9ec75..d0ce5a4 100755
--- a/usr/local/www/vpn_ipsec_edit.php
+++ b/usr/local/www/vpn_ipsec_edit.php
@@ -316,13 +316,19 @@ function methodsel_change() {
                     <span class="vexpl">Set this option to disable this tunnel without
 					removing it from the list.</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');
+                      <?php 
+                       $interfaces = array('wan' => 'WAN', 'lan' => 'LAN');
 					  for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) {
 					  	$interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr'];
 					  }
+                       $carpips = find_number_of_needed_carp_interfaces();
+                       for($i=0; $i<$carpips; $i++) {
+                       	$carpip = find_interface_ip("carp" . $i);
+                       	$interfaces['carp' . $i] = "CARP{$i} - $carpip"; 
+                       }
 					  foreach ($interfaces as $iface => $ifacename): ?>
                       <option value="<?=$iface;?>" <?php if ($iface == $pconfig['interface']) echo "selected"; ?>>
                       <?=htmlspecialchars($ifacename);?>