From swapnil:

Packet-gtpv2.c dissector extended to support more IE's.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29247 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 1503 insertions, 91 deletions

diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 916feb9a46..2a59ac22af 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -42,6 +42,7 @@
 #include "packet-gsm_map.h"
 #include "packet-e212.h"
 
+/*GTPv2 Message->GTP Header(SB)*/
 static int proto_gtpv2 = -1;
 static int hf_gtpv2_flags = -1;
 static int hf_gtpv2_version = -1;
@@ -51,11 +52,14 @@ static int hf_gtpv2_msg_length = -1;
 static int hf_gtpv2_teid = -1;
 static int hf_gtpv2_seq = -1;
 static int hf_gtpv2_spare = -1;
+
+
 static int hf_gtpv2_ie = -1;
 static int hf_gtpv2_ie_len = -1;
 static int hf_gtpv2_cr = -1;
 static int hf_gtpv2_instance = -1;
 static int hf_gtpv2_cause = -1;
+static int hf_gtpv2_cause_cs= -1;
 static int hf_gtpv2_rec = -1;
 static int hf_gtpv2_apn = -1;
 static int hf_gtpv2_ebi = -1;
@@ -90,6 +94,81 @@ static gint ett_gtpv2_flags = -1;
 static gint ett_gtpv2_ie = -1;
 
 
