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

修改函数名,增加FS统计

Browse Source
This commit is contained in:
崔一鸣
2019-06-28 09:58:54 +06:00
parent 2851da1857
commit f138002d5b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
entry/src/kni_entry.cpp
View File

@@ -439,7 +439,7 @@ static void keepalive_replay_htable_del(struct pme_info *pmeinfo){
} }
} }
void stream_destroy(struct pme_info *pmeinfo){ static void stream_destroy(struct pme_info *pmeinfo){
//sendlog //sendlog
void *logger = g_kni_handle->local_logger; void *logger = g_kni_handle->local_logger;
int ret; int ret;
@@ -463,7 +463,7 @@ void stream_destroy(struct pme_info *pmeinfo){
pme_info_destroy(pmeinfo); pme_info_destroy(pmeinfo);
} }
static int judge_stream_destroy(struct pme_info *pmeinfo, int caller){ static int judge_stream_can_destroy(struct pme_info *pmeinfo, int caller){
void *logger = g_kni_handle->local_logger; void *logger = g_kni_handle->local_logger;
int can_destroy = 0; int can_destroy = 0;
if(pmeinfo != NULL){ if(pmeinfo != NULL){
@@ -480,7 +480,7 @@ static int judge_stream_destroy(struct pme_info *pmeinfo, int caller){
pthread_mutex_unlock(&(pmeinfo->lock)); pthread_mutex_unlock(&(pmeinfo->lock));
} }
else{ else{
KNI_LOG_ERROR(logger, "Failed at judge_stream_destroy, pmeinfo is null"); KNI_LOG_ERROR(logger, "Failed at judge_stream_can_destroy, pmeinfo is null");
} }
return can_destroy; return can_destroy;
} }
@@ -1112,7 +1112,7 @@ extern "C" char kni_tcpall_entry(const struct streaminfo *stream, void** pme, in
} }
//sapp release: bypass or intercept //sapp release: bypass or intercept
if((ret & APP_STATE_DROPME)){ if((ret & APP_STATE_DROPME)){
can_destroy = judge_stream_destroy(pmeinfo, CALLER_SAPP); can_destroy = judge_stream_can_destroy(pmeinfo, CALLER_SAPP);
if(can_destroy == 1){ if(can_destroy == 1){
traceid2pme_htable_del(pmeinfo); traceid2pme_htable_del(pmeinfo);
stream_destroy(pmeinfo); stream_destroy(pmeinfo);
@@ -1430,7 +1430,7 @@ static long traceid2pme_htable_search_cb(void *data, const uchar *key, uint size
wrapped_kni_cmsg_get(pmeinfo, cmsg, TFE_CMSG_SSL_ERROR, sizeof(pmeinfo->ssl_error), logger); wrapped_kni_cmsg_get(pmeinfo, cmsg, TFE_CMSG_SSL_ERROR, sizeof(pmeinfo->ssl_error), logger);
clock_gettime(CLOCK_REALTIME, &(pmeinfo->end_time)); clock_gettime(CLOCK_REALTIME, &(pmeinfo->end_time));
KNI_LOG_DEBUG(logger, "recv cmsg from tfe, stream traceid is %s", pmeinfo->stream_traceid); KNI_LOG_DEBUG(logger, "recv cmsg from tfe, stream traceid is %s", pmeinfo->stream_traceid);
can_destroy = judge_stream_destroy(pmeinfo, CALLER_TFE); can_destroy = judge_stream_can_destroy(pmeinfo, CALLER_TFE);
if(can_destroy == 1){ if(can_destroy == 1){
traceid2pme_htable_del(pmeinfo); traceid2pme_htable_del(pmeinfo);
stream_destroy(pmeinfo); stream_destroy(pmeinfo);
@@ -1761,8 +1761,9 @@ static int traceid2pme_htable_expire_notify_cb(void *data, int eliminate_type){
struct pme_info *pmeinfo = (struct pme_info*)data; struct pme_info *pmeinfo = (struct pme_info*)data;
int can_destroy; int can_destroy;
if(pmeinfo->sapp_release == 1){ if(pmeinfo->sapp_release == 1){
can_destroy = judge_stream_destroy(pmeinfo, CALLER_TFE); can_destroy = judge_stream_can_destroy(pmeinfo, CALLER_TFE);
if(can_destroy == 1){ if(can_destroy == 1){
FS_operate(g_kni_fs_handle->handle, g_kni_fs_handle->fields[KNI_FIELD_ID2PME_DEL_SUCC], 0, FS_OP_ADD, 1);
stream_destroy(pmeinfo); stream_destroy(pmeinfo);
return 1; return 1;
} }