diff --git a/README.md b/README.md index fba1bba..c89f711 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ 应用过滤是一款基于OpenWrt的家长管理插件，支持游戏、视频、聊天、下载等app过滤 +这是5.x源码，只对重大bug进行修复。 + ### 如何编译应用过滤固件 1. 准备OpenWrt源码，并编译成功 推荐源码仓库： @@ -22,7 +24,6 @@ https://zhuanlan.zhihu.com/p/419053529 ### 固件和特征库下载地址 https://destan19.github.io -如果访问不了，可以切换4G网络或者运营商，部分网络屏蔽了github.io ### 演示视频 https://www.bilibili.com/video/BV1ZL41137aT/ @@ -33,11 +34,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 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..0835c10 100755 --- a/luci-app-oaf/luasrc/view/admin_network/dev_status.htm +++ b/luci-app-oaf/luasrc/view/admin_network/dev_status.htm @@ -4,9 +4,23 @@ local dsp = require "luci.dispatcher" -%> #display{ - display: flex; + display: flex; + flex-direction: row; + flex-wrap: wrap; + padding: 20px; +} +#main{ + min-width: 600px; + height: 300px; + display: inline-block; + flex: 2 2 10%; +} +#main2{ + min-width: 600px; + height: 300px; + display: inline-block; + flex: 2 2 10%; } - table.imagetable { font-family: verdana,arial,sans-serif; font-size:11px; @@ -14,6 +28,7 @@ table.imagetable { border-width: 1px; border-color: #999999; border-collapse: collapse; + padding-top:10px; } - -
- <%: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...%>
-
+ 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);