+static int hf_gtpv2_selec_mode= -1;
+
+static int hf_gtpv2_f_teid_v4= -1;
+static int hf_gtpv2_f_teid_v6= -1;
+static int hf_gtpv2_f_teid_interface_type= -1;
+static int hf_gtpv2_f_teid_gre_key= -1;
+static int hf_gtpv2_f_teid_ipv4= -1;
+static int hf_gtpv2_f_teid_ipv6= -1;
+static int hf_gtpv2_imsi= -1;
+
+static int hf_gtpv2_ambr_up= -1;
+static int hf_gtpv2_ambr_down= -1;
+static int hf_gtpv2_ip_address_ipv4= -1;
+static int hf_gtpv2_ip_address_ipv6= -1;
+static int hf_gtpv2_mei= -1;
+
+static int hf_gtpv2_bearer_qos_pvi= -1;
+static int hf_gtpv2_bearer_qos_pl= -1;
+static int hf_gtpv2_bearer_qos_pci= -1;
+static int hf_gtpv2_bearer_qos_label_qci= -1;
+static int hf_gtpv2_bearer_qos_mbr_up= -1;
+static int hf_gtpv2_bearer_qos_mbr_down= -1;
+static int hf_gtpv2_bearer_qos_gbr_up= -1;
+static int hf_gtpv2_bearer_qos_gbr_down= -1;
+static int hf_gtpv2_flow_qos_label_qci= -1;
+static int hf_gtpv2_flow_qos_mbr_up= -1;
+static int hf_gtpv2_flow_qos_mbr_down= -1;
+static int hf_gtpv2_flow_qos_gbr_up= -1;
+static int hf_gtpv2_flow_qos_gbr_down= -1;
+
+static int hf_gtpv2_delay_value= -1;
+static int hf_gtpv2_charging_id= -1;
+static int hf_gtpv2_charging_characteristic= -1;
+static int hf_gtpv2_bearer_flag= -1;
+static int hf_gtpv2_ue_time_zone= -1;
+static int hf_gtpv2_ue_time_zone_dst= -1;
+
+static int hf_gtpv2_node_type= -1;
+
+static int hf_gtpv2_b_tft_opcode= -1;
+static int hf_gtpv2_b_tft_ebit= -1;
+static int hf_gtpv2_b_tft_number= -1;
+static int hf_gtpv2_b_tft_pf_id= -1;
+static int hf_gtpv2_b_tft_pf_direction= -1;
+static int hf_gtpv2_b_tft_pf_eval= -1;
+static int hf_gtpv2_b_tft_pf_length= -1;
+static int hf_gtpv2_b_tft_pf_comp_type= -1;
+static int hf_gtpv2_b_tft_pf_ipv4= -1;
+static int hf_gtpv2_b_tft_pf_ipv4_mask= -1;
+static int hf_gtpv2_b_tft_pf_ipv6= -1;
+static int hf_gtpv2_b_tft_pf_ipv6_mask= -1;
+static int hf_gtpv2_b_tft_pf_prot_id= -1;
+static int hf_gtpv2_b_tft_pf_single_local= -1;
+static int hf_gtpv2_b_tft_pf_local_port_low= -1;
+static int hf_gtpv2_b_tft_pf_local_port_high= -1;
+static int hf_gtpv2_b_tft_pf_single_remote= -1;
+static int hf_gtpv2_b_tft_pf_remote_port_low= -1;
+static int hf_gtpv2_b_tft_pf_remote_port_high= -1;
+static int hf_gtpv2_b_tft_pf_security= -1;
+static int hf_gtpv2_b_tft_pf_service_type= -1;
+static int hf_gtpv2_b_tft_pf_service_type_mask= -1;
+static int hf_gtpv2_b_tft_pf_flow_label= -1;
+static int hf_gtpv2_apn_rest= -1;
+static int hf_gtpv2_pti= -1;
+static int hf_gtpv2_uli_cgi_lac= -1;
+static int hf_gtpv2_uli_cgi_ci= -1;
+static int hf_gtpv2_uli_sai_lac= -1;
+static int hf_gtpv2_uli_sai_sac= -1;
+static int hf_gtpv2_uli_rai_lac= -1;
+static int hf_gtpv2_uli_rai_rac= -1;
+static int hf_gtpv2_uli_tai_tac= -1;
+static int hf_gtpv2_uli_ecgi_eci= -1;
+static int hf_gtpv2_bearer_control_mode= -1;
+
+/*Message Types for GTPv2 (Refer Pg19 29.274) (SB)*/
 static const value_string gtpv2_message_type_vals[] = {
 	{0, "Reserved"},
 	{1, "Echo Request"},
@@ -184,7 +263,10 @@ static const value_string gtpv2_message_type_vals[] = {
 #define GTPV2_IE_CAUSE			2
 #define GTPV2_REC_REST_CNT		3
 #define GTPV2_APN				71
+#define GTPV2_AMBR              72 
 #define GTPV2_EBI				73
+#define GTPV2_IP_ADDRESS		74 
+#define GTPV2_MEI				75 
 #define GTPV2_IE_MSISDN			76
 #define GTPV2_INDICATION		77
 #define GTPV2_PCO				78
@@ -193,13 +275,34 @@ static const value_string gtpv2_message_type_vals[] = {
 #define GTPV2_FLOW_QOS			81
 #define GTPV2_IE_RAT_TYPE		82
 #define GTPV2_IE_SERV_NET		83
-
+#define GTPV2_BEARER_TFT		84
+#define GTPV2_TAD				85
 #define	GTPV2_ULI				86
 #define GTPV2_F_TEID			87
 #define GTPV2_G_CN_ID			89
 #define GTPV2_DELAY_VALUE		92
 #define GTPV2_BEARER_CTX		93
+#define GTPV2_CHARGING_ID       94
+#define GTPV2_CHARGING_CHARACTERISTIC       95
+#define GTPV2_BEARER_FLAG       97
+#define GTPV2_PDN_TYPE	        99
+#define GTPV2_PTI				100
+#define GTPV2_UE_TIME_ZONE		114
+#define GTPV2_APN_RESTRICTION   127
+#define GTPV2_SELEC_MODE        128 
+#define GTPV2_BEARER_CONTROL_MODE	130
 #define GTPV2_CNG_REP_ACT		131
+#define GTPV2_NODE_TYPE			135 
+
+#define SPARE								0X0
+#define CREATE_NEW_TFT						0X20
+#define DELETE_TFT							0X40
+#define ADD_PACKET_FILTERS_TFT				0X60
+#define REPLACE_PACKET_FILTERS_TFT			0X80
+#define DELETE_PACKET_FILTERS_TFT			0XA0
+#define NO_TFT_OPERATION					0XC0
+#define RESERVED							0XE0
+
 
 /* Table 8.1-1: Information Element types for GTPv2 */
 static const value_string gtpv2_element_type_vals[] = {
@@ -267,7 +370,7 @@ static const value_string gtpv2_element_type_vals[] = {
 	{126, "UDP Source Port Number"},											/* Extendable / 8.56 */
 	{127, "APN Restriction"},													/* Extendable / 8.57 */
 	{128, "Selection Mode"},													/* Extendable / 8.58 */
-	{129, "Source Identification"},									/* Variable Length / 8.50 */
+	{129, "Source Identification"},												/* Variable Length / 8.50 */
 	{130, "Bearer Control Mode"},												/* Extendable / 8.60 */
 	{131, "Change Reporting Action"},											/* Variable Length / 8.61 */
 	{132, "Fully Qualified PDN Connection Set Identifier (FQ-CSID)"},			/* Variable Length / 8.62 */
@@ -275,7 +378,7 @@ static const value_string gtpv2_element_type_vals[] = {
 	{134, "eMLPP Priority"},													/* Extendable / 8.64 */
 	{135, "Node Type"},															/* Extendable / 8.65 */
 	{136, "Fully Qualified Domain Name (FQDN)"},								/* Variable Length / 8.66 */
-	{137, "Transaction Identifier (TI)"},								/* Variable Length / 8.68 */
+	{137, "Transaction Identifier (TI)"},										/* Variable Length / 8.68 */
 	/* 138-254 "Spare."},	*/													/* For future use. FFS */
 	{255, "Private"},															/* Extension Extendable / 8.71 */
     {0, NULL}
@@ -298,12 +401,39 @@ dissect_gtpv2_unknown(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, p
  * Editor's note: In the first release of GTPv2 spec (TS 29.274v8.0.0) n = 8. 
  * That is, the overall length of the IE is 11 octets.
  */
+
+
+static gchar *imsi_to_str(const guint8 * ad)
+{
+    static gchar str[17] = "                ";
+    int i, j = 0;
+
+    for (i = 0; i < 8; i++)
+    {
+    	if (((ad[i] >> 4) & 0x0F) <= 9)
+    		str[j++] = ((ad[i] >> 4) & 0x0F) + 0x30;
+    	if ((ad[i] & 0x0F) <= 9)
+    		str[j++] = (ad[i] & 0x0F) + 0x30; /* Adding 0x30(48 decimal) makes it a printable digit (Eg. Ascii value 0f 9 is 57 (9+48))*/
+
+    }
+    str[j] = '\0';
+
+    return str;
+}
+
 static void
 dissect_gtpv2_imsi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
-	proto_tree_add_text(tree, tvb, 0, length, "IE data not dissected yet"); 
+    int offset= 0;
+	guint8 imsi_val[8];
+	gchar *imsi_str;
 
+	tvb_memcpy(tvb, imsi_val, offset , 8);
+	imsi_str = imsi_to_str(imsi_val);
+
+	proto_tree_add_string(tree, hf_gtpv2_imsi, tvb, offset, length, imsi_str);
 }
+
 /* Table 8.4-1: Cause values */
 static const value_string gtpv2_cause_vals[] = {
 	{0, "Reserved"},
@@ -377,10 +507,10 @@ dissect_gtpv2_cause(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pro
 	int offset = 0;
 	/* Cause value octet 5 */
 	proto_tree_add_item(tree, hf_gtpv2_cause, tvb, offset, 1, FALSE);
-	if (length >1)
-			proto_tree_add_text(tree, tvb, offset, length, "IE data not dissected yet");
-
+	offset++;
+	proto_tree_add_item(tree, hf_gtpv2_cause_cs, tvb, offset, 1, FALSE);
 }
+
 /*
  * 8.5 Recovery (Restart Counter)
  */
@@ -388,10 +518,9 @@ static void
 dissect_gtpv2_recovery(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
 	int offset = 0;
-	/*  */
 	proto_tree_add_item(tree, hf_gtpv2_rec, tvb, offset, 1, FALSE);
-
 }
+
 /*
  * 8.6 Access Point Name (APN)
  */
@@ -421,9 +550,19 @@ dissect_gtpv2_apn(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
     }
 
 }
+
 /*
- * 8.7 Aggregate Maximum Bit Rate (AMBR)
- */
+ * 8.7 Aggregate Maximum Bit Rate (AMBR) */
+
+static void
+dissect_gtpv2_ambr(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset = 0;
+	proto_tree_add_item(tree, hf_gtpv2_ambr_up, tvb, offset, 4, FALSE);
+	offset= offset + 4;
+	proto_tree_add_item(tree, hf_gtpv2_ambr_down, tvb, offset, 4, FALSE);
+}
+
 /* 
  * 8.8 EPS Bearer ID (EBI)
  */
@@ -437,10 +576,46 @@ dissect_gtpv2_ebi(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
 	proto_tree_add_item(tree, hf_gtpv2_ebi, tvb, offset, 1, FALSE);
 
 }
-/*
- * 8.9 IP Address
- * 8.10 Mobile Equipment Identity (MEI)
- */
+/* 8.9 IP Address  */
+static void
+dissect_gtpv2_ip_address(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset = 0;
+	if (length==4)
+	{
+		proto_tree_add_item(tree, hf_gtpv2_ip_address_ipv4, tvb, offset, length, FALSE);
+    }
+	else if (length==16)
+	{
+		proto_tree_add_item(tree, hf_gtpv2_ip_address_ipv6, tvb, offset, length, FALSE);
+	}
+}
+/* 8.10 Mobile Equipment Identity (MEI)*/
+static gchar *mei_to_str(const guint8 * ad)
+{
+    static gchar str[17] = "                ";
+    int i, j = 0;
+    for (i = 0; i < 8; i++)
+    {
+    	if (((ad[i] >> 4) & 0x0F) <= 9)
+    		str[j++] = ((ad[i] >> 4) & 0x0F) + 0x30;
+    	if ((ad[i] & 0x0F) <= 9)
+    		str[j++] = (ad[i] & 0x0F) + 0x30; /* Adding 0x30(48 decimal) makes it a printable digit (Eg. Ascii value 0f 9 is 57 (9+48))*/
+    }
+    str[j] = '\0';
+    return str;
+}
+
+static void
+dissect_gtpv2_mei(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset= 0;
+	guint8 mei_val[8];
+	gchar *mei_str;
+	tvb_memcpy(tvb, mei_val, offset , 8);
+	mei_str = mei_to_str(mei_val);
+	proto_tree_add_string(tree, hf_gtpv2_mei, tvb, offset, length, mei_str);
+}
 
 /*
  * 8.11 MSISDN
@@ -452,7 +627,6 @@ static void
 dissect_gtpv2_msisdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
 	dissect_gsm_map_msisdn(tvb, pinfo, tree); 
-
 }
 
 /*
@@ -462,7 +636,6 @@ static void
 dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
 	int offset = 0;
-
 	proto_tree_add_item(tree, hf_gtpv2_daf,			tvb, offset, 1, FALSE);
 	proto_tree_add_item(tree, hf_gtpv2_dtf,			tvb, offset, 1, FALSE);
 	proto_tree_add_item(tree, hf_gtpv2_hi,			tvb, offset, 1, FALSE);
@@ -471,18 +644,18 @@ dissect_gtpv2_ind(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
 	proto_tree_add_item(tree, hf_gtpv2_isrsi,		tvb, offset, 1, FALSE);
 	proto_tree_add_item(tree, hf_gtpv2_israi,		tvb, offset, 1, FALSE);
 	proto_tree_add_item(tree, hf_gtpv2_sgwci,		tvb, offset, 1, FALSE);
-	if(length==1){
+	if(length==1)
+	{
 		proto_tree_add_text(tree, tvb, 0, length, "Older version?, should be 2 octets in 8.0.0");
 		return;
 	}
-
 	offset++;
 	proto_tree_add_item(tree, hf_gtpv2_pt,			tvb, offset, 1, FALSE);
 	proto_tree_add_item(tree, hf_gtpv2_tdi,			tvb, offset, 1, FALSE);
 	proto_tree_add_item(tree, hf_gtpv2_si,			tvb, offset, 1, FALSE);
 	proto_tree_add_item(tree, hf_gtpv2_msv,			tvb, offset, 1, FALSE);
-	
 }
+
 /*
  * 8.13 Protocol Configuration Options (PCO)
  * Editor's note: PCO will be defined in 3GPP TS 23.003 and its coding in TS 24.301
@@ -493,6 +666,7 @@ dissect_gtpv2_pco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
 {
 	de_sm_pco(tvb, tree, 0, length, NULL, 0);
 }
+
 /*
  * 8.14 PDN Address Allocation (PAA)
  */
@@ -509,12 +683,11 @@ dissect_gtpv2_paa(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
 {
 	int offset = 0;
 	guint8 pdn_type;
-
 	pdn_type  = tvb_get_guint8(tvb, offset);
     proto_tree_add_item(tree, hf_gtpv2_pdn_type, tvb, offset, 1, FALSE);
 	offset++;
-
-	switch(pdn_type){
+	switch(pdn_type)
+	{
 		case 1:
 			/* IPv4 */
 			proto_tree_add_item(tree, hf_gtpv2_pdn_ipv4, tvb, offset, 4, FALSE);
@@ -547,8 +720,23 @@ dissect_gtpv2_paa(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
 static void
 dissect_gtpv2_bearer_qos(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
-	proto_tree_add_text(tree, tvb, 0, length, "IE data not dissected yet"); 
+	int offset = 0;
+	proto_tree_add_item(tree, hf_gtpv2_bearer_qos_pvi, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gtpv2_bearer_qos_pl, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gtpv2_bearer_qos_pci, tvb, offset, 1, FALSE);
+	offset++;
+	proto_tree_add_item(tree, hf_gtpv2_bearer_qos_label_qci, tvb, offset, 1, FALSE);
+	offset= offset++;
+	proto_tree_add_item(tree, hf_gtpv2_bearer_qos_mbr_up, tvb, offset, 5, FALSE);
+	offset= offset+5;
+	proto_tree_add_item(tree, hf_gtpv2_bearer_qos_mbr_down, tvb, offset, 5, FALSE);
+	offset= offset+5;
+	proto_tree_add_item(tree, hf_gtpv2_bearer_qos_gbr_up, tvb, offset, 5, FALSE);
+	offset= offset+5;
+	proto_tree_add_item(tree, hf_gtpv2_bearer_qos_gbr_down, tvb, offset, 5, FALSE);
+	offset= offset+5;
 }
+
 /*
  * 8.16 Flow Quality of Service (Flow QoS)
  */
@@ -556,8 +744,19 @@ dissect_gtpv2_bearer_qos(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
 static void
 dissect_gtpv2_flow_qos(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
-	proto_tree_add_text(tree, tvb, 0, length, "IE data not dissected yet"); 
+	int offset = 0;
+	proto_tree_add_item(tree, hf_gtpv2_flow_qos_label_qci, tvb, offset, 1, FALSE);
+	offset= offset++;
+	proto_tree_add_item(tree, hf_gtpv2_flow_qos_mbr_up, tvb, offset, 5, FALSE);
+	offset= offset+5;
+	proto_tree_add_item(tree, hf_gtpv2_flow_qos_mbr_down, tvb, offset, 5, FALSE);
+	offset= offset+5;
+	proto_tree_add_item(tree, hf_gtpv2_flow_qos_gbr_up, tvb, offset, 5, FALSE);
+	offset= offset+5;
+	proto_tree_add_item(tree, hf_gtpv2_flow_qos_gbr_down, tvb, offset, 5, FALSE);
+	offset= offset+5;
 }
+
 /*
  * 8.17 RAT Type
  */
@@ -577,19 +776,433 @@ dissect_gtpv2_rat_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
 {
 	proto_tree_add_item(tree, hf_gtpv2_rat_type, tvb, 0, 1, FALSE);
 }
+
 /*
  * 8.18 Serving Network
  */
 static void
 dissect_gtpv2_serv_net(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
-
 	dissect_e212_mcc_mnc(tvb, tree, 0); 
 }
+
 /*
- * 8.19 EPS Bearer Level Traffic Flow Template (Bearer TFT)
- * 8.20 Traffic Aggregate Description (TAD)
+ * 8.19 EPS Bearer Level Traffic Flow Template (Bearer TFT) */
+
+static const value_string gtpv2_opcode_vals[] = {
+	{0, "Spare"},
+	{1, "Create New TFT"},
+	{2, "Delete Existing TFT"},
+	{3, "Add Packet filters to existing TFT"},
+	{4, "Replace Packet filters in existing TFT"},
+	{5, "Delete Packet filters from existing TFT"},
+	{6, "No TFT Operation"},
+	{7, "Reserved"},
+	{0, NULL}
+};
+static const value_string gtpv2_comp_type_vals[] = {
+	{16, "IPV4 remote address type"},
+	{32, "IPV6 remote address type"},
+	{48, "Protocol Identifier"},
+	{64, "Single local port type"},
+	{65, "Local port range type"},
+	{80, "Single remote port type"},
+	{81, "Remote port range type"},
+	{96, "Security Parameter Index type"},
+	{112, "Type of Service/Traffic class type"},
+	{128, "Flow Label type"},
+	{0, NULL}
+};
+static const value_string gtpv2_direction_vals[] = {
+	{0, "Pre Rel-7 TFT filter"},
+	{1, "Downlink only"},
+	{2, "uplink only"},
+	{3, "bidirectional"},
+	{0, NULL}
+};
+
+static void
+dissect_gtpv2_bearer_tft(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset= 0,i=0,newoffset2;
+	guint8 number, opcode, ebit, comptype, length1;
+	proto_tree *ie_tree;
+	proto_item *ti;
+	number = tvb_get_guint8(tvb,offset)& 0x0f;
+	opcode = tvb_get_guint8(tvb,offset)& 0xe0;
+	ebit = tvb_get_guint8(tvb,offset)& 0x10;
+	proto_tree_add_item(tree, hf_gtpv2_b_tft_opcode, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gtpv2_b_tft_number, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gtpv2_b_tft_ebit, tvb, offset, 1, FALSE);
+	offset++;
+	switch(opcode)
+		{
+			case SPARE:
+				/* Spare */
+				break;
+			case CREATE_NEW_TFT:
+				/* Create New TFT */
+			case ADD_PACKET_FILTERS_TFT:
+				/* Add packet filters to existing TFT */
+			case REPLACE_PACKET_FILTERS_TFT:
+				/*Replace Packet filters in existing TFT */
+				while (i<number)
+				{
+					i++;newoffset2=0;
+					length1 =tvb_get_guint8(tvb,offset+2);
+					ti = proto_tree_add_text(tree, tvb, offset, 3+length1, "Packet Filter %d",i);
+					ie_tree = proto_item_add_subtree(ti, ett_gtpv2_ie);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_id, tvb, offset, 1, FALSE);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_direction, tvb, offset, 1, FALSE);
+					offset++;
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_eval, tvb, offset, 1, FALSE);
+					offset++;
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_length, tvb, offset, 1, FALSE);
+					offset++;
+
+					while (newoffset2<length1)
+				  	{
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_comp_type, tvb, offset, 1, FALSE);
+					comptype = tvb_get_guint8(tvb,offset);
+					offset++;
+					newoffset2++;
+						if (comptype==16)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv4, tvb, offset, 4, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv4_mask, tvb, offset, 4, FALSE);
+							offset+=8;
+							newoffset2+=8;
+						}
+						if (comptype==32)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv6, tvb, offset, 16, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv6_mask, tvb, offset, 16, FALSE);
+							offset+=32;
+							newoffset2+=32;
+						}
+						if (comptype==48)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_prot_id, tvb, offset, 1, FALSE);
+							offset+=1;
+							newoffset2+=1;
+						}
+						if (comptype==64)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_single_local, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==65)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_local_port_low, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_local_port_high, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==80)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_single_remote, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==81)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_remote_port_low, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_remote_port_high, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==96)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_security, tvb, offset, 4, FALSE);
+							offset+=4;
+							newoffset2+=4;
+						}
+						if (comptype==112)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_service_type, tvb, offset, 1, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_service_type_mask, tvb, offset, 1, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==128)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_flow_label, tvb, offset, 3, FALSE);
+							offset+=3;
+							newoffset2+=3;
+						}
+				  }
+				}
+
+				break;
+			case DELETE_TFT:
+				/* Delete Existing TFT */
+				break;
+
+			case DELETE_PACKET_FILTERS_TFT:
+				/* Delete Packet filters from existing TFT */
+				while (i<number)
+				{
+					i++;
+					ti = proto_tree_add_text(tree, tvb, offset, 1, "Packet Filter %d",i);
+					ie_tree = proto_item_add_subtree(ti, ett_gtpv2_ie);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_id, tvb, offset, 1, FALSE);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_direction, tvb, offset, 1, FALSE);
+					offset++;
+				}
+				break;
+			case NO_TFT_OPERATION:
+				/* No TFT operation */
+				break;
+			case RESERVED:
+				/* Reserved */
+				break;
+			default:
+				break;
+		}
+
+}
+ /* 8.20 Traffic Aggregate Description (TAD) 
  */
