update 2025-01-30 00:25:53

2025-04-04 03:01:27 +08:00 · 2025-01-30 00:25:53 +08:00 · 2025-01-30 00:25:53 +08:00 · c2a12659a1
commit c2a12659a1
parent bc3a0333a5
20 changed files with 1461 additions and 236 deletions
--- a/luci-app-nekobox/htdocs/nekobox/index.php
+++ b/luci-app-nekobox/htdocs/nekobox/index.php
@ -791,6 +791,7 @@ $(document).ready(function() {
 </script>
 <h2 class="royal-style">NekoBox</h2>
 <style>
+
    .nav-pills .nav-link {
        background-color: transparent !important;
        color: inherit;
@ -823,31 +824,19 @@ $(document).ready(function() {
       margin-bottom: 20px;
   }

-   @media (max-width: 1024px) {
-       td:first-child {
-       display: block;
-       width: 100%;
-       font-weight: bold;
-       margin-bottom: 5px;
-    }
-    
-   td:last-child {
-       display: block;
-       width: 100%;
+   @media (max-width: 768px) {
+      .section-container {
+         padding-left: 15px;
+         padding-right: 15px;
+      }
   }

-   .btn-group .btn {
-       font-size: 0.475rem;
-       white-space: nowrap;
-       padding: 0.375rem 0.5rem;
+   @media (max-width: 768px) {
+      tr {
+          margin-bottom: 15px;
+          display: block;
+      }
   }
-
-   tr {
-       margin-bottom: 15px;
-       display: block;
-   }
-}
-
 </style>
 <div class="section-container">
   <table class="table table-borderless mb-2">
--- a/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php
+++ b/luci-app-nekobox/htdocs/nekobox/mihomo_manager.php
@ -173,17 +173,19 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET' && isset($_GET['downloadFile'], $_GET['
 ?>

 <?php
+session_start();
+
 $subscriptionPath = '/etc/neko/proxy_provider/';
 $subscriptionFile = $subscriptionPath . 'subscriptions.json';
-$message = "";
+$notificationMessage = "";
 $subscriptions = [];
 $updateCompleted = false;

-function outputMessage($message) {
-    if (!isset($_SESSION['update_messages'])) {
-        $_SESSION['update_messages'] = [];
+function storeUpdateLog($message) {
+    if (!isset($_SESSION['update_logs'])) {
+        $_SESSION['update_logs'] = [];
    }
-    $_SESSION['update_messages'][] = $message;
+    $_SESSION['update_logs'][] = $message;
 }

 if (!file_exists($subscriptionPath)) {
@ -224,41 +226,35 @@ if (isset($_POST['update'])) {
        }

        if ($return_var === 0) {
-            $_SESSION['update_messages'] = array();
-            $_SESSION['update_messages'][] = '<div class="alert alert-warning" style="margin-bottom: 8px;">
-                <strong>⚠️ 使用说明：</strong>
-                <ul class="mb-0 pl-3">
-                    <li>通用模板（mihomo.yaml）最多支持<strong>6个</strong>订阅链接</li>
-                    <li>请勿更改默认文件名称</li>
-                    <li>该模板支持所有格式订阅链接，无需额外转换</li>
-                </ul>
-            </div>';
+            $_SESSION['update_logs'] = array();
+            storeUpdateLog('<strong>✅ 更新成功:</strong> 订阅 ' . htmlspecialchars($url) . ' 已下载并保存为 ' . htmlspecialchars($customFileName));

            $fileContent = file_get_contents($finalPath);
            $decodedContent = base64_decode($fileContent);

            if ($decodedContent === false) {
-                $_SESSION['update_messages'][] = "Base64 解码失败，请检查下载的文件内容是否有效！";
-                $message = "Base64 解码失败";
+                storeUpdateLog("⚠️ Base64 解码失败，请检查下载的文件内容是否有效！");
+                $notificationMessage = "Base64 解码失败";
            } else {
                $clashFile = $subscriptionPath . $customFileName;
                file_put_contents($clashFile, "# Clash Meta Config\n\n" . $decodedContent);
-                $_SESSION['update_messages'][] = "订阅链接 {$url} 更新成功，并解码内容保存到: {$clashFile}";
-                $message = '更新成功';
+                storeUpdateLog("📂 配置已解码并保存到: " . htmlspecialchars($clashFile));
+                $notificationMessage = '更新成功';
                $updateCompleted = true;
            }
        } else {
-            $_SESSION['update_messages'][] = "配置更新失败！错误信息: " . implode("\n", $output);
-            $message = '更新失败';
+            storeUpdateLog("❌ 配置更新失败！错误信息: " . implode("\n", $output));
+            $notificationMessage = '更新失败';
        }
    } else {
-        $_SESSION['update_messages'][] = "第" . ($index + 1) . "个订阅链接为空！";
-        $message = '更新失败';
+        storeUpdateLog("⚠️ 订阅链接为空！");
+        $notificationMessage = '更新失败';
    }

    file_put_contents($subscriptionFile, json_encode($subscriptions));
-    }
+}
 ?>
+
 <?php
 $shellScriptPath = '/etc/neko/core/update_mihomo.sh';
 $LOG_FILE = '/etc/neko/tmp/log.txt'; 
@ -440,13 +436,24 @@ function download_file($url, $destination) {
    </script>
 <?php endif; ?>
 <body>
-<div class="position-fixed w-100 d-flex justify-content-center" style="top: 20px; z-index: 1050;">
-    <div id="updateAlert" class="alert alert-success alert-dismissible fade show" role="alert" style="display: none; min-width: 300px; max-width: 600px;">
+<div class="position-fixed w-100 d-flex flex-column align-items-center" style="top: 20px; z-index: 1050;">
+    <div id="updateNotification" class="alert alert-info alert-dismissible fade show shadow-lg" role="alert" style="display: none; min-width: 320px; max-width: 600px; opacity: 0.95;">
        <div class="d-flex align-items-center">
            <div class="spinner-border spinner-border-sm me-2" role="status" aria-hidden="true"></div>
-            <strong>更新完成</strong>
+            <strong>🔔 更新通知</strong>
        </div>
-        <div id="updateMessages" class="small mt-2"></div>
+        
+        <div class="alert alert-info mt-2 p-2 small">
+            <strong>⚠️ 使用说明：</strong>
+            <ul class="mb-0 pl-3">
+                <li>通用模板（mihomo.yaml）最多支持<strong>6个</strong>订阅链接</li>
+                <li>请勿更改默认文件名称</li>
+                <li>该模板支持所有格式订阅链接，无需额外转换</li>
+            </ul>
+        </div>
+
+        <div id="updateLogContainer" class="small mt-2"></div>
+
        <button type="button" class="btn-close custom-btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
    </div>
 </div>
@ -544,32 +551,66 @@ html {
 .upload-icon {
    font-size: 1.5rem; 
 }
+
+@media (max-width: 768px) {
+    .table thead {
+        display: none; 
+    }
+
+    .table tbody, 
+    .table tr, 
+    .table td {
+        display: block;
+        width: 100%;
+    }
+
+    .table td::before {
+        content: attr(data-label); 
+        font-weight: bold;
+        display: block;
+        text-transform: uppercase;
+        color: #23407E; 
+    }
+
+    .table tr {
+        margin-bottom: 10px;
+        border: 1px solid #ddd;
+        padding: 10px;
+        border-radius: 5px;
+        background-color: #f9f9f9;
+    }
+}
+
+.container {
+    padding-left: 1.4em;  
+    padding-right: 1.4em; 
+}
+
 </style>

 <script>
-function showUpdateAlert() {
-    const alert = $('#updateAlert');
-    const messages = <?php echo json_encode($_SESSION['update_messages'] ?? []); ?>;
+function displayUpdateNotification() {
+    const notification = $('#updateNotification');
+    const updateLogs = <?php echo json_encode($_SESSION['update_logs'] ?? []); ?>;
    
-    if (messages.length > 0) {
-        const messagesHtml = messages.map(msg => `<div>${msg}</div>`).join('');
-        $('#updateMessages').html(messagesHtml);
+    if (updateLogs.length > 0) {
+        const logsHtml = updateLogs.map(log => `<div>${log}</div>`).join('');
+        $('#updateLogContainer').html(logsHtml);
    }
    
-    alert.show().addClass('show');
+    notification.fadeIn().addClass('show');
    
    setTimeout(function() {
-        alert.removeClass('show');
-        setTimeout(function() {
-            alert.hide();
-            $('#updateMessages').html('');
-        }, 150);
-    }, 12000);
+        notification.fadeOut(300, function() {
+            notification.hide();
+            $('#updateLogContainer').html('');
+        });
+    }, 10000);
 }

-<?php if (!empty($message)): ?>
+<?php if (!empty($notificationMessage)): ?>
    $(document).ready(function() {
-        showUpdateAlert();
+        displayUpdateNotification();
    });
 <?php endif; ?>
 </script>
@ -610,16 +651,16 @@ function showUpdateAlert() {
                    $fileType = $fileTypes[$index];
                ?>
                    <tr>
-                        <td class="align-middle">
+                        <td class="align-middle" data-label="文件名">
                            <a href="download.php?file=<?php echo urlencode($file); ?>"><?php echo htmlspecialchars($file); ?></a>
                        </td>
-                        <td class="align-middle">
+                        <td class="align-middle" data-label="大小">
                            <?php echo file_exists($filePath) ? formatSize(filesize($filePath)) : '文件不存在'; ?>
                        </td>
-                        <td class="align-middle">
+                        <td class="align-middle" data-label="最后修改时间">
                            <?php echo htmlspecialchars(date('Y-m-d H:i:s', filemtime($filePath))); ?>
                        </td>
-                        <td class="align-middle">
+                        <td class="align-middle" data-label="文件类型">
                            <?php echo htmlspecialchars($fileType); ?>
                        </td>
                        <td class="align-middle">
--- a/luci-app-oaf/luasrc/controller/._appfilter.lua
+++ b/luci-app-oaf/luasrc/controller/._appfilter.lua
--- a/luci-app-oaf/luasrc/controller/appfilter.lua
+++ b/luci-app-oaf/luasrc/controller/appfilter.lua
@ -1,4 +1,3 @@
-
 module("luci.controller.appfilter", package.seeall)
 local utl = require "luci.util"

@ -8,43 +7,31 @@ function index()
 	end
 	
 	local page
-	entry({"admin", "services", "appfilter"}, 
-	alias("admin", "services", "appfilter", "user_list"),
-		_("App Filter"), 20).dependent = true
+	entry({"admin", "services", "appfilter"}, alias("admin", "services", "appfilter", "user_list"),_("App Filter"), 10).dependent = true
+

 	entry({"admin", "services", "appfilter", "user_list"}, 
 		arcombine(cbi("appfilter/user_list",{hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}), 
 		cbi("appfilter/dev_status", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true})),
-		_("User List"), 21).leaf=true
+		_("User List"), 20).leaf=true

-	entry({"admin", "services", "appfilter", "base_setting"}, 
-        cbi("appfilter/base_setting"), _("Basic Settings"), 22).leaf=true
+	entry({"admin", "services", "appfilter", "base_setting"}, cbi("appfilter/base_setting"), _("Basic Settings"), 22).leaf=true
+	entry({"admin", "services", "appfilter", "user_setting"}, cbi("appfilter/user_setting"), _("Effective User"), 23).leaf=true
+	entry({"admin", "services", "appfilter", "time_setting"}, cbi("appfilter/time_setting"), _("Effective Time"), 24).leaf=true
+	entry({"admin", "services", "appfilter", "app_filter"}, cbi("appfilter/app_filter", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}), _("App Filter Rule"), 21).leaf=true
+	entry({"admin", "services", "appfilter", "feature"}, cbi("appfilter/feature", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}), _("App Feature"), 25).leaf=true

-	entry({"admin", "services", "appfilter", "user_setting"}, 
-		cbi("appfilter/user_setting"), _("Effective User"), 23).leaf=true
-
-	entry({"admin", "services", "appfilter", "time_setting"}, 
-		cbi("appfilter/time_setting"), _("Effective Time"), 24).leaf=true
-
-	entry({"admin", "services", "appfilter", "feature"}, 
-		cbi("appfilter/feature", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}), _("App Feature"), 25).leaf=true
-
-	page = entry({"admin", "network", "user_status"}, call("user_status"), nil)
-	page.leaf = true
-
-	page = entry({"admin", "network", "dev_app_status"}, call("dev_app_status"), nil)
-	page.leaf = true
-
-	page = entry({"admin", "network", "dev_visit_list"}, call("get_dev_visit_list"), nil)
-	page.leaf = true
-
-	page = entry({"admin", "network", "feature_upgrade"}, call("handle_feature_upgrade"), nil)
-	page.leaf = true
-
-	page = entry({"admin", "network", "dev_visit_time"}, call("get_dev_visit_time"), nil)
-	page.leaf = true
-	page = entry({"admin", "network", "app_class_visit_time"}, call("get_app_class_visit_time"), nil)
-	page.leaf = true
+	entry({"admin", "network", "user_status"}, call("user_status"), nil).leaf = true
+	entry({"admin", "network", "dev_app_status"}, call("dev_app_status"), nil).leaf = true
+	entry({"admin", "network", "dev_visit_list"}, call("get_dev_visit_list"), nil).leaf = true
+	entry({"admin", "network", "feature_upgrade"}, call("handle_feature_upgrade"), nil).leaf = true
+	entry({"admin", "network", "dev_visit_time"}, call("get_dev_visit_time"), nil).leaf = true
+	entry({"admin", "network", "app_class_visit_time"}, call("get_app_class_visit_time"), nil).leaf = true
+	entry({"admin", "network", "class_list"}, call("get_class_list"), nil).leaf = true
+	entry({"admin", "network", "set_app_filter"}, call("set_app_filter"), nil).leaf = true
+	entry({"admin", "network", "get_app_filter"}, call("get_app_filter"), nil).leaf = true
+	entry({"admin", "network", "get_app_filter_base"}, call("get_app_filter_base"), nil).leaf = true
+	entry({"admin", "network", "set_app_filter_base"}, call("set_app_filter_base"), nil).leaf = true
 end

 function get_hostname_by_mac(dst_mac)
@ -148,6 +135,52 @@ function dev_app_status()
 	luci.http.write_json(visit_obj);
 end

+function get_class_list()
+	local json = require "luci.jsonc"
+	luci.http.prepare_content("application/json")
+	local class_obj=utl.ubus("appfilter", "class_list", {});
+	llog("get class list");
+	luci.http.write_json(class_obj);
+end
+
+function get_app_filter()
+	local json = require "luci.jsonc"
+	luci.http.prepare_content("application/json")
+	local class_obj=utl.ubus("appfilter", "get_app_filter", {});
+	llog("get appfilter");
+	luci.http.write_json(class_obj);
+end
+
+function set_app_filter()
+	local json = require "luci.jsonc"
+	luci.http.prepare_content("application/json")
+	local req_obj = {}
+	req_obj.app_list = luci.http.formvalue("app_list")
+	llog("set app filter "..req_obj.app_list);
+	req_obj.app_list = json.parse(req_obj.app_list)  -- 将字符串转换为JSON格式
+	local class_obj=utl.ubus("appfilter", "set_app_filter", req_obj);
+	luci.http.write_json(class_obj);
+end
+
+
+function get_app_filter_base()
+	local json = require "luci.jsonc"
+	llog("11get appfilter base");
+	luci.http.prepare_content("application/json")
+	local class_obj=utl.ubus("appfilter", "get_app_filter_base", {});
+	llog("22get appfilter base");
+	luci.http.write_json(class_obj);
+end
+
+function set_app_filter_base()
+	local json = require "luci.jsonc"
+	llog("set appfilter base");
+	luci.http.prepare_content("application/json")
+	local req_obj = {}
+	req_obj = json.parse(luci.http.formvalue("data"))
+	local resp_obj=utl.ubus("appfilter", "set_app_filter_base", req_obj);
+	luci.http.write_json(resp_obj);
+end

 function get_dev_visit_time(mac)
 	local json = require "luci.jsonc"
@ -206,3 +239,13 @@ function get_dev_visit_list(mac)
 	table.sort(history, cmp_func)
 	luci.http.write_json(history);
 end
+
+function llog(message)
+    local log_file = "/tmp/log/oaf_luci.log"  -- 日志文件路径
+    local fd = io.open(log_file, "a")  -- 以追加模式打开文件
+    if fd then
+        local timestamp = os.date("%Y-%m-%d %H:%M:%S")  -- 获取当前时间戳
+        fd:write(string.format("[%s] %s\n", timestamp, message))  -- 写入时间戳和日志信息
+        fd:close()  -- 关闭文件
+    end
+end
--- a/luci-app-oaf/luasrc/model/cbi/appfilter/app_filter.lua
+++ b/luci-app-oaf/luasrc/model/cbi/appfilter/app_filter.lua
@ -0,0 +1,19 @@
+local ds = require "luci.dispatcher"
+local nxo = require "nixio"
+local nfs = require "nixio.fs"
+local ipc = require "luci.ip"
+local sys = require "luci.sys"
+local utl = require "luci.util"
+local dsp = require "luci.dispatcher"
+local uci = require "luci.model.uci"
+local lng = require "luci.i18n"
+local jsc = require "luci.jsonc"
+
+local m, s
+arg[1] = arg[1] or ""
+m = Map("appfilter", translate("应用过滤规则"), translate("已选择的app将会被禁止联网"))
+
+local v
+v = m:section(SimpleSection)
+v.template = "admin_network/app_filter"
+return m
--- a/luci-app-oaf/luasrc/model/cbi/appfilter/base_setting.lua
+++ b/luci-app-oaf/luasrc/model/cbi/appfilter/base_setting.lua
@ -27,87 +27,91 @@ o:value(1,translate("Bypass Mode"))
 local rule_count = 0
 local version = ""

-s = m:section(TypedSection, "appfilter", translate("App Filter Rules"), 
-translate("If there is no app you want, you can add the app by updating the app feature file"))
-s.anonymous = true
-s.addremove = false
-function get_class_i18n_name(class_name)
-    local fd = io.open("/tmp/app_class.txt", "r")
-	if not fd then return end
-    while true do
-        local ln = fd:read("*l")
-        if not ln then
-            break
-        end
-        local id, name1, name2 = ln:match("^(%d+) (%S+) (%S+)")
-        if  class_name == name1 then
-            fd:close()
-            return name2
-        end
-    end
-	fd:close()
-    return nil
-end
-local class_fd = io.popen("find /tmp/appfilter/ -type f -name '*.class'")
-if class_fd then
-    while true do
-        local apps
-        local class
-        local i18n_name
-        local path = class_fd:read("*l")
-        if not path then
-            break
-        end

-        class = path:match("([^/]+)%.class$")
-        i18n_name=get_class_i18n_name(class)
-        if nil ~= i18n_name then
-            s:tab(class, i18n_name)
-        else
-            s:tab(class, class)
-        end
-        apps = s:taboption(class, MultiValue, class .. "apps", translate(""))
-        apps.rmempty = true
-        apps.widget = "checkbox"
-        apps.size = 10
+-- s = m:section(TypedSection, "appfilter", translate("App Filter Rules"), 
+-- translate("If there is no app you want, you can add the app by updating the app feature file"))
+-- s.anonymous = true
+-- s.addremove = false
+-- function get_class_i18n_name(class_name)
+--     local fd = io.open("/tmp/app_class.txt", "r")
+-- 	if not fd then return end
+--     while true do
+--         local ln = fd:read("*l")
+--         if not ln then
+--             break
+--         end
+--         local id, name1, name2 = ln:match("^(%d+) (%S+) (%S+)")
+--         if  class_name == name1 then
+--             fd:close()
+--             return name2
+--         end
+--     end
+-- 	fd:close()
+--     return nil
+-- end
+-- local class_fd = io.popen("find /tmp/appfilter/ -type f -name '*.class'")
+-- if class_fd then
+--     while true do
+--         local apps
+--         local class
+--         local i18n_name
+--         local path = class_fd:read("*l")
+--         if not path then
+--             break
+--         end

-        local fd = io.open(path)
-        if fd then
-            local line
-            while true do
-                local cmd
-                local cmd_fd
-                line = fd:read("*l")
-                if not line then
-                    break
-                end
-                if string.len(line) < 5 then
-                    break
-                end
-                if not string.find(line, "#") then
-                    cmd = "echo " .. line .. "|awk '{print $1}'"
-                    cmd_fd = io.popen(cmd)
-                    id = cmd_fd:read("*l");
-                    cmd_fd:close()
+--         class = path:match("([^/]+)%.class$")
+--         i18n_name=get_class_i18n_name(class)
+--         if nil ~= i18n_name then
+--             s:tab(class, i18n_name)
+--         else
+--             s:tab(class, class)
+--         end
+--         apps = s:taboption(class, MultiValue, class .. "apps", translate(""))
+--         apps.rmempty = true
+--         apps.widget = "checkbox"
+--         apps.size = 10

-                    cmd = "echo " .. line .. "|awk '{print $2}'"
-                    cmd_fd = io.popen(cmd)
-                    name = cmd_fd:read("*l")
+--         local fd = io.open(path)
+--         if fd then
+--             local line
+--             while true do
+--                 local cmd
+--                 local cmd_fd
+--                 line = fd:read("*l")
+--                 if not line then
+--                     break
+--                 end
+--                 if string.len(line) < 5 then
+--                     break
+--                 end
+--                 if not string.find(line, "#") then
+--                     cmd = "echo " .. line .. "|awk '{print $1}'"
+--                     cmd_fd = io.popen(cmd)
+--                     id = cmd_fd:read("*l");
+--                     cmd_fd:close()

-                    cmd_fd:close()
-                    if not id then
-                        break
-                    end
-                    if not name then
-                        break
-                    end
-                    apps:value(id, name)
-                end
-            end
-            fd:close()
-        end
-    end
-    class_fd:close()
-end
+--                     cmd = "echo " .. line .. "|awk '{print $2}'"
+--                     cmd_fd = io.popen(cmd)
+--                     name = cmd_fd:read("*l")
+
+--                     cmd_fd:close()
+--                     if not id then
+--                         break
+--                     end
+--                     if not name then
+--                         break
+--                     end
+--                     -- apps:value(id, name)
+
+--                     -- 在选项值中添加图标
+--                     apps:value(id,   name)
+--                 end
+--             end
+--             fd:close()
+--         end
+--     end
+--     class_fd:close()
+-- end

 return m
--- a/luci-app-oaf/luasrc/model/cbi/appfilter/overview.lua
+++ b/luci-app-oaf/luasrc/model/cbi/appfilter/overview.lua
@ -0,0 +1,117 @@
+local ds = require "luci.dispatcher"
+local nxo = require "nixio"
+local nfs = require "nixio.fs"
+local ipc = require "luci.ip"
+local sys = require "luci.sys"
+local utl = require "luci.util"
+local dsp = require "luci.dispatcher"
+local uci = require "luci.model.uci"
+local lng = require "luci.i18n"
+local jsc = require "luci.jsonc"
+local http = luci.http
+local SYS = require "luci.sys"
+local m, s
+
+m = Map("appfilter", translate("App Filter"), translate(
+    "Please close the modules that may conflict, such as acceleration, ad filtering, and multi-dial"))
+
+s = m:section(TypedSection, "global", translate("Basic Settings"))
+s:option(Flag, "enable", translate("Enable App Filter"), translate(""))
+s.anonymous = true
+
+o=s:option(ListValue, "work_mode", translate("Work Mode"),translate("")) 
+o.default=0
+o:value(0, translate("Gateway Mode"))
+o:value(1,translate("Bypass Mode"))
+
+local rule_count = 0
+local version = ""
+
+
+-- s = m:section(TypedSection, "appfilter", translate("App Filter Rules"), 
+-- translate("If there is no app you want, you can add the app by updating the app feature file"))
+-- s.anonymous = true
+-- s.addremove = false
+-- function get_class_i18n_name(class_name)
+--     local fd = io.open("/tmp/app_class.txt", "r")
+-- 	if not fd then return end
+--     while true do
+--         local ln = fd:read("*l")
+--         if not ln then
+--             break
+--         end
+--         local id, name1, name2 = ln:match("^(%d+) (%S+) (%S+)")
+--         if  class_name == name1 then
+--             fd:close()
+--             return name2
+--         end
+--     end
+-- 	fd:close()
+--     return nil
+-- end
+-- local class_fd = io.popen("find /tmp/appfilter/ -type f -name '*.class'")
+-- if class_fd then
+--     while true do
+--         local apps
+--         local class
+--         local i18n_name
+--         local path = class_fd:read("*l")
+--         if not path then
+--             break
+--         end
+
+--         class = path:match("([^/]+)%.class$")
+--         i18n_name=get_class_i18n_name(class)
+--         if nil ~= i18n_name then
+--             s:tab(class, i18n_name)
+--         else
+--             s:tab(class, class)
+--         end
+--         apps = s:taboption(class, MultiValue, class .. "apps", translate(""))
+--         apps.rmempty = true
+--         apps.widget = "checkbox"
+--         apps.size = 10
+
+--         local fd = io.open(path)
+--         if fd then
+--             local line
+--             while true do
+--                 local cmd
+--                 local cmd_fd
+--                 line = fd:read("*l")
+--                 if not line then
+--                     break
+--                 end
+--                 if string.len(line) < 5 then
+--                     break
+--                 end
+--                 if not string.find(line, "#") then
+--                     cmd = "echo " .. line .. "|awk '{print $1}'"
+--                     cmd_fd = io.popen(cmd)
+--                     id = cmd_fd:read("*l");
+--                     cmd_fd:close()
+
+--                     cmd = "echo " .. line .. "|awk '{print $2}'"
+--                     cmd_fd = io.popen(cmd)
+--                     name = cmd_fd:read("*l")
+
+--                     cmd_fd:close()
+--                     if not id then
+--                         break
+--                     end
+--                     if not name then
+--                         break
+--                     end
+--                     -- apps:value(id, name)
+
+--                     -- 在选项值中添加图标
+--                     apps:value(id,   name)
+--                 end
+--             end
+--             fd:close()
+--         end
+--     end
+--     class_fd:close()
+-- end
+
+return m
--- a/luci-app-oaf/luasrc/view/admin_network/app_filter.htm
+++ b/luci-app-oaf/luasrc/view/admin_network/app_filter.htm
@ -0,0 +1,353 @@
+<style>
+    body {
+        font-family: Arial, sans-serif;
+        margin: 20px;
+    }
+    h1, h2 {
+        color: #333;
+    }
+    #appContainer {
+        display: flex;
+        flex-wrap: wrap;
+    }
+    .category {
+        width: 100%;
+        margin-bottom: 20px;
+    }
+    .app-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start; /* 左对齐 */
+        margin-top: 10px; /* 增加与标题的间距 */
+    }
+    .app-item {
+        width: 140px; /* 固定宽度 */
+        box-sizing: border-box;
+        padding: 5px;
+        display: flex; /* 使用flex布局 */
+        align-items: center; /* 垂直居中 */
+    }
+    .app-item label {
+        display: flex; /* 使用flex布局 */
+        align-items: center; /* 垂直居中 */
+        width: 100%; /* 确保标签占满整个宽度 */
+        text-align: left; /* 左对齐文本 */
+    }
+    .app-item input[type="checkbox"] {
+        margin-left: 2px; /* 勾选按钮离左侧2px */
+        margin-right: 8px; /* 应用程序名称离按钮8px */
+    }
+
+    h2 {
+        margin-bottom: 10px; 
+    }
+    .category-title {
+        display: flex; /* 使用flex布局 */
+        justify-content: space-between; /* 两端对齐 */
+        align-items: center; /* 垂直居中 */
+        width: 100%; /* 设置宽度为100% */
+        cursor: pointer; /* 鼠标悬停时显示为可点击 */
+        margin-bottom: 10px; /* 增加下方间距 */
+    }
+    .category-name {
+        font-size: 14px; /* 设置字体大小为16px */
+        font-weight: normal; /* 设置字体为正常，不加粗 */
+    }
+    .arrow {
+        width: 12px; /* 图标宽度 */
+        height: 12px; /* 图标高度 */
+        /* background-image: url('path/to/your/icon.svg'); 替换为你的图标路径 */
+
+		background-image: url('<%=resource%>/icons/arrow.png'); /* 使用LuCI资源路径 */
+        background-size: contain; /* 确保图标适应容器 */
+        background-repeat: no-repeat; /* 防止重复 */
+        transition: transform 0.3s ease; /* 添加过渡效果 */
+        display: inline-block; /* 使旋转生效 */
+        transform: rotate(0deg); /* 初始状态箭头向右 */
+    }
+    .arrow.expanded {
+        transform: rotate(90deg); /* 展开状态箭头向下 */
+    }
+    .category-title div {
+        gap: 6px; /* 设置子元素之间的间距为20px */
+    }
+
+    @media (max-width: 600px) {
+        .app-item {
+            width: 25%; /* 屏幕小于600px时每行显示4个 */
+        }
+    }
+
+    .button-container {
+        display: flex;
+        justify-content: right; /* 使按钮居中 */
+        margin-top: 20px; /* 上方留出一些空间 */
+    }
+
+    .submit-button {
+        margin-top: 30px;
+        width: 150px; /* 设置按钮宽度 */
+        height: 30px; /* 设置按钮高度 */
+        background-color: #2885e8;
+        color: white;
+        border: none;
+        border-radius: 5px;
+        cursor: pointer;
+    }
+    .submit-button:hover {
+        background-color: #0f77e6;
+    }
+
+</style>
+
+<script type="text/javascript">//<![CDATA[
+	const data2 = {
+            "class_list": [
+                {
+                    "name": "game",
+                    "app_list": Array.from({length: 20}, (_, i) => `${1000 + i + 1},App ${i + 1}`)
+                },
+                {
+                    "name": "video",
+                    "app_list": Array.from({length: 20}, (_, i) => `${2000 + i + 1},App ${i + 1}`)
+                }
+            ]
+        };
+
+		const data = {
+            "class_list": [
+                {
+                    "name": "game",
+                    "app_list": ["1001,app 1","1002,app 2"]
+                },
+                {
+                    "name": "video",
+                    	"app_list": ["2001,app 1","2002,app 2"]
+                }
+            ]
+        };
+		let app_filter_data = [];
+        const selectedAppIds = [1001, 1002, 1003];
+
+		function init_data2() {
+			// new XHR().get('<%=url('admin/network/class_list')%>', null,
+			// 	function (x, data) {
+			// 		console.log(data);
+			// 		renderAppList(data);
+			// 	}
+			// );
+			renderAppList(data)
+		}
+
+		
+		function init_data() {
+			getAppFilterData().then(() => {
+				getClassListData();
+			});
+			getAppFilterBaseData(); // 新增调用获取过滤开关和工作模式数据的函数
+		}
+
+		function getAppFilterData() {
+			return new Promise((resolve, reject) => {
+				new XHR().get('<%=url('admin/network/get_app_filter')%>', null,
+					function (x, data) {
+						app_filter_data = data.app_list;
+						resolve(); // 请求完成后调用 resolve
+					}
+				);
+			});
+		}
+
+		function getClassListData() {
+			new XHR().get('<%=url('admin/network/class_list')%>', null,
+				function (x, data) {
+					renderAppList(data);
+				}
+			);
+		}
+
+        function renderAppList(data) {
+            const container = document.getElementById('appContainer');
+            container.innerHTML = ''; // 清空之前的数据
+
+            data.class_list.forEach(category => {
+                const categoryTitle = document.createElement('div');
+                categoryTitle.className = 'category-title'; // 添加CSS类
+
+                const categoryName = document.createElement('span');
+                categoryName.textContent = `${category.name} (${category.app_list.length}个)`;
+                categoryName.className = 'category-name'; // 添加CSS类
+
+                const rightContainer = document.createElement('div');
+                rightContainer.style.display = 'flex'; // 使用flex布局
+                rightContainer.style.alignItems = 'center'; // 垂直居中
+
+                const appCount = document.createElement('span');
+                const selectedCount = category.app_list.filter(app => 
+                    app_filter_data.includes(parseInt(app.split(',')[0]))
+                ).length;
+                appCount.textContent = `已选${selectedCount}个`; // 显示已选应用程序个数
+                appCount.className = 'app-count'; // 添加CSS类
+
+                const arrow = document.createElement('span');
+                arrow.className = 'arrow'; // 添加CSS类
+
+                rightContainer.appendChild(appCount);
+                rightContainer.appendChild(arrow);
+
+                categoryTitle.appendChild(categoryName);
+                categoryTitle.appendChild(rightContainer); // 将rightContainer放在最右侧
+                container.appendChild(categoryTitle);
+
+                const appList = document.createElement('div');
+                appList.className = 'app-list';
+                appList.style.display = 'none'; // 初始状态隐藏
+
+                // 添加点击事件来切换显示/隐藏
+                categoryTitle.onclick = function() {
+                    if (appList.style.display === 'none') {
+                        appList.style.display = 'flex';
+                        arrow.classList.add('expanded');
+                    } else {
+                        appList.style.display = 'none';
+                        arrow.classList.remove('expanded');
+                    }
+                };
+
+                category.app_list.forEach(app => {
+                    const appItem = document.createElement('div');
+                    appItem.className = 'app-item';
+                    const label = document.createElement('label');
+
+                    const checkbox = document.createElement('input');
+                    checkbox.type = 'checkbox';
+                    checkbox.name = 'app';
+                    checkbox.value = app.split(',')[0];
+                    if (app_filter_data.includes(parseInt(checkbox.value))) {
+                        checkbox.checked = true;
+                    }
+
+                    // 添加图标
+                    const appDetails = app.split(',');
+                    const appId = appDetails[0];
+                    const appName = appDetails[1];
+                    const withIcon = appDetails[2] === '1';
+
+                    const icon = document.createElement('img');
+                    icon.src = withIcon ? `<%=resource%>/app_icons/${appId}.png` : `<%=resource%>/app_icons/default.png`; // 根据with_icon选择图标路径
+                    icon.alt = `Icon for ${appName}`;
+                    icon.style.width = '20px'; // 设置图标宽度
+                    icon.style.height = '20px'; // 设置图标高度
+                    icon.style.marginRight = '5px'; // 设置图标与文本之间的间距
+                    icon.style.borderRadius = '7px'; // 设置圆角
+					label.appendChild(checkbox);
+                    label.appendChild(icon); // 将图标添加到标签中
+                    
+                    label.appendChild(document.createTextNode(appName));
+                    appItem.appendChild(label);
+                    appList.appendChild(appItem);
+                });
+                container.appendChild(appList);
+            });
+        }
+
+        function submitAppSelection() {
+            const selectedApps = [];
+            const checkboxes = document.querySelectorAll('input[name="app"]:checked');
+            checkboxes.forEach(checkbox => {
+                selectedApps.push(parseInt(checkbox.value));
+            });
+
+            console.log("app_filter_data is " + app_filter_data);
+            new XHR().post('<%=url('admin/network/set_app_filter')%>', {
+                app_list: selectedApps
+            },
+            function (x, data) {
+                init_data();
+                const modal = document.getElementById('modal');
+                modal.style.display = 'flex'; // 显示模态框
+                setTimeout(() => {
+                    modal.style.display = 'none'; // 3秒后自动隐藏模态框
+                }, 1000);
+            }
+            );
+        }
+
+        // 新增接口函数
+        function submitAppFilterBase() {
+            // 获取过滤开关和工作模式的值
+            const filterSwitch = document.getElementById('filterSwitch').checked;
+            const workMode = document.getElementById('workMode').value;
+
+            const data = {
+                data: {
+                    enable: filterSwitch ? 1 : 0, // Convert boolean to 0 or 1
+                    work_mode: workMode   // 工作模式
+                }
+            };
+            console.log("data is " + data);
+            new XHR().post('<%=url('admin/network/set_app_filter_base')%>', data,
+            function (x, data) {
+                console.log("Base filter settings updated");
+            }
+            );
+        }
+
+		function submitHandle() {
+			submitAppFilterBase();
+			submitAppSelection();
+		}
+
+		function openModal() {
+			document.getElementById('modal').style.display = 'block';
+		}
+
+		function closeModal() {
+			document.getElementById('modal').style.display = 'none';
+		}
+
+        // 新增获取过滤开关和工作模式数据的函数
+        function getAppFilterBaseData() {
+			console.log("getAppFilterBaseData");
+            new XHR().get('<%=url('admin/network/get_app_filter_base')%>', null,
+                function (x, data) {
+                    if (data.data.enable == 1) {
+                        document.getElementById('filterSwitch').checked = true;
+                    } else {
+                        document.getElementById('filterSwitch').checked = false;
+                    }
+                    // 直接使用接口返回的work_mode值来设置选中的选项
+                    document.getElementById('workMode').value = data.data.work_mode;
+                    console.log("Base filter settings loaded");
+                }
+            );
+        }
+
+        window.onload = init_data;
+//]]></script>
+
+<div id="modal" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5); z-index: 1000; justify-content: center; align-items: center;">
+    <div style="background-color: rgba(0, 0, 0, 0.5); padding: 10px; border-radius: 5px; text-align: center; width: 100px; height: 70px; color: white; display: flex; justify-content: center; align-items: center;">
+        <p style="margin: 0;">设置成功</p>
+    </div>
+</div>
+
+<div class="cbi-section cbi-tblsection">
+    <div style="margin-bottom: 20px;">
+        <label for="filterSwitch">过滤开关:</label>
+        <input type="checkbox" id="filterSwitch" name="filterSwitch" />
+    </div>
+
+    <div style="margin-bottom: 20px;">
+        <label for="workMode">工作模式:</label>
+        <select id="workMode" name="workMode">
+            <option value="0">网关模式</option>
+            <option value="1">旁路模式</option>
+        </select>
+    </div>
+
+    <div id="appContainer"></div>
+    <div class="button-container">
+        <button type="button" class="submit-button" onclick="submitHandle()">保存</button>
+    </div>
+</div>
--- a/oaf/src/af_utils.c
+++ b/oaf/src/af_utils.c
@ -19,6 +19,24 @@ u_int32_t af_get_timestamp_sec(void)
 #endif

 }
