tqcq/small-package
0
0
Fork 0
mirror of https://github.com/kenzok8/small-package.git synced 2026-02-05 22:36:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

update-11.19

Browse Source
This commit is contained in:
github-actions[bot]
2021-11-19 20:30:52 +08:00
parent c971d1e536
commit e39808e3fe
8 changed files with 106 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
luci-app-godproxy/rulesupdate.log
View File

@@ -1,41 +1,44 @@
2021-11-19 00:33:28: ------------------- 规则更新 ----------------------- 2021-11-19 09:03:12: ------------------- 规则更新 -----------------------
2021-11-19 00:33:28: ==================================================== 2021-11-19 09:03:12: ====================================================
2021-11-19 00:33:28: 开始更新koolproxy的规则，请等待... 2021-11-19 09:03:12: 开始更新koolproxy的规则，请等待...
2021-11-19 00:33:28: --------------------------------------------------------------------------------------- 2021-11-19 09:03:12: ---------------------------------------------------------------------------------------
2021-11-19 00:33:29: ABP规则的本地版本号： 2021-11-19 09:03:12: ABP规则的本地版本号：
2021-11-19 00:33:29: ABP规则的在线版本号： 202111190026 2021-11-19 09:03:12: ABP规则的在线版本号： 202111190856
2021-11-19 00:33:29: 检测到 ABP规则 已更新，现在开始更新... 2021-11-19 09:03:12: 检测到 ABP规则 已更新，现在开始更新...
2021-11-19 00:33:29: 将临时的ABP规则文件移动到指定位置 2021-11-19 09:03:12: 将临时的ABP规则文件移动到指定位置
2021-11-19 00:33:29: --------------------------------------------------------------------------------------- 2021-11-19 09:03:12: ---------------------------------------------------------------------------------------
2021-11-19 00:33:30: Fanboy规则本地版本号： 202111181600 2021-11-19 09:03:13: Fanboy规则本地版本号：
2021-11-19 00:33:30: Fanboy规则在线版本号： 202111190000 2021-11-19 09:03:13: Fanboy规则在线版本号： 202111190900
2021-11-19 00:33:30: 检测到新版本 Fanboy规则 列表，开始更新... 2021-11-19 09:03:13: 检测到新版本 Fanboy规则 列表，开始更新...
2021-11-19 00:33:30: 将临时文件覆盖到原始 Fanboy规则 文件 2021-11-19 09:03:13: 将临时文件覆盖到原始 Fanboy规则 文件
2021-11-19 00:33:30: --------------------------------------------------------------------------------------- 2021-11-19 09:03:13: ---------------------------------------------------------------------------------------
2021-11-19 00:33:31: Yhosts规则本地版本号： 202111082343 2021-11-19 09:03:15: Yhosts规则本地版本号：
2021-11-19 00:33:31: Yhosts规则在线版本号： 202111082343 2021-11-19 09:03:15: Yhosts规则在线版本号： 202111082343
2021-11-19 00:33:31: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! 2021-11-19 09:03:15: 检测到 Yhosts规则 已更新，现在开始更新...
2021-11-19 00:33:31: --------------------------------------------------------------------------------------- 2021-11-19 09:03:15: 将临时文件覆盖到原始Yhosts文件
2021-11-19 00:33:31: Antiad规则本地版本号： 20211117023854 2021-11-19 09:03:15: ---------------------------------------------------------------------------------------
2021-11-19 00:33:31: Antiad规则在线版本号： 20211117023854 2021-11-19 09:03:15: Antiad规则本地版本号：
2021-11-19 00:33:31: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊! 2021-11-19 09:03:15: Antiad规则在线版本号： 20211117023854
2021-11-19 00:33:31: --------------------------------------------------------------------------------------- 2021-11-19 09:03:15: 检测到新版本 Antiad规则 列表，开始更新...
2021-11-19 00:33:31: StevenBlack规则本地版本号： 18 November 2021 2021-11-19 09:03:15: 将临时文件覆盖到原始 Antiad规则 文件
2021-11-19 00:33:31: StevenBlack规则在线版本号： 18 November 2021 2021-11-19 09:03:15: ---------------------------------------------------------------------------------------
2021-11-19 00:33:31: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! 2021-11-19 09:03:15: StevenBlack规则本地版本号：
2021-11-19 00:33:31: 正在优化 ABP规则。。。。。 2021-11-19 09:03:15: StevenBlack规则在线版本号： 18 November 2021
2021-11-19 00:33:35: 正在优化 Fanboy规则。。。。。 2021-11-19 09:03:15: 检测到新版本 StevenBlack规则 列表，开始更新...
2021-11-19 00:33:39: 跳过优化 补充规则Yhosts。。。。。 2021-11-19 09:03:15: 将临时文件覆盖到原始 StevenBlack规则 文件
2021-11-19 00:33:39: 跳过优化 补充规则Antiad。。。。。 2021-11-19 09:03:15: 正在优化 ABP规则。。。。。
2021-11-19 00:33:39: 跳过优化 补充规则StevenBlack。。。。。 2021-11-19 09:03:18: 正在优化 Fanboy规则。。。。。
2021-11-19 00:33:39: 所有规则更新并优化完毕！ 2021-11-19 09:03:19: 正在优化 补充规则yhosts。。。。。
2021-11-19 00:33:39: ==================================================== 2021-11-19 09:03:19: 正在优化 补充规则antiad。。。。。
2021-11-19 00:33:41: -------------------ABP规则 version 202111190026 2021-11-19 09:03:20: 正在优化 补充规则steven。。。。。
2021-11-19 00:33:41: -------------------Fanboy规则 version 202111190000 2021-11-19 09:03:21: 所有规则更新并优化完毕！
2021-11-19 00:33:41: -------------------Yhosts规则 version 202111082343 2021-11-19 09:03:21: ====================================================
2021-11-19 00:33:41: -------------------Antiad规则 version 20211117023854 2021-11-19 09:03:22: -------------------ABP规则 version 202111190856
2021-11-19 00:33:41: -------------------StevenBlack规则 version 18 November 2021 2021-11-19 09:03:22: -------------------Fanboy规则 version 202111190900
2021-11-19 00:33:41: -------------------静态规则 version 2021-10-07 18:00 2021-11-19 09:03:22: -------------------Yhosts规则 version 202111082343
2021-11-19 00:33:41: -------------------乘风视频 version 202111131 2021-11-19 09:03:22: -------------------Antiad规则 version 20211117023854
2021-11-19 00:33:41: ------------------- 内置规则更新成功！ ------------------- 2021-11-19 09:03:22: -------------------StevenBlack规则 version 18 November 2021
2021-11-19 00:33:41: ------------------- 规则更新成功！ ------------------- 2021-11-19 09:03:22: -------------------静态规则 version 2021-10-07 18:00
2021-11-19 09:03:22: -------------------乘风视频 version 202111131
2021-11-19 09:03:22: ------------------- 内置规则更新成功！ -------------------
2021-11-19 09:03:22: ------------------- 规则更新成功！ -------------------

