update 2023-05-07 09:27:58

This commit is contained in:
github-actions[bot]
2023-05-07 09:27:58 +08:00
parent ac5f5eac07
commit 68463fe3aa
4 changed files with 8 additions and 7 deletions

View File

@@ -96,8 +96,9 @@ function diy_send(){
[ $4 ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【debug】如果收不到信息请检查 ${dir}debug_send_data 文件,或使用下列命令手动测试返回值 (可能需要关闭日志自动刷新方便选中)" >> ${logfile}
[ $4 ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【debug】"'curl -X POST -H "'$content_type'" -d "@'${dir}debug_send_data'" "'${diyurl}'" ' >> ${logfile}
curl -X POST -H "$content_type" -d "$data" "${diyurl}"
[ $? -ne "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【!!!】网络错误或 URL 错误推送失败curl 返回值为 ${tmp_value}" >> ${logfile} && return 1 || return 0
curl --connect-timeout 10 -m 20 -X POST -H "$content_type" -d "$data" "${diyurl}"
local tmp_value=$?
[ $tmp_value -ne "0" ] && echo "`date "+%Y-%m-%d %H:%M:%S"` 【!!!】网络错误或 URL 错误推送失败curl 返回值为 ${tmp_value}" >> ${logfile} && return 1 || return 0
}
# 下载设备MAC厂商信息
@@ -1191,9 +1192,10 @@ function add_ip_white() {
echo "`date "+%Y-%m-%d %H:%M:%S"` 【!!!】白名单添加失败IP 格式错误" >> ${logfile} && return
fi
ipset list $ipset_name >/dev/null 2>&1 || ipset create $ipset_name hash:ip timeout ${ip_white_timeout} >/dev/null 2>&1
# 端口放行
if [ ! -z $ip_port_white ]; then
$iptables_cmd -C INPUT -m set --match-set "$ipset_name" src -p tcp -m multiport --dport $ip_port_white -j ACCEPT >/dev/null 2>&1 || $iptables_cmd -I INPUT -m set --match-set $ipset_name src -p tcp -m multiport --dport $ip_port_white -j ACCEPT >/dev/null 2>&1
$iptables_cmd -C INPUT -m set --match-set $ipset_name src -p tcp -m multiport --dport $ip_port_white -j ACCEPT >/dev/null 2>&1 || $iptables_cmd -I INPUT -m set --match-set $ipset_name src -p tcp -m multiport --dport $ip_port_white -j ACCEPT >/dev/null 2>&1
fi
# 端口转发
for port_forward in "$port_forward_list"; do

View File

@@ -2,7 +2,6 @@
do_pre_kmodload()
{
return
test -e /etc/modules.d/mt7915e && {
cat /etc/modules.d/mt7915e | grep -q wed_enable=Y || echo mt7915e wed_enable=Y >/etc/modules.d/mt7915e
}

View File

@@ -1,6 +1,6 @@
config natflow 'main'
option hwnat '1'
option hwnat_wed '0'
option hwnat_wed '1'
option enabled '1'
option debug '3'
option delay_pkts '0'

View File

@@ -21,13 +21,13 @@ define Download/geoip
HASH:=e5551e58db5c941425c00ee2a2f1f53c886a55e3841a6fe05aaf0343c78f7a41
endef
GEOSITE_VER:=20230505124421
GEOSITE_VER:=20230506142658
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE)
HASH:=298ed6b43e49dcbe032665292ba45964465ff2ace3e8346c01ffc196c4099496
HASH:=cf79e8a54d24aaddd41f465de7c829ac6d9954dff45a97f1d8febf7fd08cb099
endef
define Package/v2ray-geodata/template