+
+int k_atoi(const char *str) {
+    int result = 0;
+
+    // Skip whitespace
+    while (*str == ' ' || *str == '\t') {
+        str++;
+    }
+
+    // Convert characters to integer
+    while (*str >= '0' && *str <= '9') {
+        result = result * 10 + (*str - '0');
+        str++;
+    }
+
+    return result;
+}
+
 char *k_trim(char *s)
 {
 	char *start, *last, *bk;
@ -64,6 +82,41 @@ void dump_str(char *name, unsigned char *p, int len)
 	strncpy(buf, p, len);
 	printk("[%s]\n", buf);
 }
+int isprint_char(unsigned char c)
+{
+    if (c >= 0x20 && c <= 0x7e)
+        return 1;
+    else
+        return 0;
+}
+
+void print_hex_ascii(const unsigned char *data, size_t size) {
+    size_t i, j;
+
+    for (i = 0; i < size; i += 16) {
+        printk(KERN_CONT"%08lx  ", (unsigned long)i);
+        for (j = 0; j < 16; ++j) {
+            if (i + j < size) {
+                printk(KERN_CONT"%02x ", data[i + j]);
+            } else {
+                printk(KERN_CONT"   "); 
+            }   
+        }   
+
+        printk(KERN_CONT" ");
+
+        for (j = 0; j < 16; ++j) {
+            if (i + j < size) {
+                unsigned char c = data[i + j]; 
+                printk(KERN_CONT"%c", isprint_char(c) ? c : '.'); 
+            }   
+        }   
+
+        printk(KERN_CONT"\n");
+    }   
+    printk(KERN_CONT"---------------------------------------\n");
+}
+

 void dump_hex(char *name, unsigned char *p, int len)
 {
@ -75,10 +128,10 @@ void dump_hex(char *name, unsigned char *p, int len)
 	printk("%s: ",name);
 	for (i = 0; i < len; i++) {
 		if (i % 16 == 0)
-			printk("\n");
-		printk("%02X ",*(p + i));
+			printk(KERN_CONT "\n");
+		printk(KERN_CONT "%02X ",*(p + i));
 	}
-	printk("\n");
+	printk(KERN_CONT "\n");
 }

 #ifndef va_arg