+static void
+dissect_gtpv2_tad(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset= 0,i=0,newoffset2;
+	guint8 number, opcode, ebit, comptype, length1;
+	proto_tree *ie_tree;
+	proto_item *ti;
+	number = tvb_get_guint8(tvb,offset)& 0x0f;
+	opcode = tvb_get_guint8(tvb,offset)& 0xe0;
+	ebit = tvb_get_guint8(tvb,offset)& 0x10;
+	proto_tree_add_item(tree, hf_gtpv2_b_tft_opcode, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gtpv2_b_tft_number, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gtpv2_b_tft_ebit, tvb, offset, 1, FALSE);
+	offset++;
+	switch(opcode)
+		{
+			case SPARE:
+				/* Spare */
+				break;
+			case CREATE_NEW_TFT:
+				/* Create New TFT */
+			case REPLACE_PACKET_FILTERS_TFT:
+				/*Replace Packet filters in existing TFT */
+				while (i<number)
+				{
+					i++;newoffset2=0;
+					length1 =tvb_get_guint8(tvb,offset+2);
+					ti = proto_tree_add_text(tree, tvb, offset, 3+length1, "Packet Filter %d",i);
+					ie_tree = proto_item_add_subtree(ti, ett_gtpv2_ie);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_id, tvb, offset, 1, FALSE);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_direction, tvb, offset, 1, FALSE);
+					offset++;
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_eval, tvb, offset, 1, FALSE);
+					offset++;
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_length, tvb, offset, 1, FALSE);
+					offset++;
+
+					while (newoffset2<length1)
+				  	{
+						proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_comp_type, tvb, offset, 1, FALSE);
+						comptype = tvb_get_guint8(tvb,offset);
+						offset++;
+						newoffset2++;
+						if (comptype==16)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv4, tvb, offset, 4, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv4_mask, tvb, offset, 4, FALSE);
+							offset+=8;
+							newoffset2+=8;
+						}
+						if (comptype==32)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv6, tvb, offset, 16, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv6_mask, tvb, offset, 16, FALSE);
+							offset+=32;
+							newoffset2+=32;
+						}
+						if (comptype==48)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_prot_id, tvb, offset, 1, FALSE);
+							offset+=1;
+							newoffset2+=1;
+						}
+						if (comptype==64)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_single_local, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==65)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_local_port_low, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_local_port_high, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==80)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_single_remote, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==81)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_remote_port_low, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_remote_port_high, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==96)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_security, tvb, offset, 4, FALSE);
+							offset+=4;
+							newoffset2+=4;
+						}
+						if (comptype==112)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_service_type, tvb, offset, 1, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_service_type_mask, tvb, offset, 1, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==128)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_flow_label, tvb, offset, 3, FALSE);
+							offset+=3;
+							newoffset2+=3;
+						}
+				  }
+				}
+
+				break;
+			case ADD_PACKET_FILTERS_TFT:
+				/* Add packet filters to existing TFT */
+				while (i<number)
+				{
+					i++;newoffset2=0;
+					length1 =tvb_get_guint8(tvb,offset+1);
+					ti = proto_tree_add_text(tree, tvb, offset, 2+length1, "Packet Filter %d",i);
+					ie_tree = proto_item_add_subtree(ti, ett_gtpv2_ie);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_eval, tvb, offset, 1, FALSE);
+					offset++;
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_length, tvb, offset, 1, FALSE);
+					offset++;
+
+					while (newoffset2<length1)
+				  	{
+						proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_comp_type, tvb, offset, 1, FALSE);
+						comptype = tvb_get_guint8(tvb,offset);
+						offset++;
+						newoffset2++;
+						if (comptype==16)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv4, tvb, offset, 4, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv4_mask, tvb, offset, 4, FALSE);
+							offset+=8;
+							newoffset2+=8;
+						}
+						if (comptype==32)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv6, tvb, offset, 16, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv6_mask, tvb, offset, 16, FALSE);
+							offset+=32;
+							newoffset2+=32;
+						}
+						if (comptype==48)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_prot_id, tvb, offset, 1, FALSE);
+							offset+=1;
+							newoffset2+=1;
+						}
+						if (comptype==64)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_single_local, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==65)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_local_port_low, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_local_port_high, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==80)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_single_remote, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==81)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_remote_port_low, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_remote_port_high, tvb, offset, 2, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==96)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_security, tvb, offset, 4, FALSE);
+							offset+=4;
+							newoffset2+=4;
+						}
+						if (comptype==112)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_service_type, tvb, offset, 1, FALSE);
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_service_type_mask, tvb, offset, 1, FALSE);
+							offset+=2;
+							newoffset2+=2;
+						}
+						if (comptype==128)
+						{
+							proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_flow_label, tvb, offset, 3, FALSE);
+							offset+=3;
+							newoffset2+=3;
+						}
+				  }
+				}
+
+				break;
+			case DELETE_TFT:
+				/* Delete Existing TFT */
+				break;
+
+			case DELETE_PACKET_FILTERS_TFT:
+				/* Delete Packet filters from existing TFT */
+				while (i<number)
+				{
+					i++;
+					ti = proto_tree_add_text(tree, tvb, offset, 1, "Packet Filter %d",i);
+					ie_tree = proto_item_add_subtree(ti, ett_gtpv2_ie);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_id, tvb, offset, 1, FALSE);
+					proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_direction, tvb, offset, 1, FALSE);
+					offset++;
+				}
+				break;
+			case NO_TFT_OPERATION:
+				/* No TFT operation */
+				break;
+			case RESERVED:
+				/* Reserved */
+				break;
+			default:
+				break;
+		}
+
+}
 /*
  * 8.21 User Location Info (ULI)
  *
@@ -607,7 +1220,6 @@ dissect_gtpv2_uli(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
 {
 	int offset = 0;
 	guint flags;
-
 	flags = tvb_get_guint8(tvb,offset)&0x1f;
 	/* ECGI B5 */
 	proto_tree_add_item(tree, hf_gtpv2_uli_ecgi_flg, tvb, offset, 1, FALSE);
