From 9521c1af579518af39ec3e7e044fec75725b6f67 Mon Sep 17 00:00:00 2001 From: derry Date: Fri, 19 Nov 2021 16:53:11 +0800 Subject: [PATCH 01/11] 1.fix dict feature parsing error 2.support proto judgment --- oaf/src/app_filter.c | 14 +++++++++----- oaf/src/app_filter_config.c | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/oaf/src/app_filter.c b/oaf/src/app_filter.c index cf40261..5e90e96 100755 --- a/oaf/src/app_filter.c +++ b/oaf/src/app_filter.c @@ -134,11 +134,14 @@ int __add_app_feature(int appid, if (begin != dict) { 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(); list_add(&(node->head), &af_feature_head); 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"); return AF_FALSE; } - + if (node->proto > 0 && flow->l4_protocol != node->proto) + return AF_FALSE; if (flow->l4_len == 0) return AF_FALSE; diff --git a/oaf/src/app_filter_config.c b/oaf/src/app_filter_config.c index af67fba..023a0d5 100755 --- a/oaf/src/app_filter_config.c +++ b/oaf/src/app_filter_config.c @@ -236,7 +236,6 @@ int af_set_mac_list(cJSON * data_obj) return -1; } if (-1 == mac_to_hex(mac_obj->valuestring, mac_hex)){ - AF_ERROR("mac format error: %s\n", mac_obj->valuestring); continue; } af_mac_add(mac_hex); From 3498f3b5f4f5ab3d312ca0295ad0c6da264a9a62 Mon Sep 17 00:00:00 2001 From: Derry Date: Tue, 23 Nov 2021 19:54:48 +0800 Subject: [PATCH 02/11] Update README.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fba1bba..aad33bb 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ 应用过滤是一款基于OpenWrt的家长管理插件，支持游戏、视频、聊天、下载等app过滤 +这是5.x源码，只对重大bug进行维护 ### 如何编译应用过滤固件 1. 准备OpenWrt源码，并编译成功 推荐源码仓库： @@ -22,7 +23,6 @@ https://zhuanlan.zhihu.com/p/419053529 ### 固件和特征库下载地址 https://destan19.github.io -如果访问不了，可以切换4G网络或者运营商，部分网络屏蔽了github.io ### 演示视频 https://www.bilibili.com/video/BV1ZL41137aT/ @@ -33,11 +33,9 @@ https://github.com/destan19/openfros 2. 在release中下载ipk文件直接安装 ### OpenWrt应用过滤交流群 -群号： 943396288 -点击链接加入群聊【OpenWrt交流群(OAF)】： -https://jq.qq.com/?_wv=1027&k=TqQ6VvtV - +群号： 868508199 +点击链接加入群聊【OpenWrt技术交流】：https://jq.qq.com/?_wv=1027&k=GRkd86no App filtering is a parent management plug-in based on OpenWrt, which supports app filtering for games, videos, chats, downloads, etc. ### How to compile application filtering firmware From b8fb082481464a54f554b552d663cdc6d04a616f Mon Sep 17 00:00:00 2001 From: Derry Date: Tue, 23 Nov 2021 20:18:20 +0800 Subject: [PATCH 03/11] Update README.md --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index aad33bb..37f0615 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ 应用过滤是一款基于OpenWrt的家长管理插件，支持游戏、视频、聊天、下载等app过滤 -这是5.x源码，只对重大bug进行维护 +这是5.x源码，只对重大bug进行修复。 + ### 如何编译应用过滤固件 1. 准备OpenWrt源码，并编译成功 推荐源码仓库： @@ -18,6 +19,13 @@ git clone https://github.com/destan19/OpenAppFilter.git package/OpenAppFilter 2. 关闭软硬加速、广告过滤、QOS、多WAN等涉及到nf_conn mark的模块 3. 开启应用过滤并选择需要过滤的app即可生效 +### 为什么不持续开源？ +1. 技术领域太垂直，没有几个真正开发人员参与。 +2. 用该源码的基本上是刷机人员，只是为了编译固件，并且编译可能还一大堆疑问。 +3. 提供ipk安装方式和固件，这样更方便广大爱好者使用。 +4. 该插件还有很多需要优化的地方，需要系统级别去有优化和开发，比如基于app的限速、多规则等，很难继续适配通用openwrt。 + + ### 如何自定义特征码 https://zhuanlan.zhihu.com/p/419053529 From 8e6171c07fad6f1237af210abc623ed77aaced30 Mon Sep 17 00:00:00 2001 From: JSZMonkey <22406031+JSZMonkey@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:26:54 +0800 Subject: [PATCH 04/11] fix style like this see pic like this https://github.com/JSZMonkey/OpenWrt-Add/blob/master/QQ%E5%9B%BE%E7%89%8720211129084910.png --- .../luasrc/view/admin_network/user_status.htm | 57 +++++-------------- 1 file changed, 15 insertions(+), 42 deletions(-) diff --git a/luci-app-oaf/luasrc/view/admin_network/user_status.htm b/luci-app-oaf/luasrc/view/admin_network/user_status.htm index 1fb1ebd..b7bd383 100755 --- a/luci-app-oaf/luasrc/view/admin_network/user_status.htm +++ b/luci-app-oaf/luasrc/view/admin_network/user_status.htm @@ -1,32 +1,3 @@ - -
- <%:Client List%> - - - - - - - - +
+

<%:Client List%>

+
<%:Id%><%:Hostname%><%:Mac%><%:Ip%><%:Common App(TOP5)%><%:Online Status%>
+ + + + + + + - - + +
<%:Id%><%:Hostname%><%:Mac%><%:Ip%><%:Common App(TOP5)%><%:Online Status%>

<%:Collecting data...%>

<%:Collecting data...%>
From 9b03e6a0734a4035c3c03d37677becafa12f70ea Mon Sep 17 00:00:00 2001 From: JSZMonkey <22406031+JSZMonkey@users.noreply.github.com> Date: Mon, 29 Nov 2021 09:49:44 +0800 Subject: [PATCH 05/11] Update user_status.htm --- luci-app-oaf/luasrc/view/admin_network/user_status.htm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/luci-app-oaf/luasrc/view/admin_network/user_status.htm b/luci-app-oaf/luasrc/view/admin_network/user_status.htm index b7bd383..14c3d45 100755 --- a/luci-app-oaf/luasrc/view/admin_network/user_status.htm +++ b/luci-app-oaf/luasrc/view/admin_network/user_status.htm @@ -20,8 +20,6 @@ } var tr = tb.insertRow(-1); tr.className = 'tr cbi-rowstyle-' + ((i % 2) + 1); - $('tr').find('td').attr('class', 'td'); - //tr.insertCell().className = 'td'; tr.insertCell(-1).innerHTML = i + 1; tr.insertCell(-1).innerHTML = hostname; tr.insertCell(-1).innerHTML = ""+devlist[i].mac+"'>"+devlist[i].mac+""; @@ -41,6 +39,7 @@ tr.insertCell(-1).innerHTML = "<%:Online%>"; else tr.insertCell(-1).innerHTML = "<%:Offline%>"; + $('tr').find('td').attr('class', 'td'); } } } From 828e903a5242c3476c0bb374b7fd7a96cb99eaaa Mon Sep 17 00:00:00 2001 From: JSZMonkey <22406031+JSZMonkey@users.noreply.github.com> Date: Mon, 29 Nov 2021 10:20:43 +0800 Subject: [PATCH 06/11] Update dev_status.htm --- .../luasrc/view/admin_network/dev_status.htm | 56 +++++++++++++------ 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/luci-app-oaf/luasrc/view/admin_network/dev_status.htm b/luci-app-oaf/luasrc/view/admin_network/dev_status.htm index 58cf16e..0173379 100755 --- a/luci-app-oaf/luasrc/view/admin_network/dev_status.htm +++ b/luci-app-oaf/luasrc/view/admin_network/dev_status.htm @@ -4,7 +4,27 @@ local dsp = require "luci.dispatcher" -%> #display{ - display: flex; + padding: 10px; + display: -webkit-box; + -webkit-box-orient: horizontal; + -webkit-box-pack: center; + -webkit-box-align: center; + display: -moz-box; + -moz-box-orient: horizontal; + -moz-box-pack: center; + -moz-box-align: center; + display: -o-box; + -o-box-orient: horizontal; + -o-box-pack: center; + -o-box-align: center; + display: -ms-box; + -ms-box-orient: horizontal; + -ms-box-pack: center; + -ms-box-align: center; + display: box; + box-orient: horizontal; + box-pack: center; + box-align: center; } table.imagetable { @@ -14,6 +34,7 @@ table.imagetable { border-width: 1px; border-color: #999999; border-collapse: collapse; + padding-top:10px; }