🚀 Sync 2026-10-28 01:43:31

This commit is contained in:
github-actions[bot] committed 2026-10-28 01:43:31 +08:00
1 parent e646593c56
commit d42296f292
162 files changed
+356 -233

No files matched your search

+2 -2
View File
@@ -2,8 +2,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=appfilter
PKG_VERSION:=7.0.1
PKG_RELEASE:=4
PKG_VERSION:=7.0.2
PKG_RELEASE:=5
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
-9
View File
@@ -44,7 +44,6 @@
#include <libubox/list.h>
extern fwx_status_t g_fwx_status;
extern void reload_oaf_rule(void);
static int ensure_feature_data_loaded(void)
{
@@ -117,10 +116,6 @@ void ubus_response_json(struct ubus_context *ctx, struct ubus_request_data *req,
blob_buf_free(&b_buf);
}
void reload_oaf_rule(){
system("/usr/bin/oaf_rule reload");
}
void get_hostname_by_mac(char *mac, char *hostname)
{
if (!mac || !hostname)
@@ -2766,7 +2761,6 @@ struct json_object *fwx_api_set_nickname(struct json_object *req_obj) {
}
fwx_uci_commit(uci_ctx, "user_info");
reload_oaf_rule();
uci_free_context(uci_ctx);
return fwx_gen_api_response_data(API_CODE_SUCCESS, NULL);
@@ -4271,7 +4265,6 @@ static int handle_set_nickname(struct ubus_context *ctx, struct ubus_object *obj
fwx_uci_commit(uci_ctx, "user_info");
reload_oaf_rule();
uci_free_context(uci_ctx);
struct blob_buf b = {};
@@ -4358,7 +4351,6 @@ static int handle_add_whitelist_user(struct ubus_context *ctx, struct ubus_objec
fwx_uci_set_value(uci_ctx, "appfilter.@whitelist[-1].mac", (char *)json_object_get_string(mac_obj));
}
fwx_uci_commit(uci_ctx, "appfilter");
reload_oaf_rule();
uci_free_context(uci_ctx);
struct blob_buf b = {};
@@ -4407,7 +4399,6 @@ static int handle_del_whitelist_user(struct ubus_context *ctx, struct ubus_objec
}
fwx_uci_commit(uci_ctx, "appfilter");
reload_oaf_rule();
uci_free_context(uci_ctx);
struct blob_buf b = {};
+3 -3
View File
@@ -32,8 +32,8 @@ int current_log_level = LOG_LEVEL_WARN;
//int current_log_level = LOG_LEVEL_INFO;
int g_fwxd_debug_mode = 0;
#define CMD_GET_LAN_IP_FMT "ifconfig %s | grep 'inet addr' | awk '{print $2}' | awk -F: '{print $2}'"
#define CMD_GET_LAN_MASK_FMT "ifconfig %s | grep 'inet addr' | awk '{print $4}' | awk -F: '{print $2}'"
#define CMD_GET_LAN_IP_FMT "ifconfig %s 2>/dev/null | grep 'inet addr' | awk '{print $2}' | awk -F: '{print $2}'"
#define CMD_GET_LAN_MASK_FMT "ifconfig %s 2>/dev/null | grep 'inet addr' | awk '{print $4}' | awk -F: '{print $2}'"
#define CLIENT_BACKUP_SYNC_INTERVAL_SEC 600
int g_fwx_config_chage = 1;
int g_hnat_init = 0;
@@ -294,7 +294,7 @@ void update_lan_ip(void){
if (!ctx)
return;
int ret = fwx_uci_get_value(ctx, "appfilter.global.lan_ifname", lan_ifname, sizeof(lan_ifname) - 1);
int ret = fwx_uci_get_value(ctx, "fwx.global.lan_ifname", lan_ifname, sizeof(lan_ifname) - 1);
if (ret != 0){
strcpy(lan_ifname, "br-lan");
}