v4.5.9

1.在 Web UI 中增加「协议目标端口列表」内有效条目在线运行状态显示功能。 2.将「高级」页面中的策略按执行优先级顺序由高到低排列。 3.更新运营商 IP 地址数据文件。
larsonzh · Sep 5, 2024 · 965e960 · 965e960
1 parent fbf5de0
commit 965e960
Show file tree

Hide file tree

Showing 16 changed files with 902 additions and 848 deletions.
diff --git a/source_codes/install.sh b/source_codes/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# install.sh v4.5.8
+# install.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 # LZ RULE script for Asuswrt-Merlin Router
@@ -11,7 +11,7 @@
 
 #BEGIN
 
-LZ_VERSION=v4.5.8
+LZ_VERSION=v4.5.9
 TIMEOUT=10
 CURRENT_PATH="${0%/*}"
 [ "${CURRENT_PATH:0:1}" != '/' ] && CURRENT_PATH="$( pwd )${CURRENT_PATH#*.}"

diff --git a/source_codes/lz/Changelog.txt b/source_codes/lz/Changelog.txt
@@ -1,3 +1,9 @@
+v4.5.9 (2024/9/5)
+    1.在 Web UI 中增加「协议目标端口列表」内有效条目在
+      线运行状态显示功能。
+    2.将「高级」页面中的策略按执行优先级顺序由高到低排列。
+    3.更新运营商 IP 地址数据文件。
+
 v4.5.8 (2024/9/3)
     1.新增用户自定义数据列表内有效条目在线运行状态显示
       功能。

diff --git a/source_codes/lz/configs/lz_rule_config.sh b/source_codes/lz/configs/lz_rule_config.sh
diff --git a/source_codes/lz/data/lz_hk_cidr.txt b/source_codes/lz/data/lz_hk_cidr.txt
@@ -233,6 +233,7 @@
 45.120.152.0/21
 45.120.168.0/22
 45.120.180.0/22
+45.120.184.0/22
 45.120.204.0/22
 45.120.208.0/22
 45.120.216.0/22
@@ -610,6 +611,7 @@
 103.60.190.0/23
 103.60.220.0/22
 103.60.248.0/22
+103.61.0.0/22
 103.61.20.0/22
 103.61.28.0/22
 103.61.36.0/22
@@ -839,7 +841,6 @@
 103.120.228.0/23
 103.122.92.0/22
 103.123.28.0/22
-103.123.100.0/22
 103.123.160.0/22
 103.124.155.0/24
 103.124.192.0/22

diff --git a/source_codes/lz/func/lz_clear_custom_scripts_data.sh b/source_codes/lz/func/lz_clear_custom_scripts_data.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_clear_custom_scripts_data.sh v4.5.8
+# lz_clear_custom_scripts_data.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 ## 清除用户自定义脚本数据

diff --git a/source_codes/lz/func/lz_define_global_variables.sh b/source_codes/lz/func/lz_define_global_variables.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_define_global_variables.sh v4.5.8
+# lz_define_global_variables.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 # QnkgTFog5aaZ5aaZ5ZGc77yI6Juk6J+G5aKp5YS/77yJ（首次运行标识，切勿修改）
 

diff --git a/source_codes/lz/func/lz_initialize_config.sh b/source_codes/lz/func/lz_initialize_config.sh
diff --git a/source_codes/lz/func/lz_rule_address_query.sh b/source_codes/lz/func/lz_rule_address_query.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_rule_address_query.sh v4.5.8
+# lz_rule_address_query.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 ## 网址信息查询脚本

diff --git a/source_codes/lz/func/lz_rule_func.sh b/source_codes/lz/func/lz_rule_func.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_rule_func.sh v4.5.8
+# lz_rule_func.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 #BEGIN

diff --git a/source_codes/lz/func/lz_rule_status.sh b/source_codes/lz/func/lz_rule_status.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_rule_status.sh v4.5.8
+# lz_rule_status.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 ## 显示脚本运行状态脚本

diff --git a/source_codes/lz/func/lz_vpn_daemon.sh b/source_codes/lz/func/lz_vpn_daemon.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_vpn_daemon.sh v4.5.8
+# lz_vpn_daemon.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 ## 虚拟专网客户端路由刷新处理后台守护进程脚本
@@ -10,7 +10,7 @@
 #BEGIN
 
 ## 版本号
-LZ_VERSION=v4.5.8
+LZ_VERSION=v4.5.9
 
 ## 项目接口文件部署路径
 PATH_INTERFACE="${0%/*}"