--- a/oaf/src/af_utils.h
+++ b/oaf/src/af_utils.h
@ -11,6 +11,8 @@ void dump_str(char *name, unsigned char *p, int len);
 void dump_hex(char *name, unsigned char *p, int len);

 int k_sscanf(const char *buf, const char *fmt, ...);
+int k_atoi(const char *str);
+void print_hex_ascii(const unsigned char *data, size_t size);

 #endif

--- a/oaf/src/app_filter.c
+++ b/oaf/src/app_filter.c
@ -1,4 +1,3 @@
-
 /*
 	author: derry
 	date:2019/1/10
@ -45,8 +44,21 @@ DEFINE_RWLOCK(af_feature_lock);
 #define MAX_HOST_LEN 64
 #define MIN_HOST_LEN 4

-int __add_app_feature(int appid, char *name, int proto, int src_port,
-					  port_info_t dport_info, char *host_url, char *request_url, char *dict)
+
+int dump_feature_list()
+{
+	af_feature_node_t *n, *node;
+
+	list_for_each_entry_safe(node, n, &af_feature_head, head)
+	{
+		printk("%s %d feature = %s, node = %p\n", __func__, __LINE__, node->feature, node);
+
+	}
+	return 0;
+}
+
+int __add_app_feature(char *feature, int appid, char *name, int proto, int src_port,
+					  port_info_t dport_info, char *host_url, char *request_url, char *dict, char *search_str, int ignore)
 {
 	af_feature_node_t *node = NULL;
 	char *p = dict;
@ -69,6 +81,9 @@ int __add_app_feature(int appid, char *name, int proto, int src_port,
 		node->sport = src_port;
 		strcpy(node->host_url, host_url);
 		strcpy(node->request_url, request_url);
+		strcpy(node->search_str, search_str);
+		node->ignore = ignore;
+		strcpy(node->feature, feature);
 		// 00:0a-01:11
 		p = dict;
 		begin = dict;
@ -97,6 +112,7 @@ int __add_app_feature(int appid, char *name, int proto, int src_port,
 		node->pos_info[node->pos_num].pos = index;
 		node->pos_info[node->pos_num].value = value;
 		node->pos_num++;
+		printk("%s %d feature = %s, node = %p pos_num = %d\n", __func__, __LINE__, node->feature, node, node->pos_num);
 		feature_list_write_lock();
 		list_add(&(node->head), &af_feature_head);
 		feature_list_write_unlock();
@ -246,12 +262,16 @@ int add_app_feature(int appid, char *name, char *feature)
 	int param_num = 0;
 	int dst_port = 0;
 	int src_port = 0;
+	char tmp_buf[128] = {0};
+	int ignore = 0;
+	char search_str[128] = {0};

 	if (!name || !feature)
 	{
 		AF_ERROR("error, name or feature is null\n");
 		return -1;
 	}
+	printk("feature = %s\n", feature);
 	// tcp;8000;www.sina.com;0:get_name;00:0a-01:11
 	memset(&dport_info, 0x0, sizeof(dport_info));
 	while (*p++)
@ -279,15 +299,33 @@ int add_app_feature(int appid, char *name, char *feature)
 		case AF_REQUEST_URL_PARAM_INDEX:
 			strncpy(request_url, begin, p - begin);
 			break;
+		case AF_DICT_PARAM_INDEX:
+			strncpy(dict, begin, p - begin);
+			break;
+		case AF_STR_PARAM_INDEX:
+			strncpy(search_str, begin, p - begin);
+			printk("search_str = %s\n", search_str);
+			break;
+		case AF_IGNORE_PARAM_INDEX:
+			strncpy(tmp_buf, begin, p - begin);
+			ignore = k_atoi(tmp_buf);
+			break;
 		}
+		printk("featuren = %s, param_num = %d\n", feature, param_num);
 		param_num++;
 		begin = p + 1;
 	}
-	if (AF_DICT_PARAM_INDEX != param_num && strlen(feature) > MIN_FEATURE_STR_LEN)
-	{
-		return -1;
+
+	printk("param_num = %d, ignore = %d, dict = %s\n", param_num, ignore, dict);
+	// old version
+	if (param_num == AF_DICT_PARAM_INDEX){
+		strncpy(dict, begin, p - begin);
+	}
+	// new version
+	if (param_num == AF_IGNORE_PARAM_INDEX){
+		strncpy(tmp_buf, begin, p - begin);
+		ignore = k_atoi(tmp_buf);
 	}
-	strncpy(dict, begin, p - begin);

 	if (0 == strcmp(proto_str, "tcp"))
 		proto = IPPROTO_TCP;
@ -295,14 +333,14 @@ int add_app_feature(int appid, char *name, char *feature)
 		proto = IPPROTO_UDP;
 	else
 	{
-		AF_DEBUG("proto %s is not support\n", proto_str);
+		printk("proto %s is not support\n", proto_str);
 		return -1;
 	}
 	sscanf(src_port_str, "%d", &src_port);
 	//	sscanf(dst_port_str, "%d", &dst_port);
 	parse_port_info(dst_port_str, &dport_info);

-	__add_app_feature(appid, name, proto, src_port, dport_info, host_url, request_url, dict);
+	__add_app_feature(feature, appid, name, proto, src_port, dport_info, host_url, request_url, dict, search_str, ignore);
 	return 0;
 }

@ -320,6 +358,8 @@ void af_init_feature(char *feature_str)
 	if (strstr(feature_str, "#"))
 		return;

+	printk("feature_str = %s\n", feature_str);
+
 	k_sscanf(feature_str, "%d%[^:]", &app_id, app_name);
 	while (*p++)
 	{
@ -645,8 +685,7 @@ void dpi_http_proto(flow_info_t *flow)
 	{
 		return;
 	}
-	if (flow->sport != 80 && flow->dport != 80)
-		return;
+
 	for (i = 0; i < data_len; i++)
 	{
 		if (data[i] == 0x0d && data[i + 1] == 0x0a)
@ -758,6 +797,20 @@ static void dump_flow_info(flow_info_t *flow)
 		}
 	}
 }
+
+
+char *k_memstr(char *data, char *str, int size)
+{
+	char *p;
+	char len = strlen(str);
+	for (p = data; p <= (data - len + size); p++)
+	{
+		if (memcmp(p, str, len) == 0)
+			return p; 
+	}
+	return NULL;
+}
+
 int af_match_by_pos(flow_info_t *flow, af_feature_node_t *node)
 {
 	int i;
@ -784,10 +837,25 @@ int af_match_by_pos(flow_info_t *flow, af_feature_node_t *node)
 			}
 			if (flow->l4_data[pos] != node->pos_info[i].value)
 			{
+				AF_DEBUG("not match pos[%d] = %x, flow[%d] = %x\n", pos, node->pos_info[i].value, pos, flow->l4_data[pos]);
+				if (af_log_lvl == 3){
+					print_hex_ascii(flow->l4_data, flow->l4_len > 128 ? 128 : flow->l4_len);
+				}
+				return AF_FALSE;
+			}
+			else{
+				AF_DEBUG("match pos[%d] = %x\n", pos, node->pos_info[i].value);
+			}
+		}
+		if (strlen(node->search_str) > 0){
+			if (k_memstr(flow->l4_data, node->search_str, flow->l4_len)){
+				printk("match by search str, appid=%d, search_str=%s\n", node->app_id, node->search_str);
+				return AF_TRUE;
+			}
+			else{
 				return AF_FALSE;
 			}
 		}
-		AF_DEBUG("match by pos, appid=%d\n", node->app_id);
 		return AF_TRUE;
 	}
 	return AF_FALSE;
@ -869,6 +937,7 @@ int af_match_one(flow_info_t *flow, af_feature_node_t *node)
 	}
 	else if (node->pos_num > 0)
 	{
+		
 		ret = af_match_by_pos(flow, node);
 	}
 	else
@ -877,6 +946,7 @@ int af_match_one(flow_info_t *flow, af_feature_node_t *node)
 				 node->sport, node->dport, node->app_id);
 		return AF_TRUE;
 	}
+
 	return ret;
 }

@ -888,9 +958,12 @@ int app_filter_match(flow_info_t *flow, af_client_info_t *client)
 	{
 		list_for_each_entry_safe(node, n, &af_feature_head, head)
 		{
+			
 			if (af_match_one(flow, node))
 			{
+				printk("match feature, appid=%d, feature = %s\n", node->app_id, node->feature);
 				flow->app_id = node->app_id;
+				flow->feature = node;
 				strncpy(flow->app_name, node->app_name, sizeof(flow->app_name) - 1);
 				if (flow->src)
 					client = find_af_client_by_ip(flow->src);
@ -905,6 +978,7 @@ int app_filter_match(flow_info_t *flow, af_client_info_t *client)
 				if (af_get_app_status(node->app_id))
 				{
 					flow->drop = AF_TRUE;
+					printk("drop appid = %d, feature = %s\n", node->app_id, node->feature);
 					feature_list_read_unlock();
 					return AF_TRUE;
 				}
@ -1095,6 +1169,7 @@ u_int32_t app_filter_hook_bypass_handle(struct sk_buff *skb, struct net_device *
 	}
 	if (flow.drop)
 	{
+		printk("drop appid = %d, feature = %s\n", flow.app_id, flow.feature->feature);
 		ret = NF_DROP;
 	}

@ -1123,7 +1198,7 @@ u_int32_t app_filter_hook_gateway_handle(struct sk_buff *skb, struct net_device
 	u_int8_t drop = 0;
 	u_int8_t malloc_data = 0;

-	if (strncmp(dev->name, "br-lan", 6))
+	if (!strstr(dev->name, "lan"))
 		return NF_ACCEPT;

 	memset((char *)&flow, 0x0, sizeof(flow_info_t));
@ -1182,10 +1257,23 @@ u_int32_t app_filter_hook_gateway_handle(struct sk_buff *skb, struct net_device
 	if (0 != dpi_main(skb, &flow))
 		goto accept;

+	
 	app_filter_match(&flow, client);

+
+	 if (TEST_MODE()){
+		if (flow.l4_protocol == IPPROTO_UDP){
+			if (flow.dport == 53 || flow.dport == 443){	
+				printk(" %s %pI4(%d)--> %pI4(%d) len = %d, %d ,pkt num = %d \n ", IPPROTO_TCP == flow.l4_protocol ? "tcp" : "udp",
+					&flow.src, flow.sport, &flow.dst, flow.dport, skb->len, flow.app_id, total_packets);				
+					print_hex_ascii(flow.l4_data, flow.l4_len > 64 ? 64 : flow.l4_len);
+			}
+		}
+	}
+
 	if (flow.app_id != 0)
 	{
+		printk("match flow.app_id = %d\n", flow.app_id);
 		ct->mark = flow.app_id;
 		AF_CLIENT_LOCK_W();
 		af_update_client_app_info(client, flow.app_id, flow.drop);
@ -1193,6 +1281,7 @@ u_int32_t app_filter_hook_gateway_handle(struct sk_buff *skb, struct net_device
 		AF_LMT_INFO("match %s %pI4(%d)--> %pI4(%d) len = %d, %d\n ", IPPROTO_TCP == flow.l4_protocol ? "tcp" : "udp",
 					&flow.src, flow.sport, &flow.dst, flow.dport, skb->len, flow.app_id);
 	}
+
 	if (flow.drop)
 	{
 		ct->mark |= NF_DROP_BIT;
@ -1367,7 +1456,7 @@ int af_send_msg_to_user(char *pbuf, uint16_t len)
 	if (len >= MAX_OAF_NL_MSG_LEN)
 		return -1;

-	msg_buf = kmalloc(buf_len, GFP_KERNEL);
+	msg_buf = kmalloc(buf_len, GFP_ATOMIC);
 	if (!msg_buf)
 		return -1;

@ -1501,3 +1590,4 @@ static void app_filter_fini(void)

 module_init(app_filter_init);
 module_exit(app_filter_fini);
+
--- a/oaf/src/app_filter.h
+++ b/oaf/src/app_filter.h
@ -14,7 +14,7 @@
 #define MAX_REQUEST_URL_LEN 128
 #define MAX_FEATURE_BITS 16
 #define MAX_POS_INFO_PER_FEATURE 16
-#define MAX_FEATURE_LINE_LEN 256
+#define MAX_FEATURE_LINE_LEN 600
 #define MIN_FEATURE_LINE_LEN 16
 #define MAX_URL_MATCH_LEN 64
 #define MAX_BYPASS_DPI_PKT_LEN 600
@ -43,6 +43,8 @@
 #define HTTPS_URL_OFFSET		9
 #define HTTPS_LEN_OFFSET		7

+#define MAX_SEARCH_STR_LEN 32
+
 enum AF_FEATURE_PARAM_INDEX{
 	AF_PROTO_PARAM_INDEX,
 	AF_SRC_PORT_PARAM_INDEX,
@ -50,6 +52,8 @@ enum AF_FEATURE_PARAM_INDEX{
 	AF_HOST_URL_PARAM_INDEX,
 	AF_REQUEST_URL_PARAM_INDEX,
 	AF_DICT_PARAM_INDEX,
+	AF_STR_PARAM_INDEX,
+	AF_IGNORE_PARAM_INDEX,
 };


@ -97,25 +101,6 @@ typedef struct https_proto{
 	int url_len;
 }https_proto_t;

-typedef struct flow_info{
-	struct nf_conn *ct;
-	u_int32_t src; 
-	u_int32_t dst;
-	u_int8_t *src6;
-	u_int8_t *dst6;
-	int l4_protocol;
-	u_int16_t sport;
-	u_int16_t dport;
-	unsigned char *l4_data;
-	int l4_len;
-	http_proto_t http;
-	https_proto_t https;
-	u_int32_t app_id;
-	u_int8_t app_name[MAX_APP_NAME_LEN];
-	u_int8_t drop;
-	u_int8_t dir;
-	u_int16_t total_len;
-}flow_info_t;



@ -144,7 +129,7 @@ typedef struct af_feature_node{
 	struct list_head  		head;
 	u_int32_t app_id;
 	char app_name[MAX_APP_NAME_LEN];
-	char feature_str[MAX_FEATURE_NUM_PER_APP][MAX_FEATURE_STR_LEN];
+	char feature[MAX_FEATURE_STR_LEN];
 	u_int32_t proto;
 	u_int32_t sport;
 	u_int32_t dport;
@ -152,6 +137,8 @@ typedef struct af_feature_node{
 	char host_url[MAX_HOST_URL_LEN];
 	char request_url[MAX_REQUEST_URL_LEN];
 	int pos_num;
+	char search_str[MAX_SEARCH_STR_LEN];
+	int ignore;
 	af_pos_info_t pos_info[MAX_POS_INFO_PER_FEATURE];
 }af_feature_node_t;

@ -160,6 +147,27 @@ typedef struct af_mac_info {
    unsigned char      mac[MAC_ADDR_LEN];
 }af_mac_info_t;

+typedef struct flow_info{
+	struct nf_conn *ct;
+	u_int32_t src; 
+	u_int32_t dst;
+	u_int8_t *src6;
+	u_int8_t *dst6;
+	int l4_protocol;
+	u_int16_t sport;
+	u_int16_t dport;
+	unsigned char *l4_data;
+	int l4_len;
+	http_proto_t http;
+	https_proto_t https;
+	u_int32_t app_id;
+	u_int8_t app_name[MAX_APP_NAME_LEN];
+	u_int8_t drop;
+	u_int8_t dir;
+	u_int16_t total_len;
+	af_feature_node_t *feature;
+}flow_info_t;
+
 int af_register_dev(void);
 void af_unregister_dev(void);
 void af_init_app_status(void);
--- a/open-app-filter/files/oaf_rule
+++ b/open-app-filter/files/oaf_rule
@ -21,27 +21,21 @@ clean_rule()
 }

 load_rule()
-{
+{          
    json_init
    json_add_int "op" 1
    json_add_object "data"
-    json_add_array "apps"
-    for file in `ls /tmp/appfilter/*.class`
-    do
-        class_name=`echo "$file" | awk -F/ '{print $4}'| awk -F. '{print $1}'`
-        config_get appid_list "appfilter" "${class_name}apps"
-
-        if ! test -z "$appid_list";then
-            for appid in $appid_list:
-            do
-                json_add_int "" $appid
-            done
-        fi
-    done
-
+    json_add_array "apps" 
+    config_get appid_list rule app_list
+    if ! test -z "$appid_list";then    
+        for appid in $appid_list:  
+        do                         
+            json_add_int "" $appid
+        done                      
+    fi                            
    json_str=`json_dump`
    config_apply "$json_str"
-    json_cleanup
+    json_cleanup               
 }

 load_mac_list()
--- a/open-app-filter/src/appfilter_config.c
+++ b/open-app-filter/src/appfilter_config.c
@ -110,6 +110,221 @@ done:
    return ret;
 }

+
+int af_uci_delete(struct uci_context *ctx, char *key)
+{
+    struct uci_element *e;
+    struct uci_ptr ptr;
+    int ret = UCI_OK;
+    int dummy;
+    char *parameters ;
+    char param_tmp[128] = {0};    
+    strcpy(param_tmp, key);
+    if (uci_lookup_ptr(ctx, &ptr, param_tmp, true) != UCI_OK) {
+        ret = 1;
+        return ret;
+    }
+    ret = uci_delete(ctx, &ptr);
+    if (ret == UCI_OK)
+       ret = uci_save(ctx, ptr.p);
+
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+    return ret;
+}
+
+
+
+int af_uci_add_list(struct uci_context *ctx, char *key, char *value)
+{
+    struct uci_element *e;
+    struct uci_ptr ptr;
+    int ret = UCI_OK;
+    int dummy;
+    char *parameters;
+    if (strlen(value) + strlen(key) >= MAX_PARAM_LIST_LEN  - 1) {
+        printf("value too long\n");
+        return -1;
+    }
+    char param_tmp[MAX_PARAM_LIST_LEN] = {0};    
+    sprintf(param_tmp, "%s=%s", key, value);
+    if (uci_lookup_ptr(ctx, &ptr, param_tmp, true) != UCI_OK) {
+        ret = 1;
+        return ret;
+    }
+    ret = uci_add_list(ctx, &ptr);
+    if (ret == UCI_OK)
+       ret = uci_save(ctx, ptr.p);
+
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+    return ret;
+}
+
+
+int af_uci_get_list_value(struct uci_context *ctx, char *key, char *output, int out_len, char *delimt)
+{
+    struct uci_element *e;
+    struct uci_ptr ptr;
+    int ret = -1;
+    int dummy;
+    char *parameters ;
+    char param_tmp[128] = {0};
+    strcpy(param_tmp, key);
+    if (uci_lookup_ptr(ctx, &ptr, param_tmp, true) != UCI_OK) {
+        return ret;
+    }
+    
+    if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+        ctx->err = UCI_ERR_NOTFOUND;
+        goto done;
+    }
+    int sep = 0;
+    e = ptr.last;
+	int len = 0;
+    switch(e->type) {
+        case UCI_TYPE_SECTION:
+            ret = -1;
+			goto done;
+        case UCI_TYPE_OPTION:
+			if (UCI_TYPE_LIST == ptr.o->type){
+				memset(output, 0x0, out_len);
+				uci_foreach_element(&ptr.o->v.list, e) {
+					len = strlen(output);
+					if (sep){
+						strncat(output + len, delimt, out_len);
+					}
+					len = strlen(output);
+					sprintf(output + len, "%s", e->name);
+					sep = 1;
+				}
+				ret = 0;
+			}
+			goto done;
+        default:
+            break;
+    }
+done:	
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+    return ret;
+}
+
+
+int af_uci_add_int_list(struct uci_context *ctx, char *key, int value)
+{
+    struct uci_element *e;
+    struct uci_ptr ptr;
+    int ret = UCI_OK;
+    int dummy;
+    char *parameters ;
+    char param_tmp[128] = {0};    
+    sprintf(param_tmp, "%s=%d", key, value);
+    if (uci_lookup_ptr(ctx, &ptr, param_tmp, true) != UCI_OK) {
+        ret = 1;
+        return ret;
+    }
+    ret = uci_add_list(ctx, &ptr);
+    if (ret == UCI_OK)
+       ret = uci_save(ctx, ptr.p);
+
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+    return ret;
+}
+
+int af_uci_del_list(struct uci_context *ctx, char *key, char *value)
+{
+    struct uci_element *e;
+    struct uci_ptr ptr;
+    int ret = UCI_OK;
+    int dummy;
+    char *parameters ;
+    char param_tmp[128] = {0};    
+    sprintf(param_tmp, "%s=%s", key, value);
+    if (uci_lookup_ptr(ctx, &ptr, param_tmp, true) != UCI_OK) {
+        ret = 1;
+        return ret;
+    }
+    ret = uci_del_list(ctx, &ptr);
+    if (ret == UCI_OK)
+       ret = uci_save(ctx, ptr.p);
+
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+    return ret;
+}
+
+
+int af_uci_set_value(struct uci_context *ctx, char *key, char *value)
+{
+    struct uci_element *e;
+    struct uci_ptr ptr;
+    int ret = UCI_OK;
+    int dummy;
+    char *parameters ;
+    char param_tmp[2048] = {0};    
+    sprintf(param_tmp, "%s=%s", key, value);
+    if (uci_lookup_ptr(ctx, &ptr, param_tmp, true) != UCI_OK) {
+        ret = 1;
+        return ret;
+    }
+    
+    e = ptr.last;
+    ret = uci_set(ctx, &ptr);
+    if (ret == UCI_OK)
+       ret = uci_save(ctx, ptr.p);
+
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+    return ret;
+}
+
+int af_uci_set_int_value(struct uci_context *ctx, char *key, int value)
+{
+    struct uci_element *e;
+    struct uci_ptr ptr;
+    int ret = UCI_OK;
+    int dummy;
+    char *parameters ;
+    char param_tmp[128] = {0};    
+    sprintf(param_tmp, "%s=%d", key, value);
+    if (uci_lookup_ptr(ctx, &ptr, param_tmp, true) != UCI_OK) {
+        ret = 1;
+        return ret;
+    }
+    e = ptr.last;
+    ret = uci_set(ctx, &ptr);
+    if (ret == UCI_OK)
+       ret = uci_save(ctx, ptr.p);
+
+    if (ptr.p)
+        uci_unload(ctx, ptr.p);
+    return ret;
+}
+
+int af_uci_commit(struct uci_context *ctx, const char * package) {
+    struct uci_ptr ptr;
+    int ret = UCI_OK;
+    if (!package){
+        return -1;
+    }
+    if (uci_lookup_ptr(ctx, &ptr, package, true) != UCI_OK) {
+        return -1;
+    }   
+
+    if (uci_commit(ctx, &ptr.p, false) != UCI_OK) {
+    	ret = -1;
+        goto done;
+    }
+done:
+	if (ptr.p)
+		uci_unload(ctx, ptr.p);
+
+    return UCI_OK;
+}
+
+
 //
 static struct uci_package *
 config_init_package(const char *config)
--- a/open-app-filter/src/appfilter_config.h
+++ b/open-app-filter/src/appfilter_config.h
@ -21,8 +21,12 @@ THE SOFTWARE.
 */
 #ifndef __APPFILTER_CONFIG_H__
 #define __APPFILTER_CONFIG_H__
