v4.3.7

1.优化代码。 2.更新运营商 IP 地址数据文件。
larsonzh · Dec 22, 2023 · 3dd3883 · 3dd3883
1 parent 30dac89
commit 3dd3883
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 21 deletions.
diff --git a/source_codes/install.sh b/source_codes/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# install.sh v4.3.6
+# install.sh v4.3.7
 # By LZ 妙妙呜 ([email protected])
 
 # LZ RULE script for Asuswrt-Merlin Router
@@ -11,7 +11,7 @@
 
 #BEIGIN
 
-LZ_VERSION=v4.3.6
+LZ_VERSION=v4.3.7
 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,7 @@
+v4.3.7 (2023/12/22)
+    1.优化代码。
+    2.更新运营商 IP 地址数据文件。
+
 v4.3.6 (2023/12/21)
     1.完善并优化与域名地址解析相关的流程和功能。
     2.完善软件帮助内容。

diff --git a/source_codes/lz/configs/lz_rule_config.sh b/source_codes/lz/configs/lz_rule_config.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_rule_config.sh v4.3.6
+# lz_rule_config.sh v4.3.7
 # By LZ 妙妙呜 ([email protected])
 
 # 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地

diff --git a/source_codes/lz/data/lz_all_cn_cidr.txt b/source_codes/lz/data/lz_all_cn_cidr.txt
@@ -3486,6 +3486,7 @@
 123.100.0.0/19
 123.101.0.0/16
 123.103.0.0/17
+123.108.88.0/23
 123.108.128.0/20
 123.108.208.0/20
 123.112.0.0/12

diff --git a/source_codes/lz/data/lz_othernet_cidr.txt b/source_codes/lz/data/lz_othernet_cidr.txt
@@ -2685,6 +2685,7 @@
 123.62.0.0/16
 123.99.128.0/17
 123.100.0.0/19
+123.108.88.0/23
 123.108.128.0/20
 123.108.208.0/20
 123.137.0.0/16

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.3.6
+# lz_clear_custom_scripts_data.sh v4.3.7
 # 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.3.6
+# lz_define_global_variables.sh v4.3.7
 # 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
@@ -1,5 +1,5 @@
 #!/bin/sh
-# lz_initialize_config.sh v4.3.6
+# lz_initialize_config.sh v4.3.7
 # By LZ 妙妙呜 ([email protected])
 
 ## 初始化脚本配置

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.3.6
+# lz_rule_address_query.sh v4.3.7
 # 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.3.6
+# lz_rule_func.sh v4.3.7
 # By LZ 妙妙呜 ([email protected])
 
 #BEIGIN
@@ -3668,10 +3668,10 @@ lz_proxy_route_support() {
     local PROXY_NODE_BUF="" line="" wan_no="${WAN0}" node_list="" pre_dns_enable="1"
     [ "${proxy_route}" != "0" ] && wan_no="${WAN1}"
     if [ "${dn_pre_resolved}" = "1" ] || [ "${dn_pre_resolved}" = "2" ]; then
-        echo "${pre_dns}" | awk -v count="0" '$1 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ \
-            && $1 !~ /[3-9][0-9][0-9]/ && $1 !~ /[2][6-9][0-9]/ && $1 !~ /[2][5][6-9]/ && $1 !~ /[\/][4-9][0-9]/ && $1 !~ /[\/][3][3-9]/ \
-            && NF == "1" {count++} END{if (count == "1") exit(0); else exit(1)}' \
-            && pre_dns_enable="0"
+        eval "$( awk -v x="${pre_dns}" 'BEGIN{
+            if (x ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ && x !~ /[3-9][0-9][0-9]/ && x !~ /[2][6-9][0-9]/ && x !~ /[2][5][6-9]/ && x !~ /[\/][4-9][0-9]/ && x !~ /[\/][3][3-9]/)
+                print "pre_dns_enable=\"0\""
+        }' )"
     fi
     PROXY_NODE_BUF="$( sed -e 's/^[[:space:]]\+//g' -e '/^[#]/d' -e 's/[[:space:]]*[#].*$//g' -e '/^[[:space:]]*$/d' "${proxy_remote_node_addr_file}" \
         | tr '[:A-Z:]' '[:a-z:]' \

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.3.6
+# lz_rule_status.sh v4.3.7
 # 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.3.6
+# lz_vpn_daemon.sh v4.3.7
 # By LZ 妙妙呜 ([email protected])
 
 ## 虚拟专网客户端路由刷新处理后台守护进程脚本
@@ -9,7 +9,7 @@
 
 #BEIGIN
 ## 版本号
-LZ_VERSION=v4.3.6
+LZ_VERSION=v4.3.7
 
 ## 项目接口文件部署路径
 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.3.6
+# lz_rule_service.sh v4.3.7
 # By LZ 妙妙呜 ([email protected])
 
 ## 服务接口脚本

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.3.6
+# lz_policy_routing.js v4.3.7
 # By LZ 妙妙呜 ([email protected])
 
 # LZ JavaScript for Asuswrt-Merlin Router

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.3.6
+# lz_rule.sh v4.3.7
 # By LZ 妙妙呜 ([email protected])
 
 # 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地
@@ -80,7 +80,7 @@
 ## -------------全局数据定义及初始化-------------------
 
 ## 版本号
-LZ_VERSION=v4.3.6
+LZ_VERSION=v4.3.7
 
 ## 运行状态查询命令
 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.3.6
+# uninstall.sh v4.3.7
 # By LZ ([email protected])
 
 # LZ RULE script for Asuswrt-Merlin Router
@@ -8,7 +8,7 @@
 
 # BEIGIN
 
-LZ_VERSION=v4.3.6
+LZ_VERSION=v4.3.7
 TIMEOUT=10
 CURRENT_PATH="${0%/*}"
 [ "${CURRENT_PATH:0:1}" != '/' ] && CURRENT_PATH="$( pwd )${CURRENT_PATH#*.}"