From 80d7eb0ea7c42dee23429541eeb4664d14f3a40f Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 1 Dec 2020 14:12:48 +0100
Subject: [PATCH] Routing-gateways: select current IPv6 field in
 getInterfaceGateway(), closes https://github.com/opnsense/core/issues/4494

---
 src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
index dd2567238..b1efd58d5 100644
--- a/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
+++ b/src/opnsense/mvc/app/library/OPNsense/Routing/Gateways.php
@@ -410,7 +410,8 @@ class Gateways
             }
             // The interface might have a gateway configured
             if (isset($this->configHandle->interfaces->$interface)) {
-                $intf_gateway = $this->configHandle->interfaces->$interface->gateway;
+                $gwfield = $ipproto == "inet" ? "gateway" : "gatewayv6";
+                $intf_gateway = $this->configHandle->interfaces->$interface->$gwfield;
             } else {
                 $intf_gateway = null;
             }