+#include <uci.h>
+
 #define MAX_SUPPORT_APP_NUM 1024
 #define MAX_CLASS_NAME_LEN 32
+#define MAX_PARAM_LIST_LEN 1024
+
 #include "appfilter_user.h"
 extern int g_cur_class_num;
 extern int g_app_count;
@ -58,5 +62,11 @@ af_ctl_time_t *load_appfilter_ctl_time_config(void);
 int config_get_appfilter_enable(void);
 int config_get_lan_ip(char *lan_ip, int len);
 int config_get_lan_mask(char *lan_mask, int len);
-
+int af_uci_delete(struct uci_context *ctx, char *key);
+int af_uci_add_list(struct uci_context *ctx, char *key, char *value);
+int af_uci_add_int_list(struct uci_context *ctx, char *key, int value);
+int af_uci_del_list(struct uci_context *ctx, char *key, char *value);
+int af_uci_get_list_value(struct uci_context *ctx, char *key, char *output, int out_len, char *delimt);
+int af_uci_set_value(struct uci_context *ctx, char *key, char *value);
+int af_uci_set_int_value(struct uci_context *ctx, char *key, int value);
 #endif
--- a/open-app-filter/src/appfilter_netlink.c
+++ b/open-app-filter/src/appfilter_netlink.c
@ -54,6 +54,7 @@ void appfilter_nl_handler(struct uloop_fd *u, unsigned int ev)
        .msg_iov = &iov,
        .msg_iovlen = 1,
    };
