1. fix errors in editor and log view

2. add wan6's ip to wan_ip6 set
morytyann · Aug 17, 2024 · 29b1286 · 29b1286
1 parent 7ff3927
commit 29b1286
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/editor.js b/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/editor.js
@@ -13,7 +13,7 @@ return view.extend({
         ]);
     },
     render: function (data) {
-        const profiles = data[0];
+        const profiles = data[1];
 
         let m, s, o;
 

diff --git a/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/log.js b/luci-app-mihomo/htdocs/luci-static/resources/view/mihomo/log.js
@@ -1,6 +1,7 @@
 'use strict';
 'require form';
 'require view';
+'require uci';
 'require fs';
 'require poll';
 'require tools.mihomo as mihomo'
@@ -14,8 +15,8 @@ return view.extend({
         ]);
     },
     render: function (data) {
-        const appLog = data[0];
-        const coreLog = data[1];
+        const appLog = data[1];
+        const coreLog = data[2];
 
         let m, s, o;
 

diff --git a/mihomo/Makefile b/mihomo/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mihomo
 PKG_VERSION:=1.18.7
-PKG_RELEASE:=160
+PKG_RELEASE:=161
 PKG_BUILD_TIME=$(shell date -u -Iseconds)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/mihomo/files/mihomo.init b/mihomo/files/mihomo.init
@@ -572,12 +572,16 @@ add_wan_inbound_exclusion() {
 }
 
 add_wan6_inbound_exclusion() {
-	local wan6_subnet wan6_prefix
+	local wan6_ip wan6_subnet wan6_prefix
+	network_get_ipaddr6 wan6_ip $1
+	if [ -n "$wan6_ip" ]; then
+		nft add element inet $FW_TABLE wan_ip6 \{ "$wan6_ip" \}
+	fi
 	network_get_subnet6 wan6_subnet $1
 	if [ -n "$wan6_subnet" ]; then
 		nft add element inet $FW_TABLE wan_ip6 \{ "$wan6_subnet" \}
 	fi
-	network_get_prefixes6 wan6_prefix $1
+	network_get_prefix6 wan6_prefix $1
 	if [ -n "$wan6_prefix" ]; then
 		nft add element inet $FW_TABLE wan_ip6 \{ "$wan6_prefix" \}
 	fi