@@ -621,68 +1233,119 @@ dissect_gtpv2_uli(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto
 	proto_tree_add_item(tree, hf_gtpv2_uli_cgi_flg, tvb, offset, 1, FALSE);
 	offset++;
 
-	/* XXX Check if there is code to dissect this elsewhere e.g call it */
 	/* 8.22.1 CGI field  */
-	if (flags&0x01){
-		/* The coding of CGI (Cell Global Identifier) 
-		 * is depicted in Figure 8.22.1-1. If MNC is 2 digits long, MNC digit 1 
-		 * shall be set to 0.
-		 */
-		/* XXX call CGI dissecton in one of the GSM dissectors here */
-		proto_tree_add_text(tree, tvb, offset, 7, "CGI (Cell Global Identifier) not dissected yet");
-		offset+=7;
+	if (flags&0x01)
+	{
+		dissect_e212_mcc_mnc(tvb, tree, 0);
+		offset+=3;
+		proto_tree_add_item(tree, hf_gtpv2_uli_cgi_lac, tvb, offset, 2, FALSE);
+		proto_tree_add_item(tree, hf_gtpv2_uli_cgi_ci, tvb, offset, 2, FALSE);
+		offset+=4;
 		if(offset==length)
 			return;
 	}
 
 	/* 8.22.2 SAI field  */
-	if (flags&0x02){
-		/*The coding of SAI (Service Area Identifier) is depicted in Figure 8.22.2-1. 
-		 * If MNC is 2 digits long, MNC digit 1 shall be set to 0.
-		 */
-		proto_tree_add_text(tree, tvb, offset, 7, "SAI (Service Area Identifier) not dissected yet");
-		offset+=7;
+	if (flags&0x02)
+	{
+		dissect_e212_mcc_mnc(tvb, tree, 0);
+		offset+=3;
+		proto_tree_add_item(tree, hf_gtpv2_uli_sai_lac, tvb, offset, 2, FALSE);
+		proto_tree_add_item(tree, hf_gtpv2_uli_sai_sac, tvb, offset, 2, FALSE);
+		offset+=4;
 		if(offset==length)
 			return;
 	}
 	/* 8.22.3 RAI field  */
-	if (flags&0x04){
-		/* The coding of RAI (Routing Area Identity) is depicted in Figure 8.22.3-1.
-		 * If MNC is 2 digits long, MNC digit 1 shall be set to 0. 
-		 */
-		proto_tree_add_text(tree, tvb, offset, 7, "RAI (Routing Area Identity) not dissected yet");
-		offset+=7;
+	if (flags&0x04)
+	{
+		dissect_e212_mcc_mnc(tvb, tree, 0);
+		offset+=3;
+		proto_tree_add_item(tree, hf_gtpv2_uli_rai_lac, tvb, offset, 2, FALSE);
+		proto_tree_add_item(tree, hf_gtpv2_uli_rai_rac, tvb, offset, 2, FALSE);
+		offset+=4;
 		if(offset==length)
 			return;
 	}
 	/* 8.22.4 TAI field  */
-	if (flags&0x08){
-		/* The coding of TAI (Tracking Area Identity) is depicted in Figure 8.22.4-1
-		 * If MNC is 2 digits long, MNC digit 1 shall be set to 0. 
-		 */
-		proto_tree_add_text(tree, tvb, offset, 5, "TAI (Tracking Area Identity) not dissected yet");
-		offset+=5;
+	if (flags&0x08)
+	{
+		dissect_e212_mcc_mnc(tvb, tree, 0);
+		offset+=3;
+		proto_tree_add_item(tree, hf_gtpv2_uli_tai_tac, tvb, offset, 2, FALSE);
+		offset+=2;
 		if(offset==length)
 			return;
 	}
 	/* 8.22.5 ECGI field */
-	if (flags&0x10){
-		/* The coding of ECGI (E-UTRAN Cell Global Identifier) is depicted in Figure 8.22.5-1
-		 * If MNC is 2 digits long, MNC digit 1 shall be set to 0. 
-		 */
-		proto_tree_add_text(tree, tvb, offset, 6, "ECGI (E-UTRAN Cell Global Identifier) not dissected yet");
-		offset+=6;
+	if (flags&0x10)
+	{
+		/* The bits 8 through 5, of octet e+3 (Fig 8.21.5-1 in TS 29.274 V8.2.0) are spare
+		and hence they would not make any difference to the hex string following it, thus we directly read 4 bytes from tvb */
+
+		proto_tree_add_item(tree, hf_gtpv2_uli_ecgi_eci, tvb, offset, 4, FALSE);
+		offset+=4;
+
 	}
 }
 
 /*
- * 8.22 Fully Qualified TEID (F-TEID)
+ * 8.22 Fully Qualified TEID (F-TEID) 
  */
-
+static const value_string gtpv2_f_teid_interface_type_vals[] = {
+	{0, "S1-U eNodeB GTP-U interface"},
+	{1, "S1-U SGW GTP-U interface"},
+	{2, "S12 RNC GTP-U interface"},
+	{3, "S12 SGW GTP-U interface"},
+	{4, "S5/S8 SGW GTP-U interface"},
+	{5, "S5/S8 PGW GTP-U interface"},
+	{6, "S5/S8 SGW GTP-C interface"},
+	{7, "S5/S8 PGW GTP-C interface"},
+	{8, "S5/S8 SGW PMIPv6 interface (the 32 bit GRE key is encoded in 32 bit TEID field "
+		"and since alternate CoA is not used the control plane and user plane addresses are the same for PMIPv6)"},
+	{9, "S5/S8 PGW PMIPv6 interface (the 32 bit GRE key is encoded in 32 bit TEID field "
+		"and the control plane and user plane addresses are the same for PMIPv6)"},
+	{10, "S11 MME GTP-C interface"},
+	{11, "S11/S4 SGW GTP-C interface"},
+	{12, "S10 MME GTP-C interface"},
+	{13, "S3 MME GTP-C interface"},
+	{14, "S3 SGSN GTP-C interface"},
+	{15, "S4 SGSN GTP-U interface"},
+	{16, "S4 SGW GTP-U interface"},
+	{17, "S4 SGSN GTP-C interface"},
+	{18, "S16 SGSN GTP-C interface"},
+	{19, "eNodeB GTP-U interface for DL data forwarding"},
+	{20, "eNodeB GTP-U interface for UL data forwarding"},
+	{21, "RNC GTP-U interface for data forwarding"},
+	{22, "SGSN GTP-U interface for data forwarding"},
+	{23, "SGW GTP-U interface for data forwarding"},
+	{0, NULL}
+};
 static void
 dissect_gtpv2_f_teid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
-	proto_tree_add_text(tree, tvb, 0, length, "IE data not dissected yet"); 
+	int offset = 0;
+	guint8 v4, v6;
+	v4 = tvb_get_guint8(tvb,offset)& 0x80;
+	v6 = tvb_get_guint8(tvb,offset)& 0x40;
+	proto_tree_add_item(tree, hf_gtpv2_f_teid_v4, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gtpv2_f_teid_v6, tvb, offset, 1, FALSE);
+	proto_tree_add_item(tree, hf_gtpv2_f_teid_interface_type, tvb, offset, 1, FALSE);
+
+	offset++;
+	proto_tree_add_item(tree, hf_gtpv2_f_teid_gre_key, tvb, offset, 4, FALSE);
+
+	offset= offset+4;
+	if (v4)
+	{
+		proto_tree_add_item(tree, hf_gtpv2_f_teid_ipv4, tvb, offset, 4, FALSE);
+		offset= offset+4;
+	}
+	if (v6)
+	{
+		proto_tree_add_item(tree, hf_gtpv2_f_teid_ipv6, tvb, offset, 16, FALSE);
+		offset= offset+16;
+	}
 }
 /*
  * 8.23 TMSI 
@@ -698,32 +1361,342 @@ dissect_gtpv2_g_cn_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, p
 }
 /*
  * 8.25 S103 PDN Data Forwarding Info (S103PDF)
- * 8.26 S1-U Data Forwarding (S1UDF)
- * 8.27 Delay Value
+ * 8.26 S1-U Data Forwarding (S1UDF) */
+ 
+/*8.27 Delay Value
  */
 
 static void
 dissect_gtpv2_delay_value(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
-	proto_tree_add_text(tree, tvb, 0, length, "IE data not dissected yet"); 
+
+	int offset = 0;
+
+	proto_tree_add_item(tree, hf_gtpv2_delay_value, tvb, offset, 1, FALSE);
+
+
 }
-/*
- * 8.28 Bearer Context (grouped IE)
- */
+/*8.28 Bearer Context (grouped IE) */
 
 static void
 dissect_gtpv2_bearer_ctx(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
 {
-	proto_tree_add_text(tree, tvb, 0, length, "IE data not dissected yet"); 
+	int offset= 0,i=0;
+	int newoffset, newoffset1, newoffset2, newoffset3;
+	guint8 number, opcode, ebit, comptype, length1;
+	guint8 type, instances;
+	proto_tree *ie_tree;
+	proto_item *ti;
+	//tvbuff_t *ie_tvb;
+	guint8 v4, v6;
+	guint16 lengths;
+	while (offset<length)
+		{
+			type = tvb_get_guint8(tvb,offset);
+			lengths = tvb_get_ntohs(tvb, offset+1);
+			ti = proto_tree_add_text(tree, tvb, offset, 4 + lengths, "%s : ", val_to_str(type, gtpv2_element_type_vals, "Unknown"));
+			ie_tree = proto_item_add_subtree(ti, ett_gtpv2_ie);
+			/* Octet 1 */
+			proto_tree_add_item(ie_tree, hf_gtpv2_ie, tvb, offset, 1, FALSE);
+			offset++;
+
+			/*Octet 2 - 3 */
+			proto_tree_add_item(ie_tree, hf_gtpv2_ie_len, tvb, offset, 2, FALSE);
+			offset+=2;
+			/* CR Spare Instance Octet 4*/
+			proto_tree_add_item(ie_tree, hf_gtpv2_cr, tvb, offset, 1, FALSE);
+
+			instances = tvb_get_guint8(tvb,offset)& 0x0f;
+			proto_tree_add_item(ie_tree, hf_gtpv2_instance, tvb, offset, 1, FALSE);
+			offset++;
+			switch(type)
+			{
+				case 73:
+					/* EPS Bearer ID */
+					proto_tree_add_item(ie_tree, hf_gtpv2_ebi, tvb, offset, 1, FALSE);
+					offset+=lengths;
+					break;
+				case 2:
+					/* Cause */
+					proto_tree_add_item(ie_tree, hf_gtpv2_cause, tvb, offset, 1, FALSE);
+					proto_tree_add_item(ie_tree, hf_gtpv2_cause_cs, tvb, offset+1, 1, FALSE);
+					offset+=lengths;
+					break;
+				case 80:
+					/* Bearer Qos */
+						newoffset3= offset;
+						proto_tree_add_item(ie_tree, hf_gtpv2_bearer_qos_pvi, tvb, newoffset3, 1, FALSE);
+						proto_tree_add_item(ie_tree, hf_gtpv2_bearer_qos_pl, tvb, newoffset3, 1, FALSE);
+						proto_tree_add_item(ie_tree, hf_gtpv2_bearer_qos_pci, tvb, newoffset3, 1, FALSE);
+
+						newoffset3++;
+						proto_tree_add_item(ie_tree, hf_gtpv2_bearer_qos_label_qci, tvb, newoffset3, 1, FALSE);
+
+						newoffset3= newoffset3++;
+						proto_tree_add_item(ie_tree, hf_gtpv2_bearer_qos_mbr_up, tvb, newoffset3, 5, FALSE);
+
+						newoffset3= newoffset3+5;
+						proto_tree_add_item(ie_tree, hf_gtpv2_bearer_qos_mbr_down, tvb, newoffset3, 5, FALSE);
+
+						newoffset3= newoffset3+5;
+						proto_tree_add_item(ie_tree, hf_gtpv2_bearer_qos_gbr_up, tvb, newoffset3, 5, FALSE);
+
+						newoffset3= newoffset3+5;
+						proto_tree_add_item(ie_tree, hf_gtpv2_bearer_qos_gbr_down, tvb, newoffset3, 5, FALSE);
+
+						newoffset3= newoffset3+5;
+						offset+=lengths;
+						break;
+				case 84:
+					/* TFT */
+						newoffset1=offset;
+						number = tvb_get_guint8(tvb,newoffset1)& 0x0f;
+						opcode = tvb_get_guint8(tvb,newoffset1)& 0xe0;
+						ebit = tvb_get_guint8(tvb,newoffset1)& 0x10;
+						proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_opcode, tvb, newoffset1, 1, FALSE);
+						proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_number, tvb, newoffset1, 1, FALSE);
+						proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_ebit, tvb, newoffset1, 1, FALSE);
+						newoffset1++;
+						switch(opcode)
+							{
+								case SPARE:
+									/* Spare */
+									break;
+								case CREATE_NEW_TFT:
+									/* Create New TFT */
+								case ADD_PACKET_FILTERS_TFT:
+									/* Add packet filters to existing TFT */
+								case REPLACE_PACKET_FILTERS_TFT:
+									/*Replace Packet filters in existing TFT */
+									while (i<number)
+									{
+										i++;newoffset2=0;
+										proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_id, tvb, newoffset1, 1, FALSE);
+										proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_direction, tvb, newoffset1, 1, FALSE);
+										newoffset1++;
+										proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_eval, tvb, newoffset1, 1, FALSE);
+										newoffset1++;
+										length1 =tvb_get_guint8(tvb,newoffset1);
+										proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_length, tvb, newoffset1, 1, FALSE);
+										newoffset1++;
+
+										while (newoffset2<length1)
+									  	{
+										proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_comp_type, tvb, newoffset1, 1, FALSE);
+										comptype = tvb_get_guint8(tvb,newoffset1);
+										newoffset1++;
+										newoffset2++;
+											if (comptype==16)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv4, tvb, newoffset1, 4, FALSE);
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv4_mask, tvb, newoffset1, 4, FALSE);
+												newoffset1+=8;
+												newoffset2+=8;
+											}
+											if (comptype==32)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv6, tvb, newoffset1, 16, FALSE);
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_ipv6_mask, tvb, newoffset1, 16, FALSE);
+												newoffset1+=32;
+												newoffset2+=32;
+											}
+											if (comptype==48)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_prot_id, tvb, newoffset1, 1, FALSE);
+												newoffset1+=1;
+												newoffset2+=1;
+											}
+											if (comptype==64)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_single_local, tvb, newoffset1, 2, FALSE);
+												newoffset1+=2;
+												newoffset2+=2;
+											}
+											if (comptype==65)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_local_port_low, tvb, newoffset1, 2, FALSE);
+												newoffset1+=2;
+												newoffset2+=2;
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_local_port_high, tvb, newoffset1, 2, FALSE);
+												newoffset1+=2;
+												newoffset2+=2;
+											}
+											if (comptype==80)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_single_remote, tvb, newoffset1, 2, FALSE);
+												newoffset1+=2;
+												newoffset2+=2;
+											}
+											if (comptype==81)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_remote_port_low, tvb, newoffset1, 2, FALSE);
+												newoffset1+=2;
+												newoffset2+=2;
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_remote_port_high, tvb, newoffset1, 2, FALSE);
+												newoffset1+=2;
+												newoffset2+=2;
+											}
+											if (comptype==96)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_security, tvb, newoffset1, 4, FALSE);
+												newoffset1+=4;
+												newoffset2+=4;
+											}
+											if (comptype==112)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_service_type, tvb, newoffset1, 1, FALSE);
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_service_type_mask, tvb, newoffset1, 1, FALSE);
+												newoffset1+=2;
+												newoffset2+=2;
+											}
+											if (comptype==128)
+											{
+												proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_flow_label, tvb, offset, 3, FALSE);
+												newoffset1+=3;
+												newoffset2+=3;
+											}
+									  }
+									}
+
+									break;
+								case DELETE_TFT:
+									/* Delete Existing TFT */
+									break;
+
+								case DELETE_PACKET_FILTERS_TFT:
+									/* Delete Packet filters from existing TFT */
+									while (i<number)
+										{
+										i++;
+										proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_id, tvb, newoffset1, 1, FALSE);
+										proto_tree_add_item(ie_tree, hf_gtpv2_b_tft_pf_direction, tvb, newoffset1, 1, FALSE);
+										newoffset1++;
+										}
+									break;
+								case NO_TFT_OPERATION:
+									/* No TFT operation */
+									break;
+								case RESERVED:
+									/* Reserved */
+									break;
+								default:
+									break;
+							}
+					offset+=lengths;
+					break;
+
+				case 87:
+					/* F-TEID*/
+					newoffset=offset;
+					v4 = tvb_get_guint8(tvb,newoffset)& 0x80;
+					v6 = tvb_get_guint8(tvb,newoffset)& 0x40;
+
+					proto_tree_add_item(ie_tree, hf_gtpv2_f_teid_v4, tvb, newoffset, 1, FALSE);
+					proto_tree_add_item(ie_tree, hf_gtpv2_f_teid_v6, tvb, newoffset, 1, FALSE);
+					proto_tree_add_item(ie_tree, hf_gtpv2_f_teid_interface_type, tvb, newoffset, 1, FALSE);
+					newoffset++;
+					proto_tree_add_item(ie_tree, hf_gtpv2_f_teid_gre_key, tvb, newoffset, 4, FALSE);
+					newoffset= newoffset+4;
+					if (v4)
+					{
+						proto_tree_add_item(ie_tree, hf_gtpv2_f_teid_ipv4, tvb, newoffset, 4, FALSE);
+						newoffset= newoffset+4;
+					}
+					if (v6)
+					{
+						proto_tree_add_item(ie_tree, hf_gtpv2_f_teid_ipv6, tvb, newoffset, 16, FALSE);
+						newoffset= newoffset+16;
+					}
+					offset+=lengths;
+					break;
+				case 94:
+					/* Charging Id */
+					proto_tree_add_item(ie_tree, hf_gtpv2_charging_id, tvb, offset, length, FALSE);
+					offset+=lengths;
+					break;
+				case 97:
+					/* Bearer flags */
+					proto_tree_add_item(ie_tree, hf_gtpv2_bearer_flag, tvb, offset, length, FALSE);
+					offset+=lengths;
+					break;
+				case 122:
+					/* NSAPI */
+					proto_tree_add_text(ie_tree, tvb, 0, lengths, "IE data not dissected yet");
+					offset+=lengths;
+					break;
+				case 137:
+					/* Transaction Identifier */
+					proto_tree_add_text(ie_tree, tvb, 0, lengths, "IE data not dissected yet");
+					offset+=lengths;
+					break;
+				default:
+					break;
+			}
+
+		}
+
 }
