Fix v4.1 gtp hdr lenv4.1.2

1 files changed, 12 insertions, 6 deletions

diff --git a/src/dealpkt/deal_gprs_tunnel.c b/src/dealpkt/deal_gprs_tunnel.c
index f211286..24c5aad 100644
--- a/src/dealpkt/deal_gprs_tunnel.c
+++ b/src/dealpkt/deal_gprs_tunnel.c
@@ -139,7 +139,7 @@ int gtp_entry(struct streaminfo_private *pfstream_pr,void *this_layer_data,int t
 	gprsͷ�����ݱ�־λ�IJ�ͬ, ����Ҳ��ͬ, ����ֱ����sizeof(struct gtp_hdr)��ȡ����.
 	
 */
-static int get_gprs_hdr_len(const struct gtp_hdr *gtph)
+static int get_gprs_hdr_len_v1(const struct gtp_hdr *gtph)
 {
 	int base_len = sizeof(struct gtp_hdr);
 
@@ -179,16 +179,22 @@ static int identify_gtp(const struct streaminfo *pstream,const char *payload, un
 
         if ((source == gtp_u) || (dest == gtp_u) || (source == gtp_c)
             || (dest == gtp_c) || (source == gtp_v0) || (dest == gtp_v0)) {
-            struct gtp_hdr *gtp =
-                    (struct gtp_hdr *) payload;
+            struct gtp_hdr *gtp = (struct gtp_hdr *) payload;
             unsigned short gtp_version = (gtp->flags & 0xE0) >> 5;
 
-            if ((gtp_version == 0) || (gtp_version == 1) || (gtp_version == 2)) {
+            if(gtp_version == 0){
+            	sapp_runtime_log(20, "GTP v0 is obsoleted, not support!\n");
+				return 0;
+            }else if(gtp_version == 1) {
                 unsigned short message_len = ntohs(gtp->len);
-
-                if (message_len == (payload_len - get_gprs_hdr_len(gtp))) {
+                /* NOTE: gtp->len������gtpͷ���̶�����(8�ֽ�), ֻ������չͷ���͸��� */
+                if (message_len == (payload_len - sizeof(struct gtp_hdr))) {
                     return 1;
                 }
+            }else{
+            	//TODO
+            	sapp_runtime_log(20, "not support GTP v%d yet!\n", gtp_version);
+				return 0;
             }
         }
     }