v4.3.2

1.优化外网远程连接路由器代码，提高接通率及稳定性。 2.更新运营商 IP 地址数据文件。
larsonzh · Nov 5, 2023 · 2d56675 · 2d56675
1 parent 468e3c8
commit 2d56675
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 24 deletions.
diff --git a/source_codes/install.sh b/source_codes/install.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# install.sh v4.3.1
+# install.sh v4.3.2
 # By LZ 妙妙呜 ([email protected])
 
 # LZ RULE script for Asuswrt-Merlin Router
@@ -11,7 +11,7 @@
 
 #BEIGIN
 
-LZ_VERSION=v4.3.1
+LZ_VERSION=v4.3.2
 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.2 (2023/11/5)
+    1.优化外网远程连接路由器代码，提高接通率及稳定性。
+    2.更新运营商 IP 地址数据文件。
+
 v4.3.1 (2023/10/30)
     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.1
+# lz_rule_config.sh v4.3.2
 # 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
@@ -456,6 +456,7 @@
 43.250.160.0/22
 43.250.168.0/21
 43.250.176.0/22
+43.250.180.0/23
 43.250.200.0/22
 43.250.212.0/22
 43.250.216.0/21
@@ -2512,7 +2513,7 @@
 103.211.96.0/21
 103.211.156.0/22
 103.211.164.0/22
-103.211.192.0/22
+103.211.194.0/23
 103.211.220.0/22
 103.211.224.0/22
 103.211.248.0/22

diff --git a/source_codes/lz/data/lz_hk_cidr.txt b/source_codes/lz/data/lz_hk_cidr.txt
@@ -1204,6 +1204,7 @@
 103.211.92.0/22
 103.211.124.0/22
 103.211.173.0/24
+103.211.192.0/23
 103.211.198.0/24
 103.211.228.0/22
 103.211.236.0/23
@@ -1493,7 +1494,9 @@
 117.18.112.0/22
 117.18.116.0/24
 117.18.119.0/24
-117.18.120.0/21
+117.18.120.0/23
+117.18.122.0/24
+117.18.124.0/22
 117.18.224.0/22
 117.103.144.0/20
 117.104.188.0/22

diff --git a/source_codes/lz/data/lz_othernet_cidr.txt b/source_codes/lz/data/lz_othernet_cidr.txt
@@ -265,6 +265,7 @@
 43.250.160.0/22
 43.250.172.0/22
 43.250.176.0/22
+43.250.180.0/23
 43.250.216.0/21
 43.250.236.0/22
 43.251.8.0/22
@@ -2033,7 +2034,7 @@
 103.211.100.0/22
 103.211.156.0/22
 103.211.164.0/22
-103.211.192.0/22
+103.211.194.0/23
 103.211.224.0/22
 103.211.248.0/22
 103.212.0.0/20

diff --git a/source_codes/lz/data/lz_tw_cidr.txt b/source_codes/lz/data/lz_tw_cidr.txt
@@ -603,6 +603,7 @@
 203.80.169.0/24
 203.84.144.0/21
 203.91.0.0/19
+203.99.146.0/23
 203.105.224.0/19
 203.111.208.0/20
 203.118.224.0/20

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.1
+# lz_clear_custom_scripts_data.sh v4.3.2
 # 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.1
+# lz_define_global_variables.sh v4.3.2
 # 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.1
+# lz_initialize_config.sh v4.3.2
 # 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.1
+# lz_rule_address_query.sh v4.3.2
 # 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.1
+# lz_rule_func.sh v4.3.2
 # By LZ 妙妙呜 ([email protected])
 
 #BEIGIN
