gfwleak/tango-kni
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复默认拦截策略不发送日志的bug，修复明文http协议被拦截后intercept state为0的bug。

Browse Source
This commit is contained in:
zhengchao
2019-06-19 22:35:42 +08:00
parent 696594ea83
commit 80a86aa90d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
entry/src/kni_entry.cpp
View File

@@ -991,8 +991,10 @@ static char data_opstate(const struct streaminfo *stream, struct pme_info *pmein
case KNI_ACTION_BYPASS: case KNI_ACTION_BYPASS:
FS_operate(g_kni_fs_handle->handle, g_kni_fs_handle->fields[KNI_FIELD_POLICY_BYP], 0, FS_OP_ADD, 1); FS_operate(g_kni_fs_handle->handle, g_kni_fs_handle->fields[KNI_FIELD_POLICY_BYP], 0, FS_OP_ADD, 1);
FS_operate(g_kni_fs_handle->handle, g_kni_fs_handle->fields[KNI_FIELD_BYP_STM], 0, FS_OP_ADD, 1); FS_operate(g_kni_fs_handle->handle, g_kni_fs_handle->fields[KNI_FIELD_BYP_STM], 0, FS_OP_ADD, 1);
pmeinfo->intercept_state=0;
return APP_STATE_FAWPKT | APP_STATE_GIVEME; return APP_STATE_FAWPKT | APP_STATE_GIVEME;
case KNI_ACTION_INTERCEPT: case KNI_ACTION_INTERCEPT:
pmeinfo->intercept_state=1;
return first_data_intercept(stream, pmeinfo, &pktinfo, stream_addr, thread_seq); return first_data_intercept(stream, pmeinfo, &pktinfo, stream_addr, thread_seq);
default: default:
//action != intercept && action != bypass，bypass and dropme //action != intercept && action != bypass，bypass and dropme

5
entry/src/kni_maat.cpp
View File

@@ -10,7 +10,7 @@ extern int g_iThreadNum;
*/ */
enum kni_action g_maat_default_action; enum kni_action g_maat_default_action;
int g_maat_default_log_option=1;
struct kni_maat_handle{ struct kni_maat_handle{
Maat_feather_t feather; Maat_feather_t feather;
int tableid_intercept_ip; int tableid_intercept_ip;
@@ -45,6 +45,7 @@ void compile_ex_param_new(int idx, const struct Maat_rule_t* rule, const char* s
g_maat_default_action = KNI_ACTION_BYPASS; g_maat_default_action = KNI_ACTION_BYPASS;
KNI_LOG_INFO(logger, "Set default intercept action to bypass."); KNI_LOG_INFO(logger, "Set default intercept action to bypass.");
} }
g_maat_default_log_option=rule->do_log;
} }
return; return;
} }
@@ -242,6 +243,8 @@ enum kni_action intercept_policy_scan(struct kni_maat_handle* handle, struct ipa
} }
else else
{ {
*policy_id=0;
*do_log=g_maat_default_log_option;
return g_maat_default_action; return g_maat_default_action;
} }
} }