luci-app-firewall: further luci-rpc/getHostHints compatibility fixes

Rework some further code instances to fall back to the legacy ipv4/ipv6
properties if needed.

Fixes: c7b7b42cd3 ("treewide: Update JS using luci-rpc getHostHints")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit dc0cfc642e42eefcac91bb965f9aa612089fad5d)

diff --git a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
index 1f2eff3747d5e0bff7489190260082c973972e25..3f6a309033c63aabef5fbcc0e9c64e94277e078a 100644 (file)
--- a/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
+++ b/applications/luci-app-firewall/htdocs/luci-static/resources/tools/firewall.js
@@ -398,11 +398,11 @@ return baseclass.extend({
                    ipaddrs = {};
 
                for (var mac in hosts) {
-                       L.toArray(hosts[mac].ipaddrs).forEach(function(ip) {
+                       L.toArray(hosts[mac].ipaddrs || hosts[mac].ipv4).forEach(function(ip) {
                                ipaddrs[ip] = mac;
                        });
 
-                       L.toArray(hosts[mac].ip6addrs).forEach(function(ip) {
+                       L.toArray(hosts[mac].ip6addrs || hosts[mac].ipv6).forEach(function(ip) {
                                ip6addrs[ip] = mac;
                        });
                }
@@ -511,8 +511,9 @@ return baseclass.extend({
                L.sortedKeys(hosts).forEach(function(mac) {
                        o.value(mac, E([], [ mac, ' (', E('strong', {}, [
                                hosts[mac].name ||
-                                       (hosts[mac].ipaddrs && hosts[mac].ipaddrs.length && hosts[mac].ipaddrs[0]) ||
-                                       (hosts[mac].ip6addrs && hosts[mac].ip6addrs.length && hosts[mac].ip6addrs[0]) || '?'
+                               L.toArray(hosts[mac].ipaddrs || hosts[mac].ipv4)[0] ||
+                               L.toArray(hosts[mac].ip6addrs || hosts[mac].ipv6)[0] ||
+                               '?'
                        ]), ')' ]));
                });