givestate和offload为两种互不影响的逻辑，当插件返回givestate后后续数据包不再调用(CLOSE状态等链接结束调用)

2 files changed, 16 insertions, 16 deletions

diff --git a/module_test/src/gtest_sapp_tcp.cpp b/module_test/src/gtest_sapp_tcp.cpp
index 872786f..0cc92ff 100644
--- a/module_test/src/gtest_sapp_tcp.cpp
+++ b/module_test/src/gtest_sapp_tcp.cpp
@@ -822,7 +822,7 @@ void tcpall_offload_givestate_and_giveme_entry_run(void)
 void tcp_offload_givestate_entry_run(void)
 {
 	set_default_config();
-	update_plugin_inf("TCP_ALL", "tcp_offload_1st_givestate_entry");
+	update_plugin_inf("TCP", "tcp_offload_1st_givestate_entry");
 
 	set_pcap_dumpfile("tcp/tcp_simple.pcap");
 	ASSERT_EQ(file_md5_checksum("dumpfile", "df138740a6a22ca9c977052f21f7a470"),0);
@@ -833,8 +833,8 @@ void tcp_offload_givestate_entry_run(void)
 void tcp_offload_givestate_and_giveme_entry_run(void)
 {
 	set_default_config();
-	update_plugin_inf("TCP_ALL", "tcp_offload_1st_givestate_entry");
-	update_plugin_inf("TCP_ALL", "tcp_offload_2st_giveme_entry");
+	update_plugin_inf("TCP", "tcp_offload_1st_givestate_entry");
+	update_plugin_inf("TCP", "tcp_offload_2st_giveme_entry");
 	
 	set_pcap_dumpfile("tcp/tcp_simple.pcap");
 	ASSERT_EQ(file_md5_checksum("dumpfile", "df138740a6a22ca9c977052f21f7a470"),0);
diff --git a/module_test/src/gtest_sapp_tcp_plug.cpp b/module_test/src/gtest_sapp_tcp_plug.cpp
index 8e46f28..57b9590 100644
--- a/module_test/src/gtest_sapp_tcp_plug.cpp
+++ b/module_test/src/gtest_sapp_tcp_plug.cpp
@@ -2257,10 +2257,10 @@ extern "C" char tcpall_offload_1st_givestate_entry(struct streaminfo *pstream,vo
 
 	if(pstream->pktstate == OP_STATE_CLOSE)
 	{
-		if((2 == gtest_tcpall_offload_stat1.C2S_all_pkt)
+		if((1 == gtest_tcpall_offload_stat1.C2S_all_pkt)
 		 &&(0 == gtest_tcpall_offload_stat1.C2S_all_byte)
-		 &&(2 == gtest_tcpall_offload_stat1.S2C_all_pkt)
-		 &&(21 == gtest_tcpall_offload_stat1.S2C_all_byte))
+		 &&(0 == gtest_tcpall_offload_stat1.S2C_all_pkt)
+		 &&(0 == gtest_tcpall_offload_stat1.S2C_all_byte))
 		{
 		 	if((37 == pdetail->clientpktnum)
 			 &&(11345 == pdetail->clientbytes)
@@ -2380,21 +2380,21 @@ extern "C" char tcp_offload_1st_givestate_entry(struct streaminfo *pstream,void
 {
 	struct tcpdetail *pdetail=(struct tcpdetail *)pstream->pdetail;
 
-	if(OP_STATE_PENDING == pstream->pktstate){
+	if(OP_STATE_PENDING == pstream->opstate){
 		/* pending״̬���ü��� */
 		memset(&gtest_tcp_offload_stat1, 0, sizeof(gtest_tcp_offload_stat1));	
 	}
 
-	if(pstream->pktstate == OP_STATE_CLOSE)
+	if(pstream->opstate == OP_STATE_CLOSE)
 	{
-		if((2 == gtest_tcp_offload_stat1.C2S_all_pkt)
+		if((0 == gtest_tcp_offload_stat1.C2S_all_pkt)
 		 &&(0 == gtest_tcp_offload_stat1.C2S_all_byte)
-		 &&(2 == gtest_tcp_offload_stat1.S2C_all_pkt)
+		 &&(1 == gtest_tcp_offload_stat1.S2C_all_pkt)
 		 &&(21 == gtest_tcp_offload_stat1.S2C_all_byte))
 		{
 		 	if((37 == pdetail->clientpktnum)
 			 &&(11345 == pdetail->clientbytes)
-			 &&(31 == pdetail->serverpktnum)
+			 &&(30 == pdetail->serverpktnum)
 			 &&(2329 == pdetail->serverbytes))
 			{
 		 		SAPP_PLUG_LOG(RLOG_LV_INFO, "tcpall.offload", "\033[32m tcpall_simple() test succ!\033[0m\n");
@@ -2444,21 +2444,21 @@ extern "C" char tcp_offload_2st_giveme_entry(struct streaminfo *pstream,void **p
 {
 	struct tcpdetail *pdetail=(struct tcpdetail *)pstream->pdetail;
 
-	if(OP_STATE_PENDING == pstream->pktstate){
+	if(OP_STATE_PENDING == pstream->opstate){
 		/* pending״̬���ü��� */
 		memset(&gtest_tcp_offload_stat2, 0, sizeof(gtest_tcp_offload_stat2));	
 	}
 
-	if(pstream->pktstate == OP_STATE_CLOSE)
+	if(pstream->opstate == OP_STATE_CLOSE)
 	{
-		if((31 == gtest_tcp_offload_stat2.C2S_all_pkt)
+		if((16 == gtest_tcp_offload_stat2.C2S_all_pkt)
 		 &&(2329 == gtest_tcp_offload_stat2.C2S_all_byte)
-		 &&(37 == gtest_tcp_offload_stat2.S2C_all_pkt)
+		 &&(30 == gtest_tcp_offload_stat2.S2C_all_pkt)
 		 &&(11345 == gtest_tcp_offload_stat2.S2C_all_byte))
 		{
 		 	if((37 == pdetail->clientpktnum)
 			 &&(11345 == pdetail->clientbytes)
-			 &&(31 == pdetail->serverpktnum)
+			 &&(30 == pdetail->serverpktnum)
 			 &&(2329 == pdetail->serverbytes))
 			{
 		 		SAPP_PLUG_LOG(RLOG_LV_INFO, "tcpall.offload", "\033[32m tcpall_simple() test succ!\033[0m\n");