-/*
- * 8.29 Charging ID
- * 8.30 Charging Characteristics 
- * 8.31 Trace Information
- * 8.32 Bearer Flags
+/* 8.29 Charging ID */
+static void
+dissect_gtpv2_charging_id(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+
+	int offset = 0;
+
+	proto_tree_add_item(tree, hf_gtpv2_charging_id, tvb, offset, length, FALSE);
+
+
+}
+
+
+ /* 8.30 Charging Characteristics  */
+
+static void
+dissect_gtpv2_charging_characteristic(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+
+	int offset = 0;
+
+	proto_tree_add_item(tree, hf_gtpv2_charging_characteristic, tvb, offset, length, FALSE);
+
+
+}
+/* 8.30 Bearer Flag  */
+static void
+dissect_gtpv2_bearer_flag(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+
+	int offset = 0;
+
+	proto_tree_add_item(tree, hf_gtpv2_bearer_flag, tvb, offset, length, FALSE);
+
+
+}
+/* 8.34 PDN Type  */
+static void
+dissect_gtpv2_pdn_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+
+	int offset = 0;
+
+	proto_tree_add_item(tree, hf_gtpv2_pdn_type, tvb, offset, length, FALSE);
+
+
+}
+
+/* 8.31 Trace Information
  * 8.33 Paging Cause 
- * 8.34 PDN Type
- * 8.35 Procedure Transaction ID (PTI)
+  */
+
+/* 8.35 Procedure Transaction ID (PTI) */
+static void
+dissect_gtpv2_pti(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset=0;
+
+	proto_tree_add_item(tree, hf_gtpv2_pti, tvb, 0, 1, FALSE);
+}
+/*
  * 8.36 DRX Parameter 
  * 8.37 UE Network Capability
  * 8.38 MM Context 
@@ -732,8 +1705,30 @@ dissect_gtpv2_bearer_ctx(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
  * 8.41 Packet TMSI (P-TMSI)
  * 8.42 P-TMSI Signature
  * 8.43 Hop Counter
- * 8.44 UE Time Zone
- * 8.45 Trace Reference
+ */
+
+/* 8.44 UE Time Zone */
+
+static const value_string gtpv2_ue_time_zone_dst_vals[] = {
+    {0, "No Adjustments for Daylight Saving Time"},
+    {1, "+1 Hour Adjustments for Daylight Saving Time"},
+	{2, "+2 Hour Adjustments for Daylight Saving Time"},
+    {3, "Spare"},
+    {0, NULL}
+};
+static void
+dissect_gtpv2_ue_time_zone(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+
+	int offset = 0;
+	proto_tree_add_item(tree, hf_gtpv2_ue_time_zone, tvb, offset, 1, FALSE);
+
+	offset= offset+ 1;
+	proto_tree_add_item(tree, hf_gtpv2_ue_time_zone_dst, tvb, offset, 1, FALSE);
+
+
+}
+/* 8.45 Trace Reference
  * 8.56 Complete Request Message
  * 8.47 GUTI
  * 8.48 Fully Qualified Container (F-Container)
@@ -745,11 +1740,52 @@ dissect_gtpv2_bearer_ctx(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
  * 8.54 RAB Context
  * 8.55 Source RNC PDCP context info
  * 8.56 UDP Source Port Number
- * 8.57 APN Restriction 
- * 8.58 Selection Mode
- * 8.59 Source Identification
- * 8.60 Bearer Control Mode
  */
