diff options
| author | liuxueli <[email protected]> | 2021-03-09 18:29:52 +0800 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2021-03-09 18:29:52 +0800 |
| commit | 905832ec24ea78c348e5e5fcb49fb7e048d4d589 (patch) | |
| tree | c8942149adfff9f11f97c5cf419c3240fb033eb7 | |
| parent | b32977ca7039395e0aad22aa4fc0a8fc5a395a2e (diff) | |
| parent | f80520dd981cc89d280cb735958f50416a6b5562 (diff) | |
Merge branch 'master' of https://git.mesalab.cn/tango/tsg_master
| -rw-r--r-- | src/tsg_entry.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/tsg_entry.cpp b/src/tsg_entry.cpp index a546dfd..5c54462 100644 --- a/src/tsg_entry.cpp +++ b/src/tsg_entry.cpp @@ -1091,13 +1091,6 @@ extern "C" char TSG_MASTER_TCP_ENTRY(struct streaminfo *a_tcp, void **pme, int t FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_TCP_LINKS], 0, FS_OP_ADD, 1); set_session_attribute_label(a_tcp, TSG_ATTRIBUTE_TYPE_ESTABLISH_LATECY, NULL, thread_seq); - ret=tsg_scan_nesting_addr(g_tsg_maat_feather, a_tcp, identify_info.proto, &context->mid, result+hit_num, MAX_RESULT_NUM-hit_num); - if(ret>0) - { - hit_num+=ret; - FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_HIT_ADDR], 0, FS_OP_ADD, 1); - } - memset(&identify_info, 0, sizeof(identify_info)); ret=identify_application_protocol(a_tcp, &identify_info, a_packet); if(ret==1) @@ -1112,6 +1105,13 @@ extern "C" char TSG_MASTER_TCP_ENTRY(struct streaminfo *a_tcp, void **pme, int t hit_num+=tsg_scan_shared_policy(g_tsg_maat_feather, a_tcp, &identify_info, result+hit_num, MAX_RESULT_NUM-hit_num, &context->mid, thread_seq); } + + ret=tsg_scan_nesting_addr(g_tsg_maat_feather, a_tcp, identify_info.proto, &context->mid, result+hit_num, MAX_RESULT_NUM-hit_num); + if(ret>0) + { + hit_num+=ret; + FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_HIT_ADDR], 0, FS_OP_ADD, 1); + } break; default: break; @@ -1234,12 +1234,6 @@ extern "C" char TSG_MASTER_UDP_ENTRY(struct streaminfo *a_udp, void **pme, int t { case OP_STATE_PENDING: FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_UDP_LINKS], 0, FS_OP_ADD, 1); - ret=tsg_scan_nesting_addr(g_tsg_maat_feather, a_udp, identify_info.proto, &context->mid, result, MAX_RESULT_NUM); - if(ret>0) - { - hit_num+=ret; - FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_HIT_ADDR], 0, FS_OP_ADD, 1); - } memset(&identify_info, 0, sizeof(identify_info)); ret=identify_application_protocol(a_udp, &identify_info, a_packet); @@ -1250,6 +1244,13 @@ extern "C" char TSG_MASTER_UDP_ENTRY(struct streaminfo *a_udp, void **pme, int t hit_num+=tsg_scan_shared_policy(g_tsg_maat_feather, a_udp, &identify_info, result+hit_num, MAX_RESULT_NUM-hit_num, &context->mid, thread_seq); } + + ret=tsg_scan_nesting_addr(g_tsg_maat_feather, a_udp, identify_info.proto, &context->mid, result, MAX_RESULT_NUM); + if(ret>0) + { + hit_num+=ret; + FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_HIT_ADDR], 0, FS_OP_ADD, 1); + } break; default: break; |