+    printf("%s %d \n", __func__, __LINE__);

    do
    {
@ -78,6 +79,8 @@ void appfilter_nl_handler(struct uloop_fd *u, unsigned int ev)
        printf("magic error %x\n", af_hdr->magic);
        return;
    }
+        printf("%s %d \n", __func__, __LINE__);
+
    if (af_hdr->len <= 0 || af_hdr->len >= MAX_OAF_NETLINK_MSG_LEN)
    {
        printf("data len error\n");
@ -91,6 +94,7 @@ void appfilter_nl_handler(struct uloop_fd *u, unsigned int ev)
        printf("parse json failed:%s", kdata);
        return;
    }
+    printf("%s %d \n", __func__, __LINE__);

    struct json_object *mac_obj = json_object_object_get(root, "mac");

@ -115,6 +119,7 @@ void appfilter_nl_handler(struct uloop_fd *u, unsigned int ev)
            return;
        }
    }
+    printf("%s %d \n", __func__, __LINE__);

    struct json_object *ip_obj = json_object_object_get(root, "ip");
    if (ip_obj)
@ -125,6 +130,8 @@ void appfilter_nl_handler(struct uloop_fd *u, unsigned int ev)
        json_object_put(root);
        return;
    }
+        printf("%s %d \n", __func__, __LINE__);
+
    for (i = 0; i < json_object_array_length(visit_array); i++)
    {
        struct json_object *visit_obj = json_object_array_get_idx(visit_array, i);
@ -165,6 +172,7 @@ void appfilter_nl_handler(struct uloop_fd *u, unsigned int ev)
            add_visit_info_node(&node->visit_htable[hash], visit_node);
        }
    }
