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

TSG-6937: 单链接多次扫描多命中拦截策略时，保存结果到流标签时导致内存泄漏

Browse Source
This commit is contained in:
liuxueli
2021-07-07 18:13:09 +08:00
parent d1a5729ce1
commit 0421c297d8
1 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/tsg_entry.cpp
View File

@@ -471,7 +471,24 @@ static void copy_intercept_result(const struct streaminfo *a_stream, struct mast
int ret=0; int ret=0;
policy_priority_label_t *priority_label=NULL; policy_priority_label_t *priority_label=NULL;
priority_label=(policy_priority_label_t *)dictator_malloc(thread_seq, sizeof(policy_priority_label_t)); priority_label=(policy_priority_label_t *)project_req_get_struct((struct streaminfo *)a_stream, g_tsg_para.priority_project_id);
if(priority_label==NULL)
{
priority_label=(policy_priority_label_t *)dictator_malloc(thread_seq, sizeof(policy_priority_label_t));
}
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_FATAL,
"DUP_HIT_INTERCEPT",
"Hit intercept policy, domain: %s policy_id: %d action: %d addr: %s",
(domain!=NULL ? domain : ""),
p_result->config_id,
(unsigned char)p_result->action,
PRINTADDR(a_stream, g_tsg_para.level)
);
}
memset(priority_label, 0, sizeof(policy_priority_label_t)); memset(priority_label, 0, sizeof(policy_priority_label_t));
priority_label->proto=proto; priority_label->proto=proto;
@@ -490,23 +507,25 @@ static void copy_intercept_result(const struct streaminfo *a_stream, struct mast
{ {
free_policy_label(thread_seq, (void *)priority_label); free_policy_label(thread_seq, (void *)priority_label);
MESA_handle_runtime_log(g_tsg_para.logger, MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_FATAL, RLOG_LV_FATAL,
"PROJECT_ADD", "PROJECT_ADD",
"Add policy_priority_label failed, intercept policy, policy_id: %d action: %d addr: %s", "Add policy_priority_label failed, intercept policy, domain: %s policy_id: %d action: %d addr: %s",
priority_label->result[0].config_id, (domain!=NULL ? domain : ""),
(unsigned char)priority_label->result[0].action, priority_label->result[0].config_id,
PRINTADDR(a_stream, g_tsg_para.level) (unsigned char)priority_label->result[0].action,
); PRINTADDR(a_stream, g_tsg_para.level)
} );
}
MESA_handle_runtime_log(g_tsg_para.logger, MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG, RLOG_LV_DEBUG,
"INTERCEPT", "INTERCEPT",
"Hit intercept policy, policy_id: %d action: %d addr: %s", "Hit intercept policy, domain: %s policy_id: %d action: %d addr: %s",
priority_label->result[0].config_id, (domain!=NULL ? domain : ""),
(unsigned char)priority_label->result[0].action, priority_label->result[0].config_id,
PRINTADDR(a_stream, g_tsg_para.level) (unsigned char)priority_label->result[0].action,
); PRINTADDR(a_stream, g_tsg_para.level)
);
return ; return ;
} }
@@ -527,14 +546,14 @@ static void copy_deny_result(const struct streaminfo *a_stream, struct master_co
} }
MESA_handle_runtime_log(g_tsg_para.logger, MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG, RLOG_LV_DEBUG,
"DENY", "DENY",
"Hit deny policy, policy_id: %d service: %d action: %d addr: %s", "Hit deny policy, policy_id: %d service: %d action: %d addr: %s",
p_result[0].config_id, p_result[0].config_id,
p_result[0].service_id, p_result[0].service_id,
(unsigned char)p_result[0].action, (unsigned char)p_result[0].action,
PRINTADDR(a_stream, g_tsg_para.level) PRINTADDR(a_stream, g_tsg_para.level)
); );
return ; return ;
} }
@@ -566,14 +585,14 @@ static void copy_bypass_result(const struct streaminfo *a_stream, struct master_
} }
MESA_handle_runtime_log(g_tsg_para.logger, MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG, RLOG_LV_DEBUG,
"ALLOW", "ALLOW",
"Hit allow policy, policy_id: %d service: %d action: %d addr: %s", "Hit allow policy, policy_id: %d service: %d action: %d addr: %s",
p_result[0].config_id, p_result[0].config_id,
p_result[0].service_id, p_result[0].service_id,
(unsigned char)p_result[0].action, (unsigned char)p_result[0].action,
PRINTADDR(a_stream, g_tsg_para.level) PRINTADDR(a_stream, g_tsg_para.level)
); );
return ; return ;
} }
@@ -616,14 +635,14 @@ static unsigned char deal_deny_action(const struct streaminfo *a_stream, struct
if(ret<0) if(ret<0)
{ {
MESA_handle_runtime_log(g_tsg_para.logger, MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_FATAL, RLOG_LV_FATAL,
"RST_TCP", "RST_TCP",
"Send RST failed policy_id: %d service: %d action: %d addr: %s", "Send RST failed policy_id: %d service: %d action: %d addr: %s",
p_result->config_id, p_result->config_id,
p_result->service_id, p_result->service_id,
(unsigned char)p_result->action, (unsigned char)p_result->action,
PRINTADDR(a_stream, g_tsg_para.level) PRINTADDR(a_stream, g_tsg_para.level)
); );
} }
opt_value=1; opt_value=1;