diff --git a/source_codes/lz/interface/lz_rule_service.sh b/source_codes/lz/interface/lz_rule_service.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_rule_service.sh v4.5.8
+# lz_rule_service.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 ## 服务接口脚本
@@ -281,6 +281,31 @@ case "${2}" in
                     }
                     print_custom_data_rt_list "${list_prio}" &
                 ;;
+                24982|24983)
+                    list_fwmark="$( echo "${2}" | cut -f 3 -d '_' )"
+                    case "${list_fwmark}" in
+                        0x2222|0x3333)
+                            print_dst_port_rt_list() {
+                                {
+                                    if ip rule show | grep -q "^[[:space:]]*${1}:[[:space:]]*from[[:space:]]*all[[:space:]]*fwmark[[:space:]]*${2}[[:space:]]*lookup"; then
+                                        iptables -t mangle -L LZPRCNMK -n 2> /dev/null \
+                                            | sed -n "/CONNMARK[[:space:]]*set[[:space:]]*${2}$/p" \
+                                            | sed -e 's/^.*[[:space:]]\(tcp\|udp\|udplite\|sctp\|dccp\)[^[:alpha:]].*[[:space:]]0[\.]0[\.]0[\.]0[\/]0[[:space:]][[:space:]]*0[\.]0[\.]0[\.]0[\/]0[[:space:]].*dports[[:space:]][[:space:]]*\([^[:space:]][^[:space:]]*\)[[:space:]].*$/\1 \2/g' \
+                                            -e '/CONNMARK/d' \
+                                            | awk -v count="0" -v pid="[${$}]:" 'BEGIN{system("printf \"%s %s \n\n\" \"$( date +\"%F %T\")\" "pid)} \
+                                            NF >= "2" {print $1,$2,$3,$4,$5; count++;} \
+                                            END{if (count > "0") printf "\n"; printf "Total: %s\n", count;}' OFS="\t"
+                                    else
+                                        printf "%s [%s]: \n\nTotal: 0\n" "$( date +"%F %T")" "${$}"
+                                    fi
+                                } > "${PATH_LZ}/tmp/rtlist.log"
+                            }
+                            print_dst_port_rt_list "${list_prio}" "${list_fwmark}" &
+                        ;;
+                        *)
+                        ;;
+                    esac
+                ;;
                 24976|24977)
                     list_fwmark="$( echo "${2}" | cut -f 3 -d '_' )"
                     list_func="$( echo "${2}" | cut -f 4 -d '_' )"