6
luci-app-nft-qos/po/ro/nft-qos.po
View File

@@ -1,6 +1,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"PO-Revision-Date: 2021-11-17 19:57+0000\n" "PO-Revision-Date: 2021-11-18 18:36+0000\n"
"Last-Translator: Simona Iacob <s@zp1.net>\n" "Last-Translator: Simona Iacob <s@zp1.net>\n"
"Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/" "Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
"luciapplicationsnft-qos/ro/>\n" "luciapplicationsnft-qos/ro/>\n"
@@ -123,11 +123,11 @@ msgstr "Activare limită"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:239 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:239
msgid "Limit Traffic Rate By Mac Address" msgid "Limit Traffic Rate By Mac Address"
msgstr "" msgstr "Limitarea ratei de trafic în funcție de adresa Mac"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:44 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:44
msgid "Limit Type" msgid "Limit Type"
msgstr "" msgstr "Tipul de limită"
#: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:170 #: applications/luci-app-nft-qos/luasrc/model/cbi/nft-qos/nft-qos.lua:170
msgid "MAC (optional)" msgid "MAC (optional)"

2
luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua
View File

@@ -44,6 +44,8 @@ o = s:option(ListValue, "filter_keyword_mode", translate("Filter keyword Mode"))
o:value("0", translate("Close")) o:value("0", translate("Close"))
o:value("1", translate("Discard List")) o:value("1", translate("Discard List"))
o:value("2", translate("Keep List")) o:value("2", translate("Keep List"))
o:value("3", translate("Discard List,But Keep List First"))
o:value("4", translate("Keep List,But Discard List First"))
o = s:option(DynamicList, "filter_discard_list", translate("Discard List")) o = s:option(DynamicList, "filter_discard_list", translate("Discard List"))

8
luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua
View File

@@ -53,13 +53,19 @@ o.default = "3"
o:value("0", translate("Close")) o:value("0", translate("Close"))
o:value("1", translate("Discard List")) o:value("1", translate("Discard List"))
o:value("2", translate("Keep List")) o:value("2", translate("Keep List"))
o:value("3", translate("Use global config")) o:value("3", translate("Discard List,But Keep List First"))
o:value("4", translate("Keep List,But Discard List First"))
o:value("5", translate("Use global config"))
o = s:option(DynamicList, "filter_discard_list", translate("Discard List")) o = s:option(DynamicList, "filter_discard_list", translate("Discard List"))
o:depends("filter_keyword_mode", "1") o:depends("filter_keyword_mode", "1")
o:depends("filter_keyword_mode", "3")
o:depends("filter_keyword_mode", "4")
o = s:option(DynamicList, "filter_keep_list", translate("Keep List")) o = s:option(DynamicList, "filter_keep_list", translate("Keep List"))
o:depends("filter_keyword_mode", "2") o:depends("filter_keyword_mode", "2")
o:depends("filter_keyword_mode", "3")
o:depends("filter_keyword_mode", "4")
if #ss_aead_type > 0 then if #ss_aead_type > 0 then
o = s:option(ListValue, "ss_aead_type", translate("SS AEAD Node Use Type")) o = s:option(ListValue, "ss_aead_type", translate("SS AEAD Node Use Type"))

