v4.3.4

1.优化代码。 2.更新运营商 IP 地址数据文件。
larsonzh · Nov 23, 2023 · fc7b052 · fc7b052
1 parent 3e0820a
commit fc7b052
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 25 deletions.
diff --git a/source_codes/install.sh b/source_codes/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# install.sh v4.3.3
+# install.sh v4.3.4
 # By LZ 妙妙呜 ([email protected])
 
 # LZ RULE script for Asuswrt-Merlin Router
@@ -11,7 +11,7 @@
 
 #BEIGIN
 
-LZ_VERSION=v4.3.3
+LZ_VERSION=v4.3.4
 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.4 (2023/11/23)
+    1.优化代码。
+    2.更新运营商 IP 地址数据文件。
+
 v4.3.3 (2023/11/18)
     1.完善并优化「远程访问及本机应用访问外网静态直通
       策略」和「代理转发静态直通策略」功能，同时增加

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.3
+# lz_rule_config.sh v4.3.4
 # By LZ 妙妙呜 ([email protected])
 
 # 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地

diff --git a/source_codes/lz/data/lz_hk_cidr.txt b/source_codes/lz/data/lz_hk_cidr.txt
@@ -810,7 +810,6 @@
 103.115.144.0/23
 103.115.146.0/24
 103.116.20.0/22
-103.116.212.0/22
 103.116.244.0/22
 103.117.24.0/22
 103.117.76.0/22
@@ -930,7 +929,7 @@
 103.145.114.0/23
 103.145.144.0/23
 103.146.8.0/23
-103.146.12.0/22
+103.146.12.0/23
 103.146.50.0/23
 103.146.52.0/23
 103.146.78.0/23
@@ -1488,7 +1487,10 @@
 116.251.224.0/19
 117.18.0.0/20
 117.18.64.0/20
-117.18.96.0/20
+117.18.96.0/21
+117.18.105.0/24
+117.18.106.0/23
+117.18.108.0/22
 117.18.112.0/22
 117.18.116.0/24
 117.18.119.0/24

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.3
+# lz_clear_custom_scripts_data.sh v4.3.4
 # 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.3
+# lz_define_global_variables.sh v4.3.4
 # 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.3
+# lz_initialize_config.sh v4.3.4
 # 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.3
+# lz_rule_address_query.sh v4.3.4
 # 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.3
+# lz_rule_func.sh v4.3.4
 # By LZ 妙妙呜 ([email protected])
 
 #BEIGIN
