From 8c0683540d592c873dd4e46efd296ce43d2cd7a0 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sun, 30 Dec 2018 18:38:40 +0100
Subject: [PATCH] GRE + ip alias, for
 https://github.com/opnsense/core/pull/3080

---
 src/etc/inc/interfaces.inc      |  4 ++--
 src/www/interfaces_gre.php      | 11 ++++++++++-
 src/www/interfaces_gre_edit.php |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index e0000bf2a..604ec73e4 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -707,10 +707,10 @@ function interface_gre_configure(&$gre, $grekey = "")
 
     /* Do not change the order here for more see gre(4) NOTES section. */
     if (is_ipaddrv6($gre['remote-addr'])) {
-        $realifip = get_interface_ipv6($gre['if']);
+        $realifip = is_ipaddr($gre['if']) ? $gre['if'] : get_interface_ipv6($gre['if']);
         mwexecf('/sbin/ifconfig %s inet6 tunnel %s %s', array($greif, $realifip, $gre['remote-addr']));
     } else {
-        $realifip = get_interface_ip($gre['if']);
+        $realifip = is_ipaddr($gre['if']) ? $gre['if'] : get_interface_ip($gre['if']);
         mwexecf('/sbin/ifconfig %s tunnel %s %s', array($greif, $realifip, $gre['remote-addr']));
     }
     if ((is_ipaddrv6($gre['tunnel-local-addr'])) || (is_ipaddrv6($gre['tunnel-remote-addr']))) {
diff --git a/src/www/interfaces_gre.php b/src/www/interfaces_gre.php
index 9a3eaca2b..d52b7f561 100644
--- a/src/www/interfaces_gre.php
+++ b/src/www/interfaces_gre.php
@@ -123,7 +123,16 @@ $main_buttons = array(
                   $i = 0;
                   foreach ($a_gres as $gre): ?>
                     <tr>
-                      <td><?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']));?></td>
+                      <td>
+<?php
+                      if (is_ipaddr($gre['if'])):?>
+                        [<?=htmlspecialchars($gre['if']);?>]
+<?php
+                      else:?>
+                        <?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']));?>
+<?php
+                      endif;?>
+                      </td>
                       <td><?=$gre['remote-addr'];?></td>
                       <td><?=$gre['descr'];?></td>
                       <td>
diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php
index b1949c74a..40cba3eb7 100644
--- a/src/www/interfaces_gre_edit.php
+++ b/src/www/interfaces_gre_edit.php
@@ -153,7 +153,7 @@ include("head.inc");
                           $portlist[$cif] = $carpip." (".get_vip_descr($carpip).")";
                       }
                       foreach ($aliaslist as $aliasip => $aliasif) {
-                          $portlist[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")";
+                          $portlist[$aliasip] = $aliasip." (".get_vip_descr($aliasip).")";
                       }
 
                       foreach ($portlist as $ifn => $ifinfo):?>