From 56ed6eb6339bb9a4154ddc3c3e287d6ce16e858f Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 24 Feb 2022 11:13:19 +0100
Subject: [PATCH] system: simplify this code #5565

---
 src/etc/inc/system.inc | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index f4c98d71a..8d09e8f43 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -230,22 +230,11 @@ function system_resolvconf_generate($verbose = false)
     /* setup static routes for DNS servers. */
     $gateways = new \OPNsense\Routing\Gateways(legacy_interfaces_details());
     for ($dnscounter = 1; $dnscounter < 9; $dnscounter++) {
-        /* setup static routes for dns servers */
         $dnsgw = "dns{$dnscounter}gw";
-        if (isset($syscfg[$dnsgw])) {
+        if (!empty($syscfg[$dnsgw])) {
             $gwname = $syscfg[$dnsgw];
-            if (($gwname != '') && ($gwname != 'none')) {
-                $gatewayip = $gateways->getAddress($gwname);
-                if (is_ipaddrv4($gatewayip)) {
-                    /* dns server array starts at 0 */
-                    $dnscountermo = $dnscounter - 1;
-                    system_host_route($syscfg['dnsserver'][$dnscountermo], $gatewayip);
-                }
-                if (is_ipaddrv6($gatewayip)) {
-                    /* dns server array starts at 0 */
-                    $dnscountermo = $dnscounter - 1;
-                    system_host_route($syscfg['dnsserver'][$dnscountermo], $gatewayip);
-                }
+            if ($gwname != 'none') {
+                system_host_route($syscfg['dnsserver'][$dnscounter - 1], $gateways->getAddress($gwname));
             }
         }
     }