@@ -3683,14 +3683,14 @@ lz_proxy_route_support() {
             ip rule add from "${line}" to "0.0.0.0" table "${wan_no}" prio "${IP_RULE_PRIO_TOPEST}" > /dev/null 2>&1
         else
             if [ "${dn_pre_resolved}" = "0" ]; then
-                nslookup "${line}" 2> /dev/null | awk 'NR > 4 && $3 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ \
+                nslookup "${line}" 2> /dev/null | awk 'NR > 4 && $3 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ && $3 != "0.0.0.0" \
                         {system("ip rule add from 0.0.0.0 to "$3"'" table ${wan_no} prio ${IP_RULE_PRIO_TOPEST} > /dev/null 2>&1; ip rule add from "'"$3"'" to 0.0.0.0 table ${wan_no} prio ${IP_RULE_PRIO_TOPEST} > /dev/null 2>&1"'")}'
             elif [ "${dn_pre_resolved}" = "1" ]; then
-                nslookup "${line}" "${pre_dns}" 2> /dev/null | awk 'NR > 4 && $3 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ \
+                nslookup "${line}" "${pre_dns}" 2> /dev/null | awk 'NR > 4 && $3 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ && $3 != "0.0.0.0" \
                         {system("ip rule add from 0.0.0.0 to "$3"'" table ${wan_no} prio ${IP_RULE_PRIO_TOPEST} > /dev/null 2>&1; ip rule add from "'"$3"'" to 0.0.0.0 table ${wan_no} prio ${IP_RULE_PRIO_TOPEST} > /dev/null 2>&1"'")}'
             elif [ "${dn_pre_resolved}" = "2" ]; then
-                node_list="$( nslookup "${line}" 2> /dev/null | awk 'NR > 4 && $3 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ {print $3}' )"
-                eval "$( nslookup "${line}" "${pre_dns}" 2> /dev/null | awk 'NR > 4 && $3 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ \
+                node_list="$( nslookup "${line}" 2> /dev/null | awk 'NR > 4 && $3 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ && $3 != "0.0.0.0" {print $3}' )"
+                eval "$( nslookup "${line}" "${pre_dns}" 2> /dev/null | awk 'NR > 4 && $3 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ && $3 != "0.0.0.0" \
                         {printf "node_list=\"\$\( echo \"\${node_list}\" \| sed -e \"\\\$a %s\" -e \"\/\^[[:space:]]\*\$\/d\" \)\"\n", $3}' )"
                 echo "${node_list}" | awk '$1 ~ /^([0-9]{1,3}[\.]){3}[0-9]{1,3}$/ && !i[$1]++ \
                         {system("ip rule add from 0.0.0.0 to "$1"'" table ${wan_no} prio ${IP_RULE_PRIO_TOPEST} > /dev/null 2>&1; ip rule add from "'"$1"'" to 0.0.0.0 table ${wan_no} prio ${IP_RULE_PRIO_TOPEST} > /dev/null 2>&1"'")}'

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.3
+# lz_rule_status.sh v4.3.4
 # 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.3
+# lz_vpn_daemon.sh v4.3.4
 # By LZ 妙妙呜 ([email protected])
 
 ## 虚拟专网客户端路由刷新处理后台守护进程脚本
@@ -9,7 +9,7 @@
 
 #BEIGIN
 ## 版本号
-LZ_VERSION=v4.3.3
+LZ_VERSION=v4.3.4
 
 ## 项目接口文件部署路径
 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.3
+# lz_rule_service.sh v4.3.4
 # 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.3
+# lz_policy_routing.js v4.3.4
 # By LZ 妙妙呜 ([email protected])
 
 # LZ JavaScript for Asuswrt-Merlin Router
@@ -1139,7 +1139,7 @@ function openOverHint(itemNum) {
         content += "133.234.123.0/24<br />";
         content += "www.abc.def<br />";
         content += "<br />此文件中 <b>0.0.0.0/0</b> 和 <b>0.0.0.0</b> 为无效地址。文件地址条目中不能有协议前缀 (如 http://、https:// 或 ftp:// 等)、端口号 (如 :23456) 等影响地址解析的内容。<br />";
-        content += "<br />由于该地址列表仅用于<b>静态直通路由</b>，所有远程节点服务器地址应为<b>静态地址</b>。当使用<b>域名地址</b>时，运行过程中 IP 地址一旦改变，原有线路链接将失效，需<b>重启</b>策略软件做域名地址解析以<b>重新</b>构建路由。<br />";
+        content += "<br />由于该地址列表仅用于<b>静态直通路由</b>，所有远程节点服务器地址应为<b>静态地址</b>。当使用<b>域名地址</b>时，运行过程中 IP 地址一旦改变，原有线路链接将失效，需<b>重启策略路由</b>软件进行域名地址解析以<b>重新</b>构建路由。<br />";
         content += "<br />当列表数据文件中包含<b>域名地址</b>时，需启用<b>外部网络(WAN) - 策略路由(IPv4) - 运行 - 域名地址预解析</b>功能。为避免 DNS 污染，可同时启用<b>自定义预解析 DNS 服务器</b>功能。<br />";
         content += "<br />为避免软件升级更新或重新安装导致配置重置为缺省状态，建议更改文件名或文件存储路径。</div>";
     } else if (itemNum == 85) {

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