Skip to content

Commit

Permalink
v4.5.3 源代码
Browse files Browse the repository at this point in the history 
1.优化代码。
2.更新运营商 IP 地址数据文件。
  • Loading branch information
@larsonzh
larsonzh authored Aug 1, 2024
1 parent 47068e2 commit c715087
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 24 deletions.
4 changes: 2 additions & 2 deletions source_codes/install.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# install.sh v4.5.2
# install.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

# LZ RULE script for Asuswrt-Merlin Router
Expand All @@ -11,7 +11,7 @@

#BEGIN

LZ_VERSION=v4.5.2
LZ_VERSION=v4.5.3
TIMEOUT=10
CURRENT_PATH="${0%/*}"
[ "${CURRENT_PATH:0:1}" != '/' ] && CURRENT_PATH="$( pwd )${CURRENT_PATH#*.}"
Expand Down
4 changes: 4 additions & 0 deletions source_codes/lz/Changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v4.5.3 (2024/8/1)
1.优化代码。
2.更新运营商 IP 地址数据文件。

v4.5.2 (2024/7/28)
1.修复已知 bug。
2.优化代码。
Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/configs/lz_rule_config.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_rule_config.sh v4.5.2
# lz_rule_config.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

# 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地
Expand Down
1 change: 1 addition & 0 deletions source_codes/lz/data/lz_all_cn_cidr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3744,6 +3744,7 @@
160.25.12.0/23
160.25.20.0/23
160.25.194.0/23
160.30.40.0/23
160.202.60.0/22
160.202.148.0/22
160.202.152.0/22
Expand Down
6 changes: 2 additions & 4 deletions source_codes/lz/data/lz_hk_cidr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@
45.124.8.0/22
45.124.24.0/22
45.124.64.0/22
45.124.72.0/22
45.124.112.0/22
45.124.132.0/22
45.124.160.0/22
Expand Down Expand Up @@ -626,7 +625,6 @@
103.65.98.0/23
103.65.180.0/22
103.65.216.0/22
103.66.56.0/22
103.66.100.0/22
103.66.180.0/22
103.67.224.0/22
Expand Down Expand Up @@ -710,6 +708,7 @@
103.85.212.0/24
103.85.252.0/22
103.86.12.0/22
103.86.64.0/22
103.86.72.0/21
103.87.8.0/22
103.87.156.0/22
Expand Down Expand Up @@ -893,7 +892,6 @@
103.140.170.0/23
103.140.226.0/23
103.140.238.0/23
103.141.0.0/23
103.141.16.0/23
103.141.72.0/23
103.141.118.0/23
Expand Down Expand Up @@ -1100,7 +1098,6 @@
103.192.36.0/22
103.192.40.0/22
103.192.176.0/22
103.192.200.0/22
103.192.224.0/22
103.193.32.0/22
103.193.68.0/22
Expand Down Expand Up @@ -1470,6 +1467,7 @@
116.193.168.0/22
116.197.176.0/20
116.204.156.0/22
116.204.176.0/22
116.204.208.0/22
116.204.232.0/21
116.204.244.0/22
Expand Down
1 change: 1 addition & 0 deletions source_codes/lz/data/lz_othernet_cidr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2851,6 +2851,7 @@
160.25.12.0/23
160.25.20.0/23
160.25.194.0/23
160.30.40.0/23
160.202.168.0/22
160.202.216.0/21
160.202.224.0/19
Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/func/lz_clear_custom_scripts_data.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_clear_custom_scripts_data.sh v4.5.2
# lz_clear_custom_scripts_data.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

## 清除用户自定义脚本数据
Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/func/lz_define_global_variables.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_define_global_variables.sh v4.5.2
# lz_define_global_variables.sh v4.5.3
# By LZ 妙妙呜 ([email protected])
# QnkgTFog5aaZ5aaZ5ZGc77yI6Juk6J+G5aKp5YS/77yJ（首次运行标识，切勿修改）

Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/func/lz_initialize_config.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_initialize_config.sh v4.5.2
# lz_initialize_config.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

## 初始化脚本配置
Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/func/lz_rule_address_query.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_rule_address_query.sh v4.5.2
# lz_rule_address_query.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