+
+/*8.57 APN Restriction */
+static void
+dissect_gtpv2_apn_rest(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset=0;
+
+	proto_tree_add_item(tree, hf_gtpv2_apn_rest, tvb, 0, 1, FALSE);
+}
+
+/* 8.58 Selection Mode */
+static const value_string gtpv2_selec_mode_vals[] = {
+    {0, "MS or network provided APN, subscribed verified"},
+    {1, "MS provided APN, subscription not verified"},
+	{2, "Network provided APN, subscription not verified"},
+    {3, "Network provided APN, subscription not verified (Basically for Future use"},
+    {0, NULL}
+};
+
+static void
+dissect_gtpv2_selec_mode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset=0;
+
+	proto_tree_add_item(tree, hf_gtpv2_selec_mode, tvb, offset, 1, FALSE);
+}
+
+
+ /* 8.59 Source Identification */
+
+ /* 8.60 Bearer Control Mode */
+ static const value_string gtpv2_bearer_control_mode_vals[] = {
+    {0, "Selected Bearer Control Mode-'MS_only'"},
+    {1, "Selected Bearer Control Mode-'Network_only'"},
+	{2, "Selected Bearer Control Mode-'MS/NW'"},
+    {0, NULL}
+};
+
+static void
+dissect_gtpv2_bearer_control_mode(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+	int offset=0;
+
+	proto_tree_add_item(tree, hf_gtpv2_bearer_control_mode, tvb, 0, 1, FALSE);
+}
 /*
  * 8.61 Change Reporting Action
  */
