From 2f89ea589a2b4ceab3822af5af89b2563de01165 Mon Sep 17 00:00:00 2001 From: yangwei Date: Tue, 13 Aug 2024 17:35:02 +0800 Subject: [PATCH] Revert "fix: After the plugin manager triggers multiple TCP stream messages, if HTTP decode triggers a message on each TCP stream, it will cause logic confusion" This reverts commit bdb520452a2e9e43f578e94c6d4a4149676fc4b0. --- src/plugin/plugin_manager.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plugin/plugin_manager.cpp b/src/plugin/plugin_manager.cpp index c14aab0..85728b0 100644 --- a/src/plugin/plugin_manager.cpp +++ b/src/plugin/plugin_manager.cpp @@ -1037,7 +1037,7 @@ void plugin_manager_on_session_ingress(struct session *sess, struct packet *pkt) { case SESSION_TYPE_TCP: session_mq_publish_message_with_priority(sess, plug_mgr_rt->plug_mgr->tcp_topic_id ,(void *)pkt, STELLAR_MQ_PRIORITY_HIGH); - if ((seg = session_get_tcp_segment(sess)) != NULL) + while ((seg = session_get_tcp_segment(sess)) != NULL) { session_mq_publish_message_with_priority(sess, plug_mgr_rt->plug_mgr->tcp_stream_topic_id, (void *)seg, STELLAR_MQ_PRIORITY_HIGH); } @@ -1053,15 +1053,11 @@ void plugin_manager_on_session_ingress(struct session *sess, struct packet *pkt) //TODO: check TCP topic active subscirber num, if 0, return disable assembler state, to reduce tcp reassemble overhead int tid=stellar_get_current_thread_index(); stellar_mq_dispatch(plug_mgr_rt->plug_mgr->per_thread_data[tid].priority_mq, &plug_mgr_rt->plug_mgr->per_thread_data[tid].dealth_letter_queue, sess, pkt); - - while ((seg = session_get_tcp_segment(sess)) != NULL) - { - session_mq_publish_message_with_priority(sess, plug_mgr_rt->plug_mgr->tcp_stream_topic_id, (void *)seg, STELLAR_MQ_PRIORITY_HIGH); - stellar_mq_dispatch(plug_mgr_rt->plug_mgr->per_thread_data[tid].priority_mq, &plug_mgr_rt->plug_mgr->per_thread_data[tid].dealth_letter_queue, sess, pkt); - } plugin_manager_scratch_session_set(NULL); - return; + + + return; } void plugin_manager_on_session_egress(struct session *sess, struct packet *pkt)