From 11decf6ef66b329df6bd0e39ccfc57134c46d8d8 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 9 Dec 2010 14:25:48 +0000
Subject: [PATCH] Show carp on the list of interfaces to be used for creating
 gif/gre tunnels.

---
 usr/local/www/interfaces_gif_edit.php | 3 +++
 usr/local/www/interfaces_gre_edit.php | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php
index efbf036b20..59bad8f544 100644
--- a/usr/local/www/interfaces_gif_edit.php
+++ b/usr/local/www/interfaces_gif_edit.php
@@ -136,6 +136,9 @@ include("head.inc");
                     <select name="if" class="formselect">
                       <?php
 						$portlist = get_configured_interface_with_descr();
+						$carplist = get_configured_carp_interface_list();
+                                                foreach ($carplist as $cif => $carpip)
+                                                        $portlist[$cif] = $carpip." (".get_vip_descr($carpip).")";
 					  	foreach ($portlist as $ifn => $ifinfo) {
 							echo "<option value=\"{$ifn}\"";
 							if ($ifn == $pconfig['if'])
diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php
index f0f0a84de5..ce9f3246da 100644
--- a/usr/local/www/interfaces_gre_edit.php
+++ b/usr/local/www/interfaces_gre_edit.php
@@ -139,6 +139,9 @@ include("head.inc");
                     <select name="if" class="formselect">
                       <?php
 						$portlist = get_configured_interface_with_descr();
+						$carplist = get_configured_carp_interface_list();
+						foreach ($carplist as $cif => $carpip)
+							$portlist[$cif] = $carpip." (".get_vip_descr($carpip).")";
 					  	foreach ($portlist as $ifn => $ifinfo) {
 							echo "<option value=\"{$ifn}\"";
 							if ($ifn == $pconfig['if'])