@@ -770,8 +1806,23 @@ dissect_cng_rep_act(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pro
  * 8.62 Fully qualified PDN Connection Set Identifier (FQ-CSID)
  * 8.63 Channel needed
  * 8.64 eMLPP Priority
- * 8.65 Node Type
- * 8.66 Fully Qualified Domain Name (FQDN)
+ */
+
+/*8.65 Node Type */
+static const value_string gtpv2_node_type_vals[] = {
+	{0, "MME"},
+	{1, "SGSN"},
+	{0, NULL}
+};
+
+static void
+dissect_node_type(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 instance _U_)
+{
+
+	proto_tree_add_item(tree, hf_gtpv2_node_type, tvb, 0, 1, FALSE);
+}
+
+ /* 8.66 Fully Qualified Domain Name (FQDN)
  * 8.67 Private Extension
  */
 typedef struct _gtpv2_ie {
@@ -786,7 +1837,10 @@ static const gtpv2_ie_t gtpv2_ies[] = {
 														/* 4-50 Reserved for S101 interface Extendable / See 3GPP TS 29.276 [14] */
 														/* 51-70 Reserved for Sv interface Extendable / See 3GPP TS 29.280 [15] */
 	{GTPV2_APN, dissect_gtpv2_apn},						/* 71, Access Point Name (APN) 8.6 */
+	{GTPV2_AMBR, dissect_gtpv2_ambr},					/* 72, Aggregate Maximum Bit Rate (AMBR) */
 	{GTPV2_EBI, dissect_gtpv2_ebi},						/* 73, EPS Bearer ID (EBI)  8.8 */
+	{GTPV2_IP_ADDRESS, dissect_gtpv2_ip_address},		/* 74, IP Address */
+	{GTPV2_MEI, dissect_gtpv2_mei},					/* 74, Mobile Equipment Identity */
 	{GTPV2_IE_MSISDN, dissect_gtpv2_msisdn},			/* 76, MSISDN 8.11 */
 	{GTPV2_INDICATION, dissect_gtpv2_ind},				/* 77 Indication 8.12 */
 	{GTPV2_PCO, dissect_gtpv2_pco},						/* 78 Protocol Configuration Options (PCO) 8.13 */
@@ -795,12 +1849,27 @@ static const gtpv2_ie_t gtpv2_ies[] = {
 	{GTPV2_FLOW_QOS, dissect_gtpv2_flow_qos},			/* 81 Flow Quality of Service (Flow QoS) 8.16 */
 	{GTPV2_IE_RAT_TYPE, dissect_gtpv2_rat_type},		/* 82, RAT Type  8.17 */
 	{GTPV2_IE_SERV_NET, dissect_gtpv2_serv_net},		/* 83, Serving Network 8.18 */
+	{GTPV2_BEARER_TFT, dissect_gtpv2_bearer_tft},		/* 84, Bearer TFT 8.19 */
+	{GTPV2_TAD, dissect_gtpv2_tad},						/* 85, Traffic Aggregate Description 8.20 */
 	{GTPV2_ULI, dissect_gtpv2_uli},						/* 86, User Location Info (ULI) 8.22 */
 	{GTPV2_F_TEID, dissect_gtpv2_f_teid},				/* 87, Fully Qualified Tunnel Endpoint Identifier (F-TEID) 8.23 */
 	{GTPV2_G_CN_ID, dissect_gtpv2_g_cn_id},				/* 89, Global CN-Id 8.25 */
 	{GTPV2_DELAY_VALUE, dissect_gtpv2_delay_value},		/* 92, Delay Value 8.29 */
 	{GTPV2_BEARER_CTX,dissect_gtpv2_bearer_ctx},		/* 93, Bearer Context  8.31 */
+	{GTPV2_CHARGING_ID, dissect_gtpv2_charging_id},     /* 94, Charging Id */
+	{GTPV2_CHARGING_CHARACTERISTIC, 					/* 95 Charging Characteristic */
+	 dissect_gtpv2_charging_characteristic},
+	{GTPV2_BEARER_FLAG, dissect_gtpv2_bearer_flag},     /* 97, Bearer Flag */
+	{GTPV2_PDN_TYPE, dissect_gtpv2_pdn_type},			/* 99, PDN Type */
+	{GTPV2_PTI, dissect_gtpv2_pti},						/* 100 Procedure Transaction Id */
+	{GTPV2_UE_TIME_ZONE, dissect_gtpv2_ue_time_zone},   /* 114, UE Time Zone */
+	{GTPV2_APN_RESTRICTION, 							/* 127, APN Restriction */
+	dissect_gtpv2_apn_rest},
+	{GTPV2_SELEC_MODE,dissect_gtpv2_selec_mode},		/* 128 Selection Mode */
+	{GTPV2_BEARER_CONTROL_MODE,
+	dissect_gtpv2_bearer_control_mode},					/* 130 Bearer Control Mode*/
 	{GTPV2_CNG_REP_ACT ,dissect_cng_rep_act},			/* 131 Change Reporting Action 8.61 */
+	{GTPV2_NODE_TYPE ,dissect_node_type},				/* 135 Node Type 8.65 */
 														/* 137-254 Spare. For future use. FFS */
 
     {0, dissect_gtpv2_unknown}
@@ -974,7 +2043,7 @@ void proto_register_gtpv2(void)
 		},
 		{ &hf_gtpv2_seq,
 		{"Sequence Number", "gtpv2.seq",
-		FT_UINT16, BASE_DEC, NULL, 0x0,
+		FT_UINT32, BASE_DEC, NULL, 0x0,
 		"SEQ", HFILL}
 		},
 		{ &hf_gtpv2_spare,
@@ -1002,10 +2071,20 @@ void proto_register_gtpv2(void)
 		FT_UINT8, BASE_DEC, NULL, 0x0f,
 		NULL, HFILL}
 		},
+		{&hf_gtpv2_imsi,
+		{"IMSI(International Mobile Subscriber Identity number)", "gtpv2.imsi",
+		FT_STRING, BASE_NONE, NULL, 0,
+		NULL, HFILL}
+		},
 		{ &hf_gtpv2_cause,
 		{"Cause", "gtpv2.cause",
 		FT_UINT8, BASE_DEC, VALS(gtpv2_cause_vals), 0x0,
-		"cause", HFILL}
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_cause_cs,
+		{"Cause Source (CS: True-Error originated by remote node, False-Error originated by Node sending the Message)","gtpv2.cs",
+		FT_BOOLEAN, 8, NULL, 0x01,
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_rec,
 		{"Restart Counter", "gtpv2.rec",
@@ -1013,15 +2092,41 @@ void proto_register_gtpv2(void)
 		NULL, HFILL}
 		},
 		{&hf_gtpv2_apn,
-		{"APN", "gtp.apn", 
+		{"APN (Access Point Name)", "gtp.apn",
 		FT_STRING, BASE_NONE, NULL, 0x0,
-		"Access Point Name", HFILL}
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_ambr_up,
+		{"AMBR Uplink (Aggregate Maximum Bit Rate for Uplink)", "gtpv2.ambr_up",
+		FT_UINT32, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_ambr_down,
+		{"AMBR Downlink(Aggregate Maximum Bit Rate for Downlink)", "gtpv2.ambr_down",
+		FT_UINT32, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
 		},
 		{&hf_gtpv2_ebi,
 		{"EPS Bearer ID (EBI)", "gtpv2.ebi",
 		FT_UINT8, BASE_DEC, NULL, 0x0f,
 		NULL, HFILL}
 		},
+		{ &hf_gtpv2_ip_address_ipv4,
+		{"IP address IPv4", "gtpv2.ip_address_ipv4",
+		FT_IPv4, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_ip_address_ipv6,
+		{"IP address IPv6", "gtpv2.ip_address_ipv6",
+		FT_IPv6, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_mei,
+		{"MEI(Mobile Equipment Identity)", "gtpv2.mei",
+		FT_STRING, BASE_NONE, NULL, 0,
+		NULL, HFILL}
+		},
+
 		{&hf_gtpv2_daf,	
 		{"DAF (Dual Address Bearer Flag)", "gtpv2.daf",	
 		FT_BOOLEAN, 8, NULL, 0x80, "DAF", HFILL}
@@ -1090,11 +2195,191 @@ void proto_register_gtpv2(void)
 		FT_IPv6, BASE_NONE, NULL, 0x0,
 		NULL, HFILL}
 		},
+		{&hf_gtpv2_bearer_qos_pvi,
+		{"PVI (Pre-emption Vulnerability)", "gtpv2.bearer_qos_pvi",
+		FT_BOOLEAN, 8, NULL, 0x01,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_qos_pl,
+		{"PL (Priority Level)", "gtpv2.bearer_qos_pl",
+		FT_UINT8, BASE_DEC, NULL, 0x3c,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_qos_pci,
+		{"PCI (Pre-emption Capability)", "gtpv2.bearer_qos_pci",
+		FT_BOOLEAN, 8, NULL, 0x40,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_qos_label_qci,
+		{"Label (QCI)", "gtpv2.bearer_qos_label_qci",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_qos_mbr_up,
+		{"Maximum Bit Rate For Uplink", "gtpv2.bearer_qos_mbr_up",
+		FT_UINT64, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_qos_mbr_down,
+		{"Maximum Bit Rate For Downlink", "gtpv2.bearer_qos_mbr_down",
+		FT_UINT64, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_qos_gbr_up,
+		{"Guaranteed Bit Rate For Uplink", "gtpv2.bearer_qos_gbr_up",
+		FT_UINT64, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_qos_gbr_down,
+		{"Guaranteed Bit Rate For Downlink", "gtpv2.bearer_qos_gbr_down",
+		FT_UINT64, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_flow_qos_label_qci,
+		{"Label (QCI)", "gtpv2.flow_qos_label_qci",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_flow_qos_mbr_up,
+		{"Maximum Bit Rate For Uplink", "gtpv2.flow_qos_mbr_up",
+		FT_UINT64, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_flow_qos_mbr_down,
+		{"Maximum Bit Rate For Downlink", "gtpv2.flow_qos_mbr_down",
+		FT_UINT64, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_flow_qos_gbr_up,
+		{"Guaranteed Bit Rate For Uplink", "gtpv2.flow_qos_gbr_up",
+		FT_UINT64, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_flow_qos_gbr_down,
+		{"Guaranteed Bit Rate For Downlink", "gtpv2.flow_qos_gbr_down",
+		FT_UINT64, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
 		{ &hf_gtpv2_rat_type,
 		{"RAT Type", "gtpv2.rat_type",
 		FT_UINT8, BASE_DEC, VALS(gtpv2_rat_type_vals), 0x0,
 		NULL, HFILL}
 		},
+		{&hf_gtpv2_b_tft_opcode,
+		{"Operation Code", "gtpv2.b_tft_opcode",
+		FT_UINT8, BASE_DEC, VALS(gtpv2_opcode_vals), 0xe0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_ebit,
+		{"Ebit", "gtpv2.b_tft_ebit",
+		FT_BOOLEAN, 8, NULL, 0x10,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_number,
+		{"Number of Packet Filters", "gtpv2.b_tft_number",
+		FT_UINT8, BASE_DEC, NULL, 0x0f,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_id,
+		{"Packet Filter Identifier", "gtpv2.b_tft_pf_id",
+		FT_UINT8, BASE_DEC, NULL, 0x0f,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_direction,
+		{"Direction", "gtpv2.b_tft_pf_direction",
+		FT_UINT8, BASE_DEC, VALS(gtpv2_direction_vals), 0x30,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_eval,
+		{"Evaluation Precedence", "gtpv2.b_tft_pf_eval",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_length,
+		{"Length of Packet Filter", "gtpv2.b_tft_pf_length",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_comp_type,
+		{"Component Type", "gtpv2.b_tft_pf_comp_type",
+		FT_UINT8, BASE_DEC, VALS(gtpv2_comp_type_vals), 0x0,
+		NULL , HFILL}
+		},
+		{ &hf_gtpv2_b_tft_pf_ipv4,
+		{"IPv4 address", "gtpv2.b_tft_pf_ipv4",
+		FT_IPv4, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_b_tft_pf_ipv6,
+		{"IPv6 address", "gtpv2.b_tft_pf_ipv6",
+		FT_IPv6, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_ipv4_mask,
+		{"IPV4 address mask field", "gtpv2.b_tft_pf_ipv4_mask",
+		FT_UINT32, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_ipv6_mask,
+		{"IPV6 address mask field", "gtpv2.b_tft_pf_ipv6_mask",
+		FT_UINT32, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_prot_id,
+		{"Protocol Identifier/Next Header type", "gtpv2.b_tft_pf_prot_id",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_single_local,
+		{"Single Local port type", "gtpv2.b_tft_pf_single_local",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_local_port_low,
+		{"Local port range low limit", "gtpv2.b_tft_pf_local_port_low",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_local_port_high,
+		{"Local port range high limit", "gtpv2.b_tft_pf_local_port_high",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_single_remote,
+		{"Single remote port type", "gtpv2.b_tft_pf_single_remote",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_remote_port_low,
+		{"Remote port range low limit", "gtpv2.b_tft_pf_remote_port_low",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_remote_port_high,
+		{"Remote port range high limit", "gtpv2.b_tft_pf_remote_port_high",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_security,
+		{"Security Parameter Index", "gtpv2.b_tft_pf_security",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_service_type,
+		{"Type of Service/Traffic Class type", "gtpv2.b_tft_pf_service_type",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_service_type_mask,
+		{"Type of Service/Traffic Class mask", "gtpv2.b_tft_pf_service_type_mask",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_b_tft_pf_flow_label,
+		{"Flow Label Type", "gtpv2.b_tft_pf_flow_label",
+		FT_UINT32, BASE_DEC, NULL, 0,
+		NULL, HFILL}
+		},
 		{ &hf_gtpv2_uli_ecgi_flg,
 		{"ECGI Present Flag)", "gtpv2.uli_ecgi_flg",	
 		FT_BOOLEAN, 8, NULL, 0x10, 
@@ -1120,11 +2405,138 @@ void proto_register_gtpv2(void)
 		FT_BOOLEAN, 8, NULL, 0x01, 
 		NULL, HFILL}
 		},
+		{ &hf_gtpv2_uli_cgi_lac,
+		{"Location Area Code", "gtpv2.uli_cgi_lac",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_uli_cgi_ci,
+		{"Cell Identity", "gtpv2.uli_cgi_ci",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_uli_sai_lac,
+		{"Location Area Code", "gtpv2.uli_sai_lac",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_uli_sai_sac,
+		{"Service Area Code", "gtpv2.uli_sai_sac",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_uli_rai_lac,
+		{"Location Area Code", "gtpv2.uli_rai_lac",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_uli_rai_rac,
+		{"Routing Area Code", "gtpv2.uli_rai_rac",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_uli_tai_tac,
+		{"Tracking Area Code", "gtpv2.uli_tai_tac",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_uli_ecgi_eci,
+		{"ECI (E-UTRAN Cell Identifier)", "gtpv2.uli_ecgi_eci",
+		FT_DOUBLE, BASE_DEC, NULL, 0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_f_teid_v4,
+		{"V4 (True-IPV4 address field Exists,False-Doesn't Exist in F-TEID)", "gtpv2.f_teid_v4",
+		FT_BOOLEAN, 8, NULL, 0x80,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_f_teid_v6,
+		{"V6 (True-IPV6 address field Exists,False-Doesn't Exist in F-TEID)", "gtpv2.f_teid_v6",
+		FT_BOOLEAN, 8, NULL, 0x40,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_f_teid_interface_type,
+		{"Interface Type", "gtpv2.f_teid_interface_type",
+		FT_UINT8, BASE_DEC, VALS(gtpv2_f_teid_interface_type_vals), 0x1f,
+		NULL , HFILL}
+		},
+		{&hf_gtpv2_f_teid_gre_key,
+		{"TEID/GRE Key", "gtpv2.f_teid_gre_key",
+		FT_UINT32, BASE_DEC, NULL, 0x0,
+		NULL , HFILL}
+		},
+		{ &hf_gtpv2_f_teid_ipv4,
+		{"F-TEID IPv4", "gtpv2.f_teid_ipv4",
+		FT_IPv4, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{ &hf_gtpv2_f_teid_ipv6,
+		{"F-TEID IPv6", "gtpv2.f_teid_ipv6",
+		FT_IPv6, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_delay_value,
+		{"Delay Value (In integer multiples of 50 milliseconds or zero)", "gtpv2.delay_value",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_charging_id,
+		{"Charging id", "gtpv2.charging_id",
+		FT_UINT32, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_charging_characteristic,
+		{"Charging Characteristic", "gtpv2.charging_characteristic",
+		FT_UINT16, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_flag,
+		{"Bearer Flags(PPC(Prohibit Payload Compression) True-SGSN attempts to compress the payload, False-SGSN doesn't attempt to compress the payload)",
+		"gtpv2.bearer_flag",
+		FT_BOOLEAN, 8, NULL, 0x01,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_pti,
+		{"Procedure Transaction Id", "gtpv2.pti",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_ue_time_zone,
+		{"Time Zone","gtpv2.ue_time_zone",
+		FT_UINT8, BASE_DEC, NULL,0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_ue_time_zone_dst,
+		{"Daylight Saving Time","gtpv2.ue_time_zone_dst",
+		FT_UINT8, BASE_DEC, VALS(gtpv2_ue_time_zone_dst_vals),0x03,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_apn_rest,
+		{"APN Restriction", "gtpv2.apn_rest",
+		FT_UINT8, BASE_DEC, NULL, 0x0,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_selec_mode,
+		{"Selection Mode","gtpv2.selec_mode",
+		FT_UINT8, BASE_DEC, VALS(gtpv2_selec_mode_vals),0x03,
+		NULL, HFILL}
+		},
+		{&hf_gtpv2_bearer_control_mode,
+		{"Bearer Control Mode","gtpv2.bearer_control_mode",
+		FT_UINT8, BASE_DEC, VALS(gtpv2_bearer_control_mode_vals),0x0,
+		NULL, HFILL}
+		},
 		{ &hf_gtpv2_cng_rep_act,
 		{"Change Reporting Action", "gtpv2.cng_rep_act",
 		FT_UINT8, BASE_DEC, VALS(gtpv2_cng_rep_act_vals), 0x0,
 		NULL, HFILL}
 		},
+		{ &hf_gtpv2_node_type,
+		{"Node Type", "gtpv2.node_type",
+		FT_UINT8, BASE_DEC, VALS(gtpv2_node_type_vals), 0x0,
+		NULL, HFILL}
+		},
+
 	 };
 
     static gint *ett_gtpv2_array[] = {