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

支持平台提供的APP_STATE_KILL_OTHER

Browse Source 
修复BUG，天剑流标签时未对协议进行赋值，导致tfe颁发证书失败
This commit is contained in:
liuxueli
2019-11-20 14:45:41 +08:00
parent 7912ec54b2
commit 28da97b53b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tsg_entry.cpp
View File

@@ -14,7 +14,7 @@
char TSG_MASTER_VERSION_20191119=0; char TSG_MASTER_VERSION_20191120=0;
const char *tsg_conffile="tsgconf/main.conf"; const char *tsg_conffile="tsgconf/main.conf";
g_tsg_para_t g_tsg_para; g_tsg_para_t g_tsg_para;
@@ -182,14 +182,14 @@ extern "C" char TSG_MASTER_TCPALL_ENTRY(struct streaminfo *a_tcp, void **pme, in
if(ip_policy==1) if(ip_policy==1)
{ {
MESA_kill_tcp(a_tcp, a_packet); MESA_kill_tcp(a_tcp, a_packet);
state|=APP_STATE_DROPPKT; state|=APP_STATE_DROPPKT|APP_STATE_KILL_OTHER;
} }
break; break;
case TSG_ACTION_MONITOR: case TSG_ACTION_MONITOR:
break; break;
case TSG_ACTION_BYPASS: case TSG_ACTION_BYPASS:
send_log=1; send_log=1;
state|=APP_STATE_DROPPKT; //TODO state|=APP_STATE_KILL_OTHER; //TODO
FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_BYPASS], 0, FS_OP_ADD, 1); FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_BYPASS], 0, FS_OP_ADD, 1);
break; break;
case TSG_ACTION_INTERCEPT: case TSG_ACTION_INTERCEPT:
@@ -199,6 +199,7 @@ extern "C" char TSG_MASTER_TCPALL_ENTRY(struct streaminfo *a_tcp, void **pme, in
priority_label->result_num=1; priority_label->result_num=1;
priority_label->result_type=PULL_KNI_RESULT; priority_label->result_type=PULL_KNI_RESULT;
priority_label->proto=identify_info.proto;
priority_label->domain_len=identify_info.domain_len; priority_label->domain_len=identify_info.domain_len;
memcpy(priority_label->domain, identify_info.domain, identify_info.domain_len); memcpy(priority_label->domain, identify_info.domain, identify_info.domain_len);
memcpy(priority_label->result, p_result, sizeof(struct Maat_rule_t)); memcpy(priority_label->result, p_result, sizeof(struct Maat_rule_t));