+    printf("%s %d \n", __func__, __LINE__);

    json_object_put(root);
 }
--- a/open-app-filter/src/appfilter_ubus.c
+++ b/open-app-filter/src/appfilter_ubus.c
@ -35,12 +35,17 @@ THE SOFTWARE.
 #include <libubox/blobmsg.h>
 #include "appfilter_user.h"
 #include "appfilter_config.h"
+#include <uci.h>

 struct ubus_context *ubus_ctx = NULL;
 static struct blob_buf b;

 extern char *format_time(int timetamp);

+void reload_oaf_rule(){
+    system("/usr/bin/oaf_rule reload");
+}
+
 void get_hostname_by_mac(char *mac, char *hostname)
 {
    if (!mac || !hostname)
@ -481,6 +486,249 @@ handle_app_class_visit_time(struct ubus_context *ctx, struct ubus_object *obj,
    return 0;
 }

+
+static int parse_feature_cfg(struct json_object *class_list) {
+    FILE *file = fopen("/tmp/feature.cfg", "r");
+    if (!file) {
+        perror("Failed to open /tmp/feature.cfg");
+        return -1;
+    }
+
+    char line[256];
+    char app_buf[128];
+    struct json_object *current_class = NULL;
+    struct json_object *app_list = NULL;
+
+    while (fgets(line, sizeof(line), file)) {
+        // Remove newline character
+        line[strcspn(line, "\n")] = 0;
+
+        if (strncmp(line, "#class", 6) == 0) {
+            // New class definition
+            if (current_class) {
+                // Add the previous class to the class list
+                json_object_object_add(current_class, "app_list", app_list);
+                json_object_array_add(class_list, current_class);
+            }
+
+            // Parse class name
+            char *name = strtok(line + 7, " ");
+            char *class_name = NULL;
+            while (name != NULL) {
+                class_name = name;  // Keep updating class_name until the last token
+                name = strtok(NULL, " ");
+            }
+            current_class = json_object_new_object();
+            json_object_object_add(current_class, "name", json_object_new_string(class_name));
+            app_list = json_object_new_array();
+        } else if (current_class) {
+            // Parse app definition
+            char *p_end = strstr(line, ":");
+            if (!p_end) {
+                continue;
+            }
+            strncpy(app_buf, line, p_end - line);
+            app_buf[p_end - line] = '\0';
+            char *appid_str = strtok(app_buf, " ");
+            char *name = strtok(NULL, " ");
+            if (appid_str && name) {
+                char combined[256];
+                char icon_path[512];
+                snprintf(icon_path, sizeof(icon_path), "/www/luci-static/resources/app_icons/%s.png", appid_str);
+                int with_icon = access(icon_path, F_OK) == 0 ? 1 : 0; // 检查文件是否存在
+                snprintf(combined, sizeof(combined), "%s,%s,%d", appid_str, name, with_icon);
+                json_object_array_add(app_list, json_object_new_string(combined));
+            }
+        }
+    }
+
+    // Add the last class to the class list
+    if (current_class) {
+        json_object_object_add(current_class, "app_list", app_list);
+        json_object_array_add(class_list, current_class);
+    }
+
+    fclose(file);
+    return 0;
+}
+
+static int handle_get_class_list(struct ubus_context *ctx, struct ubus_object *obj,
+                                 struct ubus_request_data *req, const char *method,
+                                 struct blob_attr *msg) {
+    struct json_object *response = json_object_new_object();
+    struct json_object *class_list = json_object_new_array();
+
+    if (parse_feature_cfg(class_list) != 0) {
+        json_object_put(response);
+        return UBUS_STATUS_UNKNOWN_ERROR;
+    }
+
+    json_object_object_add(response, "class_list", class_list);
+
+    struct blob_buf b = {};
+    blob_buf_init(&b, 0);
+    blobmsg_add_object(&b, response);
+    ubus_send_reply(ctx, req, b.head);
+    blob_buf_free(&b);
+    json_object_put(response);
+
+    return 0;
+}
+
+static int handle_get_app_filter(struct ubus_context *ctx, struct ubus_object *obj,
+                                 struct ubus_request_data *req, const char *method,
+                                 struct blob_attr *msg) {
+    struct json_object *response = json_object_new_object();
+    struct json_object *app_list = json_object_new_array();
+    int i;
+    struct uci_context *uci_ctx = uci_alloc_context();
+    if (!uci_ctx) {
+        printf("Failed to allocate UCI context\n");
+        return 0;
+    }
+    char app_filter_str[1024] = {0};
+    app_filter_str[0] = '\0';
+    af_uci_get_list_value(uci_ctx, "appfilter.rule.app_list", app_filter_str, sizeof(app_filter_str), " ");
+    printf("app_filter_str: %s\n", app_filter_str);
+    char *app_id_str = strtok(app_filter_str, " ");
+    while (app_id_str) {
+        json_object_array_add(app_list, json_object_new_int(atoi(app_id_str)));
+        app_id_str = strtok(NULL, " ");
+    }
+    json_object_object_add(response, "app_list", app_list);
+    uci_free_context(uci_ctx);
+    struct blob_buf b = {};
+    blob_buf_init(&b, 0);
+    blobmsg_add_object(&b, response);
+    ubus_send_reply(ctx, req, b.head);
+    blob_buf_free(&b);
+    json_object_put(response);
+    return 0;
+}
+
+static int handle_set_app_filter(struct ubus_context *ctx, struct ubus_object *obj,
+                                 struct ubus_request_data *req, const char *method,
+                                 struct blob_attr *msg) {
+    printf("handle_set_app_filter\n");
+    struct json_object *response = json_object_new_object();
+    int i;
+    char *msg_obj_str = blobmsg_format_json(msg, true);
+    if (!msg_obj_str) {
+        printf("format json failed\n");
+        return 0;
+    }
+    printf("msg_obj_str: %s\n", msg_obj_str);
+    struct json_object *req_obj = json_tokener_parse(msg_obj_str);
+    struct json_object *app_list = json_object_object_get(req_obj, "app_list");
+    if (!app_list) {
+        printf("app_list is NULL\n");
+        return 0;
+    }
+    printf("app_list: %s\n", json_object_get_string(app_list));
+
+    // 新增代码：将 app_list_str 存储到 UCI 配置中
+    struct uci_context *uci_ctx = uci_alloc_context();
+    if (!uci_ctx) {
+        printf("Failed to allocate UCI context\n");
+        return 0;
+    }
+
+   af_uci_delete(uci_ctx, "appfilter.rule.app_list");
+
+   int len = json_object_array_length(app_list);
+    for (i = 0; i < json_object_array_length(app_list); i++) {
+        struct json_object *app_id_obj = json_object_array_get_idx(app_list, i);
+        af_uci_add_int_list(uci_ctx, "appfilter.rule.app_list", json_object_get_int(app_id_obj));
+    }
+    af_uci_commit(uci_ctx, "appfilter");
+    reload_oaf_rule();
+
+    uci_free_context(uci_ctx);
+    struct blob_buf b = {};
+    blob_buf_init(&b, 0);
+    blobmsg_add_object(&b, response);
+    ubus_send_reply(ctx, req, b.head);
+    blob_buf_free(&b);
+    json_object_put(response);
+    return 0;
+}
+
+
+
+
+static int handle_get_app_filter_base(struct ubus_context *ctx, struct ubus_object *obj,
+                                 struct ubus_request_data *req, const char *method,
+                                 struct blob_attr *msg) {
+    struct json_object *response = json_object_new_object();
+    struct json_object *data_obj = json_object_new_object();
+    int i;
+    struct uci_context *uci_ctx = uci_alloc_context();
+    if (!uci_ctx) {
+        printf("Failed to allocate UCI context\n");
+        return 0;
+    }
+    int enable = 0;
+    int work_mode = 0;
+    enable = uci_get_int_value(uci_ctx, "appfilter.global.enable");
+    work_mode = uci_get_int_value(uci_ctx, "appfilter.global.work_mode");
+
+    json_object_object_add(data_obj, "enable", json_object_new_int(enable));
+    json_object_object_add(data_obj, "work_mode", json_object_new_int(work_mode));
+
+
+    json_object_object_add(response, "data", data_obj);
+    uci_free_context(uci_ctx);
+    struct blob_buf b = {};
+    blob_buf_init(&b, 0);
+    blobmsg_add_object(&b, response);
+    ubus_send_reply(ctx, req, b.head);
+    blob_buf_free(&b);
+    json_object_put(response);
+    return 0;
+}
+
+static int handle_set_app_filter_base(struct ubus_context *ctx, struct ubus_object *obj,
+                                 struct ubus_request_data *req, const char *method,
+                                 struct blob_attr *msg) {
+    printf("handle_set_app_filter_base\n");
+    struct json_object *response = json_object_new_object();
+    int i;
+    char *msg_obj_str = blobmsg_format_json(msg, true);
+    if (!msg_obj_str) {
+        printf("format json failed\n");
+        return 0;
+    }
+    printf("msg_obj_str: %s\n", msg_obj_str);
+    struct json_object *req_obj = json_tokener_parse(msg_obj_str);
+    struct json_object *enable_obj = json_object_object_get(req_obj, "enable");
+    struct json_object *work_mode_obj = json_object_object_get(req_obj, "work_mode");
+    if (!enable_obj || !work_mode_obj) {
+        printf("enable_obj or work_mode_obj is NULL\n");
+        return 0;
+    }
+    printf("enable_obj: %d\n", json_object_get_int(enable_obj));
+    printf("work_mode_obj: %d\n", json_object_get_int(work_mode_obj));
+
+    struct uci_context *uci_ctx = uci_alloc_context();
+    if (!uci_ctx) {
+        printf("Failed to allocate UCI context\n");
+        return 0;
+    }
+
+    af_uci_set_int_value(uci_ctx, "appfilter.global.enable", json_object_get_int(enable_obj));
+    af_uci_set_int_value(uci_ctx, "appfilter.global.work_mode", json_object_get_int(work_mode_obj));
+    af_uci_commit(uci_ctx, "appfilter");
+    reload_oaf_rule();
+    uci_free_context(uci_ctx);
+    struct blob_buf b = {};
+    blob_buf_init(&b, 0);
+    blobmsg_add_object(&b, response);
+    ubus_send_reply(ctx, req, b.head);
+    blob_buf_free(&b);
+    json_object_put(response);
+    return 0;
+}
+
 static const struct blobmsg_policy empty_policy[1] = {
    //[DEV_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
 };
@ -490,6 +738,12 @@ static struct ubus_method appfilter_object_methods[] = {
    UBUS_METHOD("dev_visit_time", appfilter_handle_visit_time, empty_policy),
    UBUS_METHOD("app_class_visit_time", handle_app_class_visit_time, empty_policy),
    UBUS_METHOD("dev_list", appfilter_handle_dev_list, empty_policy),
+    UBUS_METHOD("class_list", handle_get_class_list, empty_policy),
+    UBUS_METHOD("set_app_filter", handle_set_app_filter, empty_policy),
+    UBUS_METHOD("get_app_filter", handle_get_app_filter, empty_policy),
+
+    UBUS_METHOD("set_app_filter_base", handle_set_app_filter_base, empty_policy),
+    UBUS_METHOD("get_app_filter_base", handle_get_app_filter_base, empty_policy),
 };

 static struct ubus_object_type main_object_type =
--- a/open-app-filter/src/appfilter_user.c
+++ b/open-app-filter/src/appfilter_user.c
@ -73,11 +73,13 @@ void init_dev_node_htable()
    {
        dev_hash_table[i] = NULL;
    }
+    printf("init dev node htable ok...\n");
 }

 dev_node_t *add_dev_node(char *mac)
 {
    unsigned int hash = 0;
+    printf("add dev node\n");
    if (g_cur_user_num >= MAX_SUPPORT_USER_NUM)
    {
        printf("error, user num reach max %d\n", g_cur_user_num);
@ -191,6 +193,7 @@ void clean_dev_online_status(void)
        dev_node_t *node = dev_hash_table[i];
        while (node)
        {
+
            if (node->online)
            {
                node->offline_time = get_timestamp();
@ -199,6 +202,7 @@ void clean_dev_online_status(void)
            node = node->next;
        }
    }
+
 }

 /*
@ -379,15 +383,18 @@ void dump_dev_list(void)
    int count = 0;
    char hostname_buf[MAX_HOSTNAME_SIZE] = {0};
    char ip_buf[MAX_IP_LEN] = {0};
+
    clean_dev_online_status();
+
    update_dev_hostname();
+
    update_dev_online_status();
+
    FILE *fp = fopen(OAF_DEV_LIST_FILE, "w");
    if (!fp)
    {
        return;
    }
-
    fprintf(fp, "%-4s %-20s %-20s %-32s %-8s\n", "Id", "Mac Addr", "Ip Addr", "Hostname", "Online");
    for (i = 0; i < MAX_DEV_NODE_HASH_SIZE; i++)
    {
@ -415,6 +422,7 @@ void dump_dev_list(void)
            node = node->next;
        }
    }
+    printf("%s %d \n", __func__, __LINE__);
    for (i = 0; i < MAX_DEV_NODE_HASH_SIZE; i++)
    {
        dev_node_t *node = dev_hash_table[i];
@ -440,6 +448,7 @@ void dump_dev_list(void)
            node = node->next;
        }
    }
+    printf("%s %d \n", __func__, __LINE__);
 EXIT:
    fclose(fp);
 }
--- a/open-app-filter/src/main.c
+++ b/open-app-filter/src/main.c
@ -127,16 +127,31 @@ void update_lan_ip(void){

 void dev_list_timeout_handler(struct uloop_timeout *t)
 {
+    static int count = 0;
+    count++;
+
+
+
+    printf("%s %d count2 = %d\n", __func__, __LINE__, count);
+
+
    dump_dev_list();
+        printf("%s %d count = %d\n", __func__, __LINE__, count);
+
    check_dev_visit_info_expire();
+        printf("%s %d count = %d\n", __func__, __LINE__, count);
+
    flush_expire_visit_info();
    //dump_dev_visit_list();
    update_lan_ip();
    check_appfilter_enable();
+        printf("%s %d count = %d\n", __func__, __LINE__, count);
+
    if (check_dev_expire()){
        flush_expire_visit_info();
        flush_dev_expire_node();
    }
+        printf("%s %d count = %d\n", __func__, __LINE__, count);
    uloop_timeout_set(t, 10000);
 }

@ -151,8 +166,9 @@ int main(int argc, char **argv)
 {
    int ret = 0;
    uloop_init();
-    printf("init appfilter\n");
+    printf("init appfilter2\n");
    init_dev_node_htable();
+
    init_app_name_table();
    init_app_class_name_table();
    if (appfilter_ubus_init() < 0)
--- a/v2ray-plugin/Makefile
+++ b/v2ray-plugin/Makefile
@ -22,7 +22,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 PKG_BUILD_FLAGS:=no-mips16

-GO_PKG:=github.com/shadowsocks/v2ray-plugin
+GO_PKG:=github.com/teddysun/v2ray-plugin
 GO_PKG_LDFLAGS_X:=main.VERSION=v$(PKG_VERSION)

 include $(INCLUDE_DIR)/package.mk