From 28da97b53b7777a3a024a0df191fe3239c0e981a Mon Sep 17 00:00:00 2001 From: liuxueli Date: Wed, 20 Nov 2019 14:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B9=B3=E5=8F=B0=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E7=9A=84APP=5FSTATE=5FKILL=5FOTHER=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DBUG=EF=BC=8C=E5=A4=A9=E5=89=91=E6=B5=81=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=97=B6=E6=9C=AA=E5=AF=B9=E5=8D=8F=E8=AE=AE=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E8=B5=8B=E5=80=BC=EF=BC=8C=E5=AF=BC=E8=87=B4tfe?= =?UTF-8?q?=E9=A2=81=E5=8F=91=E8=AF=81=E4=B9=A6=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tsg_entry.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tsg_entry.cpp b/src/tsg_entry.cpp index 174693d..b985fd5 100644 --- a/src/tsg_entry.cpp +++ b/src/tsg_entry.cpp @@ -14,7 +14,7 @@ -char TSG_MASTER_VERSION_20191119=0; +char TSG_MASTER_VERSION_20191120=0; const char *tsg_conffile="tsgconf/main.conf"; 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) { MESA_kill_tcp(a_tcp, a_packet); - state|=APP_STATE_DROPPKT; + state|=APP_STATE_DROPPKT|APP_STATE_KILL_OTHER; } break; case TSG_ACTION_MONITOR: break; case TSG_ACTION_BYPASS: 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); break; 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_type=PULL_KNI_RESULT; + priority_label->proto=identify_info.proto; priority_label->domain_len=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));