diff --git a/source_codes/lz/js/lz_policy_routing.js b/source_codes/lz/js/lz_policy_routing.js
@@ -1,5 +1,5 @@
 /*
-# lz_policy_routing.js v4.5.8
+# lz_policy_routing.js v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 # LZ JavaScript for Asuswrt-Merlin Router
@@ -1852,24 +1852,26 @@ function toolsCommand() {
 }
 
 let ipListDialogIDArray = {
-    "custom_data_wan_port_1_list" : ["24991", "Advanced"], 
-    "custom_data_wan_port_2_list" : ["24990", "Advanced"], 
-    "wan_1_domain_list" : ["24977_0x9191_c_0", "Advanced"], 
-    "wan_1_domain_addr_list" : ["24977_0x9191_d_0", "Advanced"], 
+    "local_ipsets_list" : ["24962", "Advanced"], 
+    "proxy_remote_node_addr_list" : ["24960", "Advanced"], 
+    "high_wan_1_src_to_dst_addr_list" : ["24964", "Advanced"], 
+    "wan_2_src_to_dst_addr_list" : ["24965", "Advanced"], 
+    "wan_1_src_to_dst_addr_list" : ["24966", "Advanced"], 
+    "high_wan_2_client_src_addr_list" : ["24969", "Advanced"], 
+    "high_wan_1_client_src_addr_list" : ["24970", "Advanced"], 
+    "high_wan_1_src_to_dst_addr_port_list" : ["24973_0x1717", "Advanced"], 
+    "wan_2_src_to_dst_addr_port_list" : ["24974_0x2121", "Advanced"], 
+    "wan_1_src_to_dst_addr_port_list" : ["24975_0x3131", "Advanced"], 
     "wan_2_domain_list" : ["24976_0x8181_c_1", "Advanced"], 
     "wan_2_domain_addr_list" : ["24976_0x8181_d_1", "Advanced"], 
-    "wan_1_client_src_addr_list" : ["24979", "Advanced"], 
+    "wan_1_domain_list" : ["24977_0x9191_c_0", "Advanced"], 
+    "wan_1_domain_addr_list" : ["24977_0x9191_d_0", "Advanced"], 
     "wan_2_client_src_addr_list" : ["24978", "Advanced"], 
-    "high_wan_1_client_src_addr_list" : ["24970", "Advanced"], 
-    "high_wan_2_client_src_addr_list" : ["24969", "Advanced"], 
-    "wan_1_src_to_dst_addr_list" : ["24966", "Advanced"], 
-    "wan_2_src_to_dst_addr_list" : ["24965", "Advanced"], 
-    "high_wan_1_src_to_dst_addr_list" : ["24964", "Advanced"], 
-    "wan_1_src_to_dst_addr_port_list" : ["24975_0x3131", "Advanced"], 
-    "wan_2_src_to_dst_addr_port_list" : ["24974_0x2121", "Advanced"], 
-    "high_wan_1_src_to_dst_addr_port_list" : ["24973_0x1717", "Advanced"], 
-    "local_ipsets_list" : ["24962", "Advanced"], 
-    "proxy_remote_node_addr_list" : ["24960", "Advanced"], 
+    "wan_1_client_src_addr_list" : ["24979", "Advanced"], 
+    "wan1_dest_port_list" : ["24982_0x2222", "Advanced"], 
+    "wan0_dest_port_list" : ["24983_0x3333", "Advanced"], 
+    "custom_data_wan_port_2_list" : ["24990", "Advanced"], 
+    "custom_data_wan_port_1_list" : ["24991", "Advanced"], 
     "custom_hosts_list" : ["hosts", "Runtime"], 
     "iptv_box_ip_list" : ["888_box", "IPTV"], 
     "iptv_isp_ip_list" : ["888_isp", "IPTV"]
@@ -1890,7 +1892,10 @@ function initRTIPListDialog() {
             code += '<img id="loading_' + key + '_Icon" style="display:none;" src="/ext/lzr/InternetScan.gif">';
             code += '</div>';
             document.getElementById(key).innerHTML = code;
-            document.getElementById(key + "_status").style = "margin-left:27px; text-decoration:underline; cursor:pointer;";
+            if (key == "wan0_dest_port_list" || key == "wan1_dest_port_list")
+                document.getElementById(key + "_status").style = "margin-left:387px; text-decoration:underline; cursor:pointer;";
+            else
+                document.getElementById(key + "_status").style = "margin-left:27px; text-decoration:underline; cursor:pointer;";
             document.getElementById(key + "_status").setAttribute('onclick', 'openRTIPList(this);');
             document.getElementById(key + "_status").title = "显示列表中当前正在运行的有效地址条目。";
             document.getElementById(key + "_status").setAttribute('onmouseover', 'over_var=1;');
@@ -1907,6 +1912,8 @@ function initRTIPListDialog() {
                 str1 = $("#wan_2_domain_list_channel").html();
             if (document.getElementById(key + "_name") != null)
                 str3 = $("#" + key + "_name").html();
+            else if (key == "wan0_dest_port_list" || key == "wan1_dest_port_list")
+                str3 = "协议目标端口列表";
             if (str1 == "" || str3 == "")
                 str2 = "";
             if (document.getElementById(key + "_title") != null)

diff --git a/source_codes/lz/lz_rule.sh b/source_codes/lz/lz_rule.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_rule.sh v4.5.8
+# lz_rule.sh v4.5.9
 # By LZ 妙妙呜 ([email protected])
 
 # 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地
@@ -86,7 +86,7 @@
 ## -------------全局数据定义及初始化-------------------
 
 ## 版本号
-LZ_VERSION=v4.5.8
+LZ_VERSION=v4.5.9
 
 ## 运行状态查询命令
 SHOW_STATUS="status"

diff --git a/source_codes/lz/uninstall.sh b/source_codes/lz/uninstall.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# uninstall.sh v4.5.8
+# uninstall.sh v4.5.9
 # By LZ ([email protected])
 
 # LZ RULE script for Asuswrt-Merlin Router
@@ -8,7 +8,7 @@
 
 #BEGIN
 
-LZ_VERSION=v4.5.8
+LZ_VERSION=v4.5.9
 TIMEOUT=10
 CURRENT_PATH="${0%/*}"
 [ "${CURRENT_PATH:0:1}" != '/' ] && CURRENT_PATH="$( pwd )${CURRENT_PATH#*.}"