From 44124cad31f35bd16a771602b936d9acb3e8d672 Mon Sep 17 00:00:00 2001
From: lijia <lijia01@iie.ac.cn>
Date: Fri, 11 Sep 2020 12:09:03 +0800
Subject: 修复插件返回DROPPKT后, 后续插件还能获取到包的BUG.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dealpkt/callapp.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/dealpkt/callapp.c b/src/dealpkt/callapp.c
index cfee3a4..15314e7 100644
--- a/src/dealpkt/callapp.c
+++ b/src/dealpkt/callapp.c
@@ -442,10 +442,6 @@ int stream_process(struct streaminfo *a_stream,const void *this_iphdr, const voi
 #endif
 			}
 			local_app_ret = pFunInfo->appState;
-			if(pFunInfo->appState&APP_STATE_DROPPKT)	
-			{
-				ret=DROP;
-			}
 
 			if(!(pFunInfo->appState&APP_STATE_DROPME))
 			{
@@ -482,6 +478,12 @@ int stream_process(struct streaminfo *a_stream,const void *this_iphdr, const voi
 				/* �����pending�׶�, KILL FOLLOWֱ���˳�ѭ������ */
 				break;
 			}
+			
+			if(local_app_ret & APP_STATE_DROPPKT)	
+			{
+				ret=DROP;
+				break; //2020-09-10 lijia add, �������������
+			}			
 		}
 		
 		//����Ҫ�ٴ��������fun���������ͷ�
@@ -545,11 +547,6 @@ int stream_process(struct streaminfo *a_stream,const void *this_iphdr, const voi
 			}
 			local_app_ret = pFunInfo->appState;
 			
-			if(pFunInfo->appState&APP_STATE_DROPPKT)	
-			{
-				ret=DROP;			
-			}
-			
 			if(pFunInfo->appState&APP_STATE_DROPME)
 			{
 				if(pPrev==NULL)
@@ -609,6 +606,11 @@ int stream_process(struct streaminfo *a_stream,const void *this_iphdr, const voi
 			if(local_app_ret & (APP_STATE_KILL_FOLLOW | APP_STATE_KILL_OTHER)){
 				break;
 			}
+			if(local_app_ret&APP_STATE_DROPPKT)	
+			{
+				ret=DROP;	
+				break; //2020-09-10 lijia add, �������������
+			}			
 		}
 
 		//���������д�Ҷ�����Ҫ��
-- 
cgit v1.2.3