@@ -5208,8 +5208,10 @@ lz_deployment_routing_policy() {
         [ "${wan_access_port}" = "1" ] && local_access_wan="${WAN1}"
     #	ip rule add to 103.10.4.108 table "${local_access_wan}" prio "${IP_RULE_PRIO_INNER_ACCESS}" > /dev/null 2>&1
         [ -n "${route_local_ip}" ] && {
-            ip rule add from all to "${route_local_ip}" table "${local_access_wan}" prio "${IP_RULE_PRIO_INNER_ACCESS}" > /dev/null 2>&1
-            ip rule add from "${route_local_ip}" table "${local_access_wan}" prio "${IP_RULE_PRIO_INNER_ACCESS}" > /dev/null 2>&1
+            ! ip rule add from all to "0.0.0.0" table "${local_access_wan}" prio "${IP_RULE_PRIO_INNER_ACCESS}" > /dev/null 2>&1 \
+                && ip rule add from all to "${route_local_ip}" table "${local_access_wan}" prio "${IP_RULE_PRIO_INNER_ACCESS}" > /dev/null 2>&1
+            ! ip rule add from "0.0.0.0" table "${local_access_wan}" prio "${IP_RULE_PRIO_INNER_ACCESS}" > /dev/null 2>&1 \
+                && ip rule add from "${route_local_ip}" table "${local_access_wan}" prio "${IP_RULE_PRIO_INNER_ACCESS}" > /dev/null 2>&1
         }
     fi
 
@@ -5272,8 +5274,10 @@ lz_deployment_routing_policy() {
     ## 静态分流模式
     if [ "${usage_mode}" != "0" ] && [ "${command_from_all_executed}" = "0" ]; then
         if [ -n "${route_static_subnet}" ]; then
-            [ "${policy_mode}" = "0" ] && ! ip rule add not from "0.0.0.0" table "${WAN1}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1 && ip rule add from "${route_static_subnet}" table "${WAN1}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1
-            [ "${policy_mode}" = "1" ] && ! ip rule add not from "0.0.0.0" table "${WAN0}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1 && ip rule add from "${route_static_subnet}" table "${WAN0}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1
+            [ "${policy_mode}" = "0" ] && ! ip rule add not from "0.0.0.0" table "${WAN1}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1 \
+                && ip rule add from "${route_static_subnet}" table "${WAN1}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1
+            [ "${policy_mode}" = "1" ] && ! ip rule add not from "0.0.0.0" table "${WAN0}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1 \
+                && ip rule add from "${route_static_subnet}" table "${WAN0}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1
         else
             [ "${policy_mode}" = "0" ] && ip rule add from all table "${WAN1}" prio "${IP_RULE_PRIO}" > /dev/null 2>&1
             [ "${policy_mode}" = "1" ] && ip rule add from all table "${WAN0}" prio "${IP_RULE_PRIO}" > /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.1
+# lz_rule_status.sh v4.3.2
 # 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.1
+# lz_vpn_daemon.sh v4.3.2
 # By LZ 妙妙呜 ([email protected])
 
 ## 虚拟专网客户端路由刷新处理后台守护进程脚本
@@ -9,7 +9,7 @@
 
 #BEIGIN
 ## 版本号
-LZ_VERSION=v4.3.1
+LZ_VERSION=v4.3.2
 
 ## 项目接口文件部署路径
 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.1
+# lz_rule_service.sh v4.3.2
 # 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.1
+# lz_policy_routing.js v4.3.2
 # 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.1
+# lz_rule.sh v4.3.2
 # By LZ 妙妙呜 ([email protected])
 
 # 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地
@@ -80,7 +80,7 @@
 ## -------------全局数据定义及初始化-------------------
 
 ## 版本号
-LZ_VERSION=v4.3.1
+LZ_VERSION=v4.3.2
 
 ## 运行状态查询命令
 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.1
+# uninstall.sh v4.3.2
 # By LZ ([email protected])
 
 # LZ RULE script for Asuswrt-Merlin Router
@@ -8,7 +8,7 @@
 
 # BEIGIN
 
-LZ_VERSION=v4.3.1
+LZ_VERSION=v4.3.2
 TIMEOUT=10
 CURRENT_PATH="${0%/*}"
 [ "${CURRENT_PATH:0:1}" != '/' ] && CURRENT_PATH="$( pwd )${CURRENT_PATH#*.}"