## 网址信息查询脚本
Expand Down
6 changes: 3 additions & 3 deletions source_codes/lz/func/lz_rule_func.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_rule_func.sh v4.5.2
# lz_rule_func.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

#BEGIN
Expand Down Expand Up @@ -2159,7 +2159,7 @@ lz_add_ipv4_src_to_dst_addr_list_binding_wan() {
dst="'"${route_static_subnet}"'";
else if (dst == "0.0.0.0")
dst="'"${route_local_ip}"'";
if (src != dst && !(src == "'"${route_local_ip}"'" || dst == "'"${route_local_ip}"'"))
if (src != dst && src != "'"${route_local_ip}"'" && dst != "'"${route_local_ip}"'")
system("ip rule add from "src" to "dst"'" table ${2} prio ${3} > /dev/null 2>&1"'");
}' "${1}"
else
Expand Down Expand Up @@ -2266,7 +2266,7 @@ lz_add_src_to_dst_prerouting_mark() {
dst="'"${route_static_subnet}"'";
else if (dst == "0.0.0.0")
dst="'"${route_local_ip}"'";
if (src != dst && !(src == "'"${route_local_ip}"'" || dst == "'"${route_local_ip}"'"))
if (src != dst && src != "'"${route_local_ip}"'" && dst != "'"${route_local_ip}"'")
system("'"iptables -t mangle -I ${2} -m state --state NEW -s "'"src" -d "dst"'" -j CONNMARK --set-xmark ${3}/${FWMARK_MASK} > /dev/null 2>&1"'");
}' "${1}"
else
Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/func/lz_rule_status.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_rule_status.sh v4.5.2
# lz_rule_status.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

## 显示脚本运行状态脚本
Expand Down
4 changes: 2 additions & 2 deletions source_codes/lz/func/lz_vpn_daemon.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_vpn_daemon.sh v4.5.2
# lz_vpn_daemon.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

## 虚拟专网客户端路由刷新处理后台守护进程脚本
Expand All @@ -10,7 +10,7 @@
#BEGIN

## 版本号
LZ_VERSION=v4.5.2
LZ_VERSION=v4.5.3

## 项目接口文件部署路径
PATH_INTERFACE="${0%/*}"
Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/interface/lz_rule_service.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_rule_service.sh v4.5.2
# lz_rule_service.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

## 服务接口脚本
Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/js/lz_policy_routing.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
# lz_policy_routing.js v4.5.2
# lz_policy_routing.js v4.5.3
# By LZ 妙妙呜 ([email protected])
# LZ JavaScript for Asuswrt-Merlin Router
Expand Down
4 changes: 2 additions & 2 deletions source_codes/lz/lz_rule.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# lz_rule.sh v4.5.2
# lz_rule.sh v4.5.3
# By LZ 妙妙呜 ([email protected])

# 本软件采用CIDR（无类别域间路由，Classless Inter-Domain Routing）技术，是一个在Internet上创建附加地
Expand Down Expand Up @@ -86,7 +86,7 @@
## -------------全局数据定义及初始化-------------------

## 版本号
LZ_VERSION=v4.5.2
LZ_VERSION=v4.5.3

## 运行状态查询命令
SHOW_STATUS="status"
Expand Down
4 changes: 2 additions & 2 deletions source_codes/lz/uninstall.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# uninstall.sh v4.5.2
# uninstall.sh v4.5.3
# By LZ ([email protected])

# LZ RULE script for Asuswrt-Merlin Router
Expand All @@ -8,7 +8,7 @@

#BEGIN

LZ_VERSION=v4.5.2
LZ_VERSION=v4.5.3
TIMEOUT=10
CURRENT_PATH="${0%/*}"
[ "${CURRENT_PATH:0:1}" != '/' ] && CURRENT_PATH="$( pwd )${CURRENT_PATH#*.}"
Expand Down
2 changes: 1 addition & 1 deletion source_codes/lz/webs/LZ_Policy_Routing_Content.asp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
url: '/ext/lzr/LZRGlobal.html',
dataType: 'text',
success: function(response) {
// v4.5.2
// v4.5.3
retVal = (response.match(/QnkgTFog5aaZ5aaZ5ZGc77yI6Juk6J[\+]G5aKp5YS[\/]77yJ/m) != null) ? true : false;
}
});
Expand Down

0 comments on commit c715087

Please sign in to comment.