From c1d3318f5e487832c4597119c7cd75c20caa8e88 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 23 May 2024 15:42:06 +0200 Subject: [PATCH] Add filter_aaa dnsmasq setting info in local API --- .../luasrc/view/openmptcprouter/wanstatus.htm | 2 +- .../files/usr/libexec/rpcd/openmptcprouter | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index ee976c0d5..8e6b1b8e0 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -232,7 +232,7 @@ local statuslogo = ucic:get("openmptcprouter","settings","statuslogo") or "openm if (mArray.openmptcprouter.tun6_state == "DOWN") { statusMessage += '<%:IPv6 tunnel DOWN%>' + '
'; - } else if (mArray.openmptcprouter.wan_addr6 == '') + } else if (mArray.openmptcprouter.wan_addr6 == '' && mArray.openmptcprouter.dns_filter_aaaa == false) { statusMessage += '<%:No IPv6 access%>' + '
'; } diff --git a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter index 8adc4c99b..b56e88dc9 100755 --- a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter +++ b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter @@ -793,6 +793,12 @@ function interfaces_status() if net then ipaddr = net:ipaddr() end + if ipaddr == "" then + net = ntm:get_network("LAN") + if net then + ipaddr = net:ipaddr() + end + end mArray.openmptcprouter["local_addr"] = ipaddr --mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr") mArray.openmptcprouter["hostname"] = "OpenMPTCProuter" @@ -813,6 +819,12 @@ function interfaces_status() if dns_test == "" then mArray.openmptcprouter["dns"] = true end + if uci:get("dhcp","dnsmasq1","filter_aaa") == "1" then + mArray.openmptcprouter["dns_filter_aaa"] = true + end + if uci:get("dhcp","dnsmasq1","filter_a") == "1" then + mArray.openmptcprouter["dns_filter_a"] = true + end mArray.openmptcprouter["ipv6"] = "disabled" if uci:get("openmptcprouter","settings","disable_ipv6") ~= "1" then