From 6323cb793f4eb821d06ed3d09bbb0db6982393f4 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 1 Apr 2020 09:10:32 +0200
Subject: [PATCH] shell: use interfaces_primary_address6() for correct IPv6
 display

---
 src/opnsense/scripts/shell/banner.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/scripts/shell/banner.php b/src/opnsense/scripts/shell/banner.php
index 4368ef62d..3599cc570 100755
--- a/src/opnsense/scripts/shell/banner.php
+++ b/src/opnsense/scripts/shell/banner.php
@@ -86,15 +86,14 @@ foreach ($iflist as $ifname => $ifcfg) {
 
 
     $realif = get_real_interface($ifname);
-    $realifv6 = get_real_interface($ifname, 'inet6');
     $network = null;
-    $network6 = null;
     if (!empty($ifdetails[$realif]['ipv4'][0])) {
         $network = $ifdetails[$realif]['ipv4'][0]['ipaddr'] . "/" .  $ifdetails[$realif]['ipv4'][0]['subnetbits'];
     }
-    if (!empty($ifdetails[$realifv6]['ipv6'][0]) && empty($ifdetails[$realifv6]['ipv6'][0]['link-local'])) {
-        $network6 = $ifdetails[$realifv6]['ipv6'][0]['ipaddr'] . "/" .  $ifdetails[$realif]['ipv6'][0]['subnetbits'];
-    }
+
+    list ($primary6, $unused, $subnet6) = interfaces_primary_address6($ifname, null, $ifdetails);
+    $network6 = "{$primary6}/{$subnet6}";
+
     $tobanner = "{$ifcfg['descr']} ({$realif})";
 
     printf("\n %-15s -> ", $tobanner);
@@ -107,7 +106,7 @@ foreach ($iflist as $ifname => $ifcfg) {
         $v6first = true;
     }
 
-    if (!empty($network6)) {
+    if ($network6 != '/') {
         if (!$v6first) {
             printf("\n%s", str_repeat(" ", 20));
         }