🐞 fix(checkstreamorder_for_gtp_tunnel): 解决未判断v6地址的bugv4.2.82

1 files changed, 51 insertions, 13 deletions

diff --git a/src/dealpkt/stream_manage.c b/src/dealpkt/stream_manage.c
index 6960caa..78ed229 100644
--- a/src/dealpkt/stream_manage.c
+++ b/src/dealpkt/stream_manage.c
@@ -1383,19 +1383,57 @@ static int checkstreamorder_for_gtp_tunnel(const struct streaminfo_private *top_
 	/* ���ip��ַ��仯, ���ĸ�ip�����ܶ���һ��, �����ⷽ���ַ��ͬ, ������Ϊ������ͬһ��GTP����
 		TODO, �˴���ҪͬGTP-C���� ??
 	*/
-	if(pheap_stream->addr.tuple4_v4->saddr == pstack_stream->addr.tuple4_v4->saddr){
-		this_layer_is_same = 1;
-		cur_pkt_dir = DIR_C2S;
-	}else if(pheap_stream->addr.tuple4_v4->daddr == pstack_stream->addr.tuple4_v4->daddr){
-		this_layer_is_same = 1;
-		cur_pkt_dir = DIR_C2S;
-	}else if(pheap_stream->addr.tuple4_v4->saddr == pstack_stream->addr.tuple4_v4->daddr){
-		this_layer_is_same = 1;
-		cur_pkt_dir = DIR_S2C;
-	}else if(pheap_stream->addr.tuple4_v4->daddr == pstack_stream->addr.tuple4_v4->saddr){
-		this_layer_is_same = 1;
-		cur_pkt_dir = DIR_S2C;
-	}	
+	if (pheap_stream->addr.addrtype == ADDR_TYPE_IPV4)
+	{
+		if (pheap_stream->addr.tuple4_v4->saddr == pstack_stream->addr.tuple4_v4->saddr)
+		{
+			this_layer_is_same = 1;
+			cur_pkt_dir = DIR_C2S;
+		}
+		else if (pheap_stream->addr.tuple4_v4->daddr == pstack_stream->addr.tuple4_v4->daddr)
+		{
+			this_layer_is_same = 1;
+			cur_pkt_dir = DIR_C2S;
+		}
+		else if (pheap_stream->addr.tuple4_v4->saddr == pstack_stream->addr.tuple4_v4->daddr)
+		{
+			this_layer_is_same = 1;
+			cur_pkt_dir = DIR_S2C;
+		}
+		else if (pheap_stream->addr.tuple4_v4->daddr == pstack_stream->addr.tuple4_v4->saddr)
+		{
+			this_layer_is_same = 1;
+			cur_pkt_dir = DIR_S2C;
+		}
+	}
+	else if(pheap_stream->addr.addrtype == ADDR_TYPE_IPV6)
+	{
+		if (0 == memcmp(pheap_stream->addr.tuple4_v6->saddr,pstack_stream->addr.tuple4_v6->saddr, IPV6_ADDR_LEN))
+		{
+			this_layer_is_same = 1;
+			cur_pkt_dir = DIR_C2S;
+		}
+		else if (0 == memcmp(pheap_stream->addr.tuple4_v6->daddr,pstack_stream->addr.tuple4_v6->daddr, IPV6_ADDR_LEN))
+		{
+			this_layer_is_same = 1;
+			cur_pkt_dir = DIR_C2S;
+		}
+		else if (0 == memcmp(pheap_stream->addr.tuple4_v6->saddr,pstack_stream->addr.tuple4_v6->daddr, IPV6_ADDR_LEN))
+		{
+			this_layer_is_same = 1;
+			cur_pkt_dir = DIR_S2C;
+		}
+		else if (0 == memcmp(pheap_stream->addr.tuple4_v6->daddr,pstack_stream->addr.tuple4_v6->saddr, IPV6_ADDR_LEN))
+		{
+			this_layer_is_same = 1;
+			cur_pkt_dir = DIR_S2C;
+		}
+	}
+	else
+	{
+		sapp_runtime_log(RLOG_LV_FATAL, "stream:%s, curdir:%d, addrtype:%d for GTP tunnel, heap stream tuple4 addr not IPv4 or IPv6",
+				 printaddr(&top_stream_pr->stream_public.addr, top_stream_pr->stream_public.threadnum), cur_pkt_dir, pheap_stream->addr.addrtype);
+	}
 
 	if(0 == this_layer_is_same){ /* �����ַȫ��һ��, ��Ϊ��������һ������, ֱ�ӷ��ش��� */
 		return -1;