6
luci-app-passwall/po/zh-cn/passwall.po
View File

@@ -895,6 +895,12 @@ msgstr "丢弃列表"
msgid "Keep List" msgid "Keep List"
msgstr "保留列表" msgstr "保留列表"
msgid "Discard List,But Keep List First"
msgstr "丢弃列表，但保留列表优先"
msgid "Keep List,But Discard List First"
msgstr "保留列表，但丢弃列表优先"
msgid "Use global config" msgid "Use global config"
msgstr "使用全局配置" msgstr "使用全局配置"

36
luci-app-passwall/root/usr/share/passwall/subscribe.lua
View File

@@ -49,6 +49,32 @@ local function is_filter_keyword(value)
end end
end end
return result return result
elseif filter_keyword_mode_default == "3" then
local result = false
for k,v in ipairs(filter_keyword_discard_list_default) do
if value:find(v) then
result = true
end
end
for k,v in ipairs(filter_keyword_keep_list_default) do
if value:find(v) then
result = false
end
end
return result
elseif filter_keyword_mode_default == "4" then
local result = true
for k,v in ipairs(filter_keyword_keep_list_default) do
if value:find(v) then
result = false
end
end
for k,v in ipairs(filter_keyword_discard_list_default) do
if value:find(v) then
result = true
end
end
return result
end end
return false return false
end end
@@ -1088,7 +1114,7 @@ local execute = function()
if value.allowInsecure and value.allowInsecure ~= "1" then if value.allowInsecure and value.allowInsecure ~= "1" then
allowInsecure_default = nil allowInsecure_default = nil
end end
local filter_keyword_mode = value.filter_keyword_mode or "3" local filter_keyword_mode = value.filter_keyword_mode or "5"
if filter_keyword_mode == "0" then if filter_keyword_mode == "0" then
filter_keyword_mode_default = "0" filter_keyword_mode_default = "0"
elseif filter_keyword_mode == "1" then elseif filter_keyword_mode == "1" then
@@ -1097,6 +1123,14 @@ local execute = function()
elseif filter_keyword_mode == "2" then elseif filter_keyword_mode == "2" then
filter_keyword_mode_default = "2" filter_keyword_mode_default = "2"
filter_keyword_keep_list_default = value.filter_keep_list or {} filter_keyword_keep_list_default = value.filter_keep_list or {}
elseif filter_keyword_mode == "3" then
filter_keyword_mode_default = "3"
filter_keyword_keep_list_default = value.filter_keep_list or {}
filter_keyword_discard_list_default = value.filter_discard_list or {}
elseif filter_keyword_mode == "4" then
filter_keyword_mode_default = "4"
filter_keyword_keep_list_default = value.filter_keep_list or {}
filter_keyword_discard_list_default = value.filter_discard_list or {}
end end
local ss_aead_type = value.ss_aead_type or "global" local ss_aead_type = value.ss_aead_type or "global"
if ss_aead_type ~= "global" then if ss_aead_type ~= "global" then

14
oaf/src/app_filter.c
View File

@@ -134,11 +134,14 @@ int __add_app_feature(int appid,
if (begin != dict) { if (begin != dict) {
strncpy(pos, begin, p - begin); strncpy(pos, begin, p - begin);
k_sscanf(pos, "%d:%x",&index, &value);
node->pos_info[node->pos_num].pos = index;
node->pos_info[node->pos_num].value = value;
node->pos_num++;
} }
else{
strcpy(pos, dict);
}
k_sscanf(pos, "%d:%x",&index, &value);
node->pos_info[node->pos_num].pos = index;
node->pos_info[node->pos_num].value = value;
node->pos_num++;
feature_list_write_lock(); feature_list_write_lock();
list_add(&(node->head), &af_feature_head); list_add(&(node->head), &af_feature_head);
feature_list_write_unlock(); feature_list_write_unlock();
@@ -659,7 +662,8 @@ int af_match_one(flow_info_t *flow, af_feature_node_t *node)
AF_ERROR("node or flow is NULL\n"); AF_ERROR("node or flow is NULL\n");
return AF_FALSE; return AF_FALSE;
} }
if (node->proto > 0 && flow->l4_protocol != node->proto)
return AF_FALSE;
if (flow->l4_len == 0) if (flow->l4_len == 0)
return AF_FALSE; return AF_FALSE;

1
oaf/src/app_filter_config.c
View File

@@ -236,7 +236,6 @@ int af_set_mac_list(cJSON * data_obj)
return -1; return -1;
} }
if (-1 == mac_to_hex(mac_obj->valuestring, mac_hex)){ if (-1 == mac_to_hex(mac_obj->valuestring, mac_hex)){
AF_ERROR("mac format error: %s\n", mac_obj->valuestring);
continue; continue;
} }
af_mac_add(mac_hex); af_mac_add(mac_hex);