Add comments about new IEs
[obnox/wireshark/wip.git] / epan / dissectors / packet-gtp.c
index e72bd3981f88bd49e3d1979fc2c161c2d92319e5..ea8ec34805d1c2609fda236ec594239b73148c3c 100644 (file)
@@ -1,4 +1,6 @@
 /* packet-gtp.c
+ *
+ * $Id$
  *
  * Routines for GTP dissection
  * Copyright 2001, Michal Melerowicz <michal.melerowicz@nokia.com>
@@ -7,13 +9,18 @@
  * Updates and corrections:
  * Copyright 2006 - 2009, Anders Broman <anders.broman@ericsson.com>
  *
- * $Id$
+ * Added Bearer control mode dissection:
+ * Copyright 2011, Grzegorz Szczytowski <grzegorz.szczytowski@gmail.com>
  *
- * Control Plane Request-Response tracking code Largely based on similar routines in 
+ * Updates and corrections:
+ * Copyright 2011, Anders Broman <anders.broman@ericsson.com>
+ *
+ * PDCP PDU number extension header support added by Martin Isaksson <martin.isaksson@ericsson.com>
+ *
+ * Control Plane Request-Response tracking code Largely based on similar routines in
  * packet-ldap.c by Ronnie Sahlberg
  * Added by Kari Tiirikainen <kari.tiirikainen@nsn.com>
  *
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * Ref: 3GPP TS 29.060 version 6.8.0 Release 6
+ * Ref: 3GPP TS 29.060
+ * http://www.3gpp.org/ftp/Specs/html-info/29060.htm
+ * GTP' 3GPP TS 32.295
  */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <glib.h>
-
 #include <epan/conversation.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>
 #include <epan/sminmpec.h>
 #include <epan/asn1.h>
 #include <epan/tap.h>
-#include "packet-ipv6.h"
 #include "packet-ppp.h"
 #include "packet-radius.h"
 #include "packet-bssap.h"
 #include "packet-gsm_a_common.h"
 #include "packet-gsm_map.h"
+#include "packet-gprscdr.h"
 #include "packet-per.h"
 #include "packet-ranap.h"
 #include "packet-bssgp.h"
+#include "packet-e212.h"
 #include "packet-gtp.h"
 
 static dissector_table_t ppp_subdissector_table;
+static dissector_table_t gtp_priv_ext_dissector_table;
+static dissector_table_t gtp_cdr_fmt_dissector_table;
 
-#define GTPv0_PORT 3386
-#define GTPv1C_PORT 2123       /* 3G Control PDU */
-#define GTPv1U_PORT 2152       /* 3G T-PDU */
+#define GTPv0_PORT  3386
+#define GTPv1C_PORT 2123    /* 3G Control PDU */
+#define GTPv1U_PORT 2152    /* 3G T-PDU */
 
-#define GTPv0_HDR_LENGTH 20
-#define GTPv1_HDR_LENGTH 12
-#define GTP_PRIME_HDR_LENGTH 6
+#define GTPv0_HDR_LENGTH     20
+#define GTPv1_HDR_LENGTH     12
+#define GTP_PRIME_HDR_LENGTH  6
 
 /* to check compliance with ETSI  */
-#define GTP_MANDATORY  1
-#define GTP_OPTIONAL   2
-#define GTP_CONDITIONAL        4
+#define GTP_MANDATORY   1
+#define GTP_OPTIONAL    2
+#define GTP_CONDITIONAL 4
 
 static gboolean g_gtp_over_tcp = TRUE;
-static guint g_gtpv0_port = GTPv0_PORT;
+static guint g_gtpv0_port  = GTPv0_PORT;
 static guint g_gtpv1c_port = GTPv1C_PORT;
 static guint g_gtpv1u_port = GTPv1U_PORT;
 
@@ -105,10 +111,16 @@ static int hf_gtp_chrg_ipv6 = -1;
 static int hf_gtp_ext_flow_label = -1;
 static int hf_gtp_ext_id = -1;
 static int hf_gtp_ext_val = -1;
+static int hf_gtp_ext_hdr = -1;
+static int hf_gtp_ext_hdr_next = -1;
+static int hf_gtp_ext_hdr_length = -1;
+static int hf_gtp_ext_hdr_pdcpsn = -1;
 static int hf_gtp_flags = -1;
 static int hf_gtp_flags_ver = -1;
+static int hf_gtp_prime_flags_ver = -1;
 static int hf_gtp_flags_pt = -1;
 static int hf_gtp_flags_spare1 = -1;
+static int hf_gtp_flags_hdr_length = -1;
 static int hf_gtp_flags_snn = -1;
 static int hf_gtp_flags_spare2 = -1;
 static int hf_gtp_flags_e = -1;
@@ -164,8 +176,6 @@ static int hf_gtp_rab_gtpu_dn = -1;
 static int hf_gtp_rab_gtpu_up = -1;
 static int hf_gtp_rab_pdu_dn = -1;
 static int hf_gtp_rab_pdu_up = -1;
-static int hf_gtp_rai_mcc = -1;
-static int hf_gtp_rai_mnc = -1;
 static int hf_gtp_rai_rac = -1;
 static int hf_gtp_rai_lac = -1;
 static int hf_gtp_ranap_cause = -1;
@@ -215,8 +225,16 @@ static int hf_gtp_ext_sac = -1;
 static int hf_gtp_ext_imeisv = -1;
 static int hf_gtp_targetRNC_ID = -1;
 static int hf_gtp_bssgp_cause = -1;
+static int hf_gtp_bssgp_ra_discriminator = -1;
 static int hf_gtp_sapi = -1;
 static int hf_gtp_xid_par_len = -1;
+static int hf_gtp_earp_pvi = -1;
+static int hf_gtp_earp_pl = -1;
+static int hf_gtp_earp_pci = -1;
+static int hf_gtp_cdr_app = -1;
+static int hf_gtp_cdr_rel = -1;
+static int hf_gtp_cdr_ver = -1;
+static int hf_gtp_spare = -1;
 static int hf_gtp_cmn_flg_ppc = -1;
 static int hf_gtp_cmn_flg_mbs_srv_type = -1;
 static int hf_gtp_cmn_flg_mbs_ran_pcd_rdy = -1;
@@ -234,11 +252,15 @@ static int hf_gtp_time_2_dta_tr = -1;
 static int hf_gtp_ext_ei = -1;
 static int hf_gtp_ext_gcsi = -1;
 static int hf_gtp_ext_dti = -1;
+static int hf_gtp_ra_prio_lcs = -1;
+static int hf_gtp_bcm = -1;
+static int hf_gtp_rim_routing_addr = -1;
 
 /* Initialize the subtree pointers */
 static gint ett_gtp = -1;
 static gint ett_gtp_flags = -1;
 static gint ett_gtp_ext = -1;
+static gint ett_gtp_ext_hdr = -1;
 static gint ett_gtp_rai = -1;
 static gint ett_gtp_qos = -1;
 static gint ett_gtp_auth_tri = -1;
@@ -304,15 +326,24 @@ static gint ett_gtp_ext_ra_prio_lcs = -1;
 static gint ett_gtp_ext_ps_handover_xid = -1;
 static gint ett_gtp_target_id = -1;
 static gint ett_gtp_utran_cont = -1;
+static gint ett_gtp_bcm = -1;
+static gint ett_gtp_cdr_ver = -1;
+static gint ett_gtp_cdr_dr = -1;
+static gint ett_gtp_uli_rai = -1;
 
 static gboolean g_gtp_tpdu = TRUE;
 static gboolean g_gtp_etsi_order = FALSE;
 
-static int gtp_tap = -1;    
+static int gtp_tap = -1;
 
 /* Definition of flags masks */
 #define GTP_VER_MASK 0xE0
 
+static const true_false_string gtp_hdr_length_vals = {
+    "6-Octet Header",
+    "20-Octet Header"
+};
+
 static const value_string ver_types[] = {
     {0, "GTP release 97/98 version"},
     {1, "GTP release 99 version"},
@@ -331,252 +362,435 @@ static const value_string pt_types[] = {
     {0, NULL}
 };
 
-#define GTP_PT_MASK                    0x10
-#define GTP_SPARE1_MASK                0x0E
-#define GTP_SPARE2_MASK                0x08
-#define GTP_E_MASK                     0x04
-#define GTP_S_MASK                     0x02
-#define GTP_SNN_MASK           0x01
-#define GTP_PN_MASK                    0x01
+#define GTP_PT_MASK         0x10
+#define GTP_SPARE1_MASK     0x0E
+#define GTP_SPARE2_MASK     0x08
+#define GTP_E_MASK          0x04
+#define GTP_S_MASK          0x02
+#define GTP_SNN_MASK        0x01
+#define GTP_PN_MASK         0x01
+
+#define GTP_EXT_HDR_PDCP_SN 0xC0
 
 static const value_string next_extension_header_fieldvals[] = {
-    {0, "No more extension headers"},
-    {1, "MBMS support indication"},
-    {2, "MS Info Change Reporting support indication"},
-    {0xc0, "PDCP PDU number"},
+    {   0, "No more extension headers"},
+    {   1, "MBMS support indication"},
+    {   2, "MS Info Change Reporting support indication"},
+    {GTP_EXT_HDR_PDCP_SN, "PDCP PDU number"},
     {0xc1, "Suspend Request"},
     {0xc2, "Suspend Response"},
     {0, NULL}
 };
 
 /* Definition of 3G charging characteristics masks */
-#define GTP_MASK_CHRG_CHAR_S   0xF000
-#define GTP_MASK_CHRG_CHAR_N   0x0800
-#define GTP_MASK_CHRG_CHAR_P   0x0400
-#define GTP_MASK_CHRG_CHAR_F   0x0200
-#define GTP_MASK_CHRG_CHAR_H   0x0100
-#define GTP_MASK_CHRG_CHAR_R   0x00FF
+#define GTP_MASK_CHRG_CHAR_S    0xF000
+#define GTP_MASK_CHRG_CHAR_N    0x0800
+#define GTP_MASK_CHRG_CHAR_P    0x0400
+#define GTP_MASK_CHRG_CHAR_F    0x0200
+#define GTP_MASK_CHRG_CHAR_H    0x0100
+#define GTP_MASK_CHRG_CHAR_R    0x00FF
 
 /* Traffic Flow Templates  mask */
-#define GTPv1_TFT_CODE_MASK    0xE0
-#define GTPv1_TFT_SPARE_MASK   0x10
-#define GTPv1_TFT_NUMBER_MASK  0x0F
+#define GTPv1_TFT_CODE_MASK 0xE0
+#define GTPv1_TFT_SPARE_MASK    0x10
+#define GTPv1_TFT_NUMBER_MASK   0x0F
 
 /* Definition of GSN Address masks */
-#define GTP_EXT_GSN_ADDR_TYPE_MASK             0xC0
-#define GTP_EXT_GSN_ADDR_LEN_MASK              0x3F
+#define GTP_EXT_GSN_ADDR_TYPE_MASK      0xC0
+#define GTP_EXT_GSN_ADDR_LEN_MASK       0x3F
 
 /* Definition of QoS masks */
-#define GTP_EXT_QOS_SPARE1_MASK                                        0xC0
-#define GTP_EXT_QOS_DELAY_MASK                                 0x38
-#define GTP_EXT_QOS_RELIABILITY_MASK                   0x07
-#define GTP_EXT_QOS_PEAK_MASK                                  0xF0
-#define GTP_EXT_QOS_SPARE2_MASK                                        0x08
-#define GTP_EXT_QOS_PRECEDENCE_MASK                            0x07
-#define GTP_EXT_QOS_SPARE3_MASK                                        0xE0
-#define GTP_EXT_QOS_MEAN_MASK                                  0x1F
-#define GTP_EXT_QOS_TRAF_CLASS_MASK                            0xE0
-#define GTP_EXT_QOS_DEL_ORDER_MASK                             0x18
-#define GTP_EXT_QOS_DEL_ERR_SDU_MASK                   0x07
-#define GTP_EXT_QOS_RES_BER_MASK                               0xF0
-#define GTP_EXT_QOS_SDU_ERR_RATIO_MASK                 0x0F
-#define GTP_EXT_QOS_TRANS_DELAY_MASK                   0xFC
-#define GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK   0x03
+#define GTP_EXT_QOS_SPARE1_MASK                 0xC0
+#define GTP_EXT_QOS_DELAY_MASK                  0x38
+#define GTP_EXT_QOS_RELIABILITY_MASK            0x07
+#define GTP_EXT_QOS_PEAK_MASK                   0xF0
+#define GTP_EXT_QOS_SPARE2_MASK                 0x08
+#define GTP_EXT_QOS_PRECEDENCE_MASK             0x07
+#define GTP_EXT_QOS_SPARE3_MASK                 0xE0
+#define GTP_EXT_QOS_MEAN_MASK                   0x1F
+#define GTP_EXT_QOS_TRAF_CLASS_MASK             0xE0
+#define GTP_EXT_QOS_DEL_ORDER_MASK              0x18
+#define GTP_EXT_QOS_DEL_ERR_SDU_MASK            0x07
+#define GTP_EXT_QOS_RES_BER_MASK                0xF0
+#define GTP_EXT_QOS_SDU_ERR_RATIO_MASK          0x0F
+#define GTP_EXT_QOS_TRANS_DELAY_MASK            0xFC
+#define GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK    0x03
+#define GTP_EXT_QOS_SRC_STAT_DESC_MASK          0x0F
+#define GTP_EXT_QOS_SIG_IND_MASK                0x10
 
 /* Definition of Radio Priority's masks */
-#define GTPv1_EXT_RP_NSAPI_MASK                        0xF0
-#define GTPv1_EXT_RP_SPARE_MASK                        0x08
-#define GTPv1_EXT_RP_MASK                              0x07
-
-static const value_string message_type[] = {
-    {GTP_MSG_UNKNOWN, "For future use"},
-    {GTP_MSG_ECHO_REQ, "Echo request"},
-    {GTP_MSG_ECHO_RESP, "Echo response"},
-    {GTP_MSG_VER_NOT_SUPP, "Version not supported"},
-    {GTP_MSG_NODE_ALIVE_REQ, "Node alive request"},
-    {GTP_MSG_NODE_ALIVE_RESP, "Node alive response"},
-    {GTP_MSG_REDIR_REQ, "Redirection request"},
-    {GTP_MSG_REDIR_RESP, "Redirection response"},
-    {GTP_MSG_CREATE_PDP_REQ, "Create PDP context request"},
-    {GTP_MSG_CREATE_PDP_RESP, "Create PDP context response"},
-    {GTP_MSG_UPDATE_PDP_REQ, "Update PDP context request"},
-    {GTP_MSG_UPDATE_PDP_RESP, "Update PDP context response"},
-    {GTP_MSG_DELETE_PDP_REQ, "Delete PDP context request"},
-    {GTP_MSG_DELETE_PDP_RESP, "Delete PDP context response"},
-    {GTP_MSG_CREATE_AA_PDP_REQ, "Create AA PDP Context Request"},
-    {GTP_MSG_CREATE_AA_PDP_RESP, "Create AA PDP Context Response"},
-    {GTP_MSG_DELETE_AA_PDP_REQ, "Delete AA PDP Context Request"},
-    {GTP_MSG_DELETE_AA_PDP_RESP, "Delete AA PDP Context Response"},
-    {GTP_MSG_ERR_IND, "Error indication"},
-    {GTP_MSG_PDU_NOTIFY_REQ, "PDU notification request"},
-    {GTP_MSG_PDU_NOTIFY_RESP, "PDU notification response"},
-    {GTP_MSG_PDU_NOTIFY_REJ_REQ, "PDU notification reject request"},
+#define GTPv1_EXT_RP_NSAPI_MASK         0xF0
+#define GTPv1_EXT_RP_SPARE_MASK         0x08
+#define GTPv1_EXT_RP_MASK               0x07
+
+static const value_string gtp_message_type[] = {
+    {GTP_MSG_UNKNOWN,             "For future use"},
+    {GTP_MSG_ECHO_REQ,            "Echo request"},
+    {GTP_MSG_ECHO_RESP,           "Echo response"},
+    {GTP_MSG_VER_NOT_SUPP,        "Version not supported"},
+    {GTP_MSG_NODE_ALIVE_REQ,      "Node alive request"},
+    {GTP_MSG_NODE_ALIVE_RESP,     "Node alive response"},
+    {GTP_MSG_REDIR_REQ,           "Redirection request"},
+    {GTP_MSG_REDIR_RESP,          "Redirection response"},
+    /*
+     * 8-15 For future use. Shall not be sent. If received,
+     * shall be treated as an Unknown message.
+     */
+#if 0
+    {   8,                        "Unknown message(For future use)"},
+    {   9,                        "Unknown message(For future use)"},
+    {  10,                        "Unknown message(For future use)"},
+    {  11,                        "Unknown message(For future use)"},
+    {  12,                        "Unknown message(For future use)"},
+    {  13,                        "Unknown message(For future use)"},
+    {  14,                        "Unknown message(For future use)"},
+    {  15,                        "Unknown message(For future use)"},
+#endif
+    {GTP_MSG_CREATE_PDP_REQ,      "Create PDP context request"},
+    {GTP_MSG_CREATE_PDP_RESP,     "Create PDP context response"},
+    {GTP_MSG_UPDATE_PDP_REQ,      "Update PDP context request"},
+    {GTP_MSG_UPDATE_PDP_RESP,     "Update PDP context response"},
+    {GTP_MSG_DELETE_PDP_REQ,      "Delete PDP context request"},
+    {GTP_MSG_DELETE_PDP_RESP,     "Delete PDP context response"},
+    {GTP_MSG_INIT_PDP_CONTEXT_ACT_REQ,   "Initiate PDP Context Activation Request"},
+    {GTP_MSG_INIT_PDP_CONTEXT_ACT_RESP,  "Initiate PDP Context Activation Response"},
+/*
+ * 24-25 For future use. Shall not be sent. If received,
+ * shall be treated as an Unknown message.
+ */
+    {GTP_MSG_DELETE_AA_PDP_REQ,   "Delete AA PDP Context Request"},
+    {GTP_MSG_DELETE_AA_PDP_RESP,  "Delete AA PDP Context Response"},
+    {GTP_MSG_ERR_IND,             "Error indication"},
+    {GTP_MSG_PDU_NOTIFY_REQ,      "PDU notification request"},
+    {GTP_MSG_PDU_NOTIFY_RESP,     "PDU notification response"},
+    {GTP_MSG_PDU_NOTIFY_REJ_REQ,  "PDU notification reject request"},
     {GTP_MSG_PDU_NOTIFY_REJ_RESP, "PDU notification reject response"},
-    {GTP_MSG_SUPP_EXT_HDR, "Supported extension header notification"},
-    {GTP_MSG_SEND_ROUT_INFO_REQ, "Send routing information for GPRS request"},
+    {GTP_MSG_SUPP_EXT_HDR,        "Supported extension header notification"},
+    {GTP_MSG_SEND_ROUT_INFO_REQ,  "Send routing information for GPRS request"},
     {GTP_MSG_SEND_ROUT_INFO_RESP, "Send routing information for GPRS response"},
-    {GTP_MSG_FAIL_REP_REQ, "Failure report request"},
-    {GTP_MSG_FAIL_REP_RESP, "Failure report response"},
-    {GTP_MSG_MS_PRESENT_REQ, "Note MS GPRS present request"},
-    {GTP_MSG_MS_PRESENT_RESP, "Note MS GPRS present response"},
-    {GTP_MSG_IDENT_REQ, "Identification request"},
-    {GTP_MSG_IDENT_RESP, "Identification response"},
-    {GTP_MSG_SGSN_CNTXT_REQ, "SGSN context request"},
-    {GTP_MSG_SGSN_CNTXT_RESP, "SGSN context response"},
-    {GTP_MSG_SGSN_CNTXT_ACK, "SGSN context acknowledgement"},
-    {GTP_MSG_FORW_RELOC_REQ, "Forward relocation request"},
-    {GTP_MSG_FORW_RELOC_RESP, "Forward relocation response"},
-    {GTP_MSG_FORW_RELOC_COMP, "Forward relocation complete"},
-    {GTP_MSG_RELOC_CANCEL_REQ, "Relocation cancel request"},
-    {GTP_MSG_RELOC_CANCEL_RESP, "Relocation cancel response"},
-    {GTP_MSG_FORW_SRNS_CNTXT, "Forward SRNS context"},
-    {GTP_MSG_FORW_RELOC_ACK, "Forward relocation complete acknowledge"},
+    {GTP_MSG_FAIL_REP_REQ,        "Failure report request"},
+    {GTP_MSG_FAIL_REP_RESP,       "Failure report response"},
+    {GTP_MSG_MS_PRESENT_REQ,      "Note MS GPRS present request"},
+    {GTP_MSG_MS_PRESENT_RESP,     "Note MS GPRS present response"},
+    /* 38-47 For future use. Shall not be sent. If received,
+     * shall be treated as an Unknown message.
+     */
+#if 0
+    {  38,                        "Unknown message(For future use)"},
+    {  39,                        "Unknown message(For future use)"},
+    {  40,                        "Unknown message(For future use)"},
+    {  41,                        "Unknown message(For future use)"},
+    {  42,                        "Unknown message(For future use)"},
+    {  43,                        "Unknown message(For future use)"},
+    {  44,                        "Unknown message(For future use)"},
+    {  45,                        "Unknown message(For future use)"},
+    {  46,                        "Unknown message(For future use)"},
+    {  47,                        "Unknown message(For future use)"},
+#endif
+    {GTP_MSG_IDENT_REQ,           "Identification request"},
+    {GTP_MSG_IDENT_RESP,          "Identification response"},
+    {GTP_MSG_SGSN_CNTXT_REQ,      "SGSN context request"},
+    {GTP_MSG_SGSN_CNTXT_RESP,     "SGSN context response"},
+    {GTP_MSG_SGSN_CNTXT_ACK,      "SGSN context acknowledgement"},
+    {GTP_MSG_FORW_RELOC_REQ,      "Forward relocation request"},
+    {GTP_MSG_FORW_RELOC_RESP,     "Forward relocation response"},
+    {GTP_MSG_FORW_RELOC_COMP,     "Forward relocation complete"},
+    {GTP_MSG_RELOC_CANCEL_REQ,    "Relocation cancel request"},
+    {GTP_MSG_RELOC_CANCEL_RESP,   "Relocation cancel response"},
+    {GTP_MSG_FORW_SRNS_CNTXT,     "Forward SRNS context"},
+    {GTP_MSG_FORW_RELOC_ACK,      "Forward relocation complete acknowledge"},
     {GTP_MSG_FORW_SRNS_CNTXT_ACK, "Forward SRNS context acknowledge"},
-    {GTP_MSG_RAN_INFO_RELAY, "RAN Information Relay"},
-    {GTP_MBMS_NOTIFY_REQ, "MBMS Notification Request"},
-    {GTP_MBMS_NOTIFY_RES, "MBMS Notification Response"},
-    {GTP_MBMS_NOTIFY_REJ_REQ, "MBMS Notification Reject Request"},
-    {GTP_MBMS_NOTIFY_REJ_RES, "MBMS Notification Reject Response"},
-    {GTP_CREATE_MBMS_CNTXT_REQ, "Create MBMS Context Request"},
-    {GTP_CREATE_MBMS_CNTXT_RES, "Create MBMS Context Response"},
-    {GTP_UPD_MBMS_CNTXT_REQ, "Update MBMS Context Request"},
-    {GTP_UPD_MBMS_CNTXT_RES, "Update MBMS Context Response"},
-    {GTP_DEL_MBMS_CNTXT_REQ, "Delete MBMS Context Request"},
-    {GTP_DEL_MBMS_CNTXT_RES, "Delete MBMS Context Response"},
-    {GTP_MBMS_REG_REQ, "MBMS Registration Request"},
-    {GTP_MBMS_REG_RES, "MBMS Registration Response"},
-    {GTP_MBMS_DE_REG_REQ, "MBMS De-Registration Request"},
-    {GTP_MBMS_DE_REG_RES, "MBMS De-Registration Response"},
-    {GTP_MBMS_SES_START_REQ, "MBMS Session Start Request"},
-    {GTP_MBMS_SES_START_RES, "MBMS Session Start Response"},
-    {GTP_MBMS_SES_STOP_REQ, "MBMS Session Stop Request"},
-    {GTP_MBMS_SES_STOP_RES, "MBMS Session Stop Response"},
-    {GTP_MBMS_SES_UPD_REQ, "MBMS Session Update Request"},
-    {GTP_MBMS_SES_UPD_RES, "MBMS Session Update Response"},
-/* 122-127     For future use. Shall not be sent. 
- * If received, shall be treated as an Unknown message.
- */
-    {GTP_MS_INFO_CNG_NOT_REQ, "MS Info Change Notification Request"},
-    {GTP_MS_INFO_CNG_NOT_RES, "MS Info Change Notification Response"},
-    {GTP_MSG_DATA_TRANSF_REQ, "Data record transfer request"},
-    {GTP_MSG_DATA_TRANSF_RESP, "Data record transfer response"},
-    {GTP_MSG_TPDU, "T-PDU"},
+    /* 61-69 For future use. Shall not be sent. If received,
+     * shall be treated as an Unknown message.
+     */
+#if 0
+    {  61,                        "Unknown message(For future use)"},
+    {  62,                        "Unknown message(For future use)"},
+    {  63,                        "Unknown message(For future use)"},
+    {  64,                        "Unknown message(For future use)"},
+    {  65,                        "Unknown message(For future use)"},
+    {  66,                        "Unknown message(For future use)"},
+    {  67,                        "Unknown message(For future use)"},
+    {  68,                        "Unknown message(For future use)"},
+    {  69,                        "Unknown message(For future use)"},
+#endif
+    {GTP_MSG_RAN_INFO_RELAY,      "RAN Information Relay"},
+    /* 71-95 For future use. Shall not be sent. If received,
+     * shall be treated as an Unknown message.
+     */
+#if 0
+    {  71,                        "Unknown message(For future use)"},
+    {  72,                        "Unknown message(For future use)"},
+    {  73,                        "Unknown message(For future use)"},
+    {  74,                        "Unknown message(For future use)"},
+    {  75,                        "Unknown message(For future use)"},
+    {  76,                        "Unknown message(For future use)"},
+    {  77,                        "Unknown message(For future use)"},
+    {  78,                        "Unknown message(For future use)"},
+    {  79,                        "Unknown message(For future use)"},
+    {  80,                        "Unknown message(For future use)"},
+    {  81,                        "Unknown message(For future use)"},
+    {  82,                        "Unknown message(For future use)"},
+    {  83,                        "Unknown message(For future use)"},
+    {  84,                        "Unknown message(For future use)"},
+    {  85,                        "Unknown message(For future use)"},
+    {  86,                        "Unknown message(For future use)"},
+    {  87,                        "Unknown message(For future use)"},
+    {  88,                        "Unknown message(For future use)"},
+    {  89,                        "Unknown message(For future use)"},
+    {  90,                        "Unknown message(For future use)"},
+    {  91,                        "Unknown message(For future use)"},
+    {  92,                        "Unknown message(For future use)"},
+    {  93,                        "Unknown message(For future use)"},
+    {  94,                        "Unknown message(For future use)"},
+    {  95,                        "Unknown message(For future use)"},
+#endif
+    {GTP_MBMS_NOTIFY_REQ,         "MBMS Notification Request"},
+    {GTP_MBMS_NOTIFY_RES,         "MBMS Notification Response"},
+    {GTP_MBMS_NOTIFY_REJ_REQ,     "MBMS Notification Reject Request"},
+    {GTP_MBMS_NOTIFY_REJ_RES,     "MBMS Notification Reject Response"},
+    {GTP_CREATE_MBMS_CNTXT_REQ,   "Create MBMS Context Request"},
+    {GTP_CREATE_MBMS_CNTXT_RES,   "Create MBMS Context Response"},
+    {GTP_UPD_MBMS_CNTXT_REQ,      "Update MBMS Context Request"},
+    {GTP_UPD_MBMS_CNTXT_RES,      "Update MBMS Context Response"},
+    {GTP_DEL_MBMS_CNTXT_REQ,      "Delete MBMS Context Request"},
+    {GTP_DEL_MBMS_CNTXT_RES,      "Delete MBMS Context Response"},
+    /* 106 - 111 For future use. Shall not be sent. If received,
+     * shall be treated as an Unknown message.
+     */
+#if 0
+    {  106,                       "Unknown message(For future use)"},
+    {  107,                       "Unknown message(For future use)"},
+    {  108,                       "Unknown message(For future use)"},
+    {  109,                       "Unknown message(For future use)"},
+    {  110,                       "Unknown message(For future use)"},
+    {  111,                       "Unknown message(For future use)"},
+#endif
+    {GTP_MBMS_REG_REQ,            "MBMS Registration Request"},
+    {GTP_MBMS_REG_RES,            "MBMS Registration Response"},
+    {GTP_MBMS_DE_REG_REQ,         "MBMS De-Registration Request"},
+    {GTP_MBMS_DE_REG_RES,         "MBMS De-Registration Response"},
+    {GTP_MBMS_SES_START_REQ,      "MBMS Session Start Request"},
+    {GTP_MBMS_SES_START_RES,      "MBMS Session Start Response"},
+    {GTP_MBMS_SES_STOP_REQ,       "MBMS Session Stop Request"},
+    {GTP_MBMS_SES_STOP_RES,       "MBMS Session Stop Response"},
+    {GTP_MBMS_SES_UPD_REQ,        "MBMS Session Update Request"},
+    {GTP_MBMS_SES_UPD_RES,        "MBMS Session Update Response"},
+    /* 122-127 For future use. Shall not be sent.
+     * If received, shall be treated as an Unknown message.
+     */
+#if 0
+    {  122,                       "Unknown message(For future use)"},
+    {  123,                       "Unknown message(For future use)"},
+    {  124,                       "Unknown message(For future use)"},
+    {  125,                       "Unknown message(For future use)"},
+    {  126,                       "Unknown message(For future use)"},
+    {  127,                       "Unknown message(For future use)"},
+#endif
+       {GTP_MS_INFO_CNG_NOT_REQ,     "MS Info Change Notification Request"},
+    {GTP_MS_INFO_CNG_NOT_RES,     "MS Info Change Notification Response"},
+    /* 130-239 For future use. Shall not be sent. If received,
+     * shall be treated as an Unknown message.
+     */
+#if 0
+    {  130,                       "Unknown message(For future use)"},
+    {  131,                       "Unknown message(For future use)"},
+    {  132,                       "Unknown message(For future use)"},
+    {  133,                       "Unknown message(For future use)"},
+    {  134,                       "Unknown message(For future use)"},
+    {  135,                       "Unknown message(For future use)"},
+    {  136,                       "Unknown message(For future use)"},
+    {  137,                       "Unknown message(For future use)"},
+    {  138,                       "Unknown message(For future use)"},
+    {  139,                       "Unknown message(For future use)"},
+    {  140,                       "Unknown message(For future use)"},
+    {  141,                       "Unknown message(For future use)"},
+    {  142,                       "Unknown message(For future use)"},
+    {  143,                       "Unknown message(For future use)"},
+    {  144,                       "Unknown message(For future use)"},
+    {  145,                       "Unknown message(For future use)"},
+    {  146,                       "Unknown message(For future use)"},
+    {  147,                       "Unknown message(For future use)"},
+    {  148,                       "Unknown message(For future use)"},
+    {  149,                       "Unknown message(For future use)"},
+    {  150,                       "Unknown message(For future use)"},
+    {  151,                       "Unknown message(For future use)"},
+    {  152,                       "Unknown message(For future use)"},
+    {  153,                       "Unknown message(For future use)"},
+    {  154,                       "Unknown message(For future use)"},
+    {  155,                       "Unknown message(For future use)"},
+    {  156,                       "Unknown message(For future use)"},
+    {  157,                       "Unknown message(For future use)"},
+    {  158,                       "Unknown message(For future use)"},
+    {  159,                       "Unknown message(For future use)"},
+#endif
+    {GTP_MSG_DATA_TRANSF_REQ,     "Data record transfer request"},
+    {GTP_MSG_DATA_TRANSF_RESP,    "Data record transfer response"},
+    /* 242-253 For future use. Shall not be sent. If received,
+     * shall be treated as an Unknown message.
+     */
+#if 0
+    {  242,                       "Unknown message(For future use)"},
+    {  243,                       "Unknown message(For future use)"},
+    {  244,                       "Unknown message(For future use)"},
+    {  245,                       "Unknown message(For future use)"},
+    {  246,                       "Unknown message(For future use)"},
+    {  247,                       "Unknown message(For future use)"},
+    {  248,                       "Unknown message(For future use)"},
+    {  249,                       "Unknown message(For future use)"},
+    {  250,                       "Unknown message(For future use)"},
+    {  251,                       "Unknown message(For future use)"},
+    {  252,                       "Unknown message(For future use)"},
+    {  253,                       "Unknown message(For future use)"},
+#endif
+    {GTP_MSG_END_MARKER,          "End Marker"},
+    {GTP_MSG_TPDU,                "T-PDU"},
     {0, NULL}
 };
+static value_string_ext gtp_message_type_ext = VALUE_STRING_EXT_INIT(gtp_message_type);
 
 /* definitions of fields in extension header */
-#define GTP_EXT_CAUSE          0x01
-#define GTP_EXT_IMSI           0x02
-#define GTP_EXT_RAI                    0x03
-#define GTP_EXT_TLLI           0x04
-#define GTP_EXT_PTMSI          0x05
-#define GTP_EXT_QOS_GPRS       0x06
-#define GTP_EXT_REORDER                0x08
-#define GTP_EXT_AUTH_TRI       0x09
-#define GTP_EXT_MAP_CAUSE      0x0B
-#define GTP_EXT_PTMSI_SIG      0x0C
-#define GTP_EXT_MS_VALID       0x0D
-#define GTP_EXT_RECOVER                0x0E
-#define GTP_EXT_SEL_MODE       0x0F
-
-#define GTP_EXT_16                     0x10
-#define GTP_EXT_FLOW_LABEL     0x10
-#define GTP_EXT_TEID           0x10    /* 0xFF10 3G */
-
-#define GTP_EXT_17                     0x11
-#define GTP_EXT_FLOW_SIG       0x11
-#define GTP_EXT_TEID_CP                0x11    /* 0xFF11 3G */
-
-#define GTP_EXT_18                     0x12
-#define GTP_EXT_FLOW_II                0x12
-#define GTP_EXT_TEID_II                0x12    /* 0xFF12 3G */
-
-#define GTP_EXT_19                     0x13
-#define GTP_EXT_MS_REASON      0x13    /* same as 0x1D GTPv1_EXT_MS_REASON */
-#define GTP_EXT_TEAR_IND       0x13    /* 0xFF13 3G */
-
-#define GTP_EXT_NSAPI          0x14    /* 3G */
-#define GTP_EXT_RANAP_CAUSE    0x15    /* 3G */
-#define GTP_EXT_RAB_CNTXT      0x16    /* 3G */
-#define GTP_EXT_RP_SMS         0x17    /* 3G */
-#define GTP_EXT_RP                     0x18    /* 3G */
-#define GTP_EXT_PKT_FLOW_ID    0x19    /* 3G */
-#define GTP_EXT_CHRG_CHAR      0x1A    /* 3G */
-#define GTP_EXT_TRACE_REF      0x1B    /* 3G */
-#define GTP_EXT_TRACE_TYPE     0x1C    /* 3G */
-#define GTPv1_EXT_MS_REASON    0x1D    /* 3G */
-#define GTP_EXT_TR_COMM                0x7E    /* charging */
-#define GTP_EXT_CHRG_ID                0x7F
-#define GTP_EXT_USER_ADDR      0x80
-#define GTP_EXT_MM_CNTXT       0x81
-#define GTP_EXT_PDP_CNTXT      0x82
-#define GTP_EXT_APN                    0x83
-#define GTP_EXT_PROTO_CONF     0x84
-#define GTP_EXT_GSN_ADDR       0x85
-#define GTP_EXT_MSISDN         0x86
-#define GTP_EXT_QOS_UMTS       0x87    /* 3G */
-#define GTP_EXT_AUTH_QUI       0x88    /* 3G */
-#define GTP_EXT_TFT                    0x89    /* 3G */
-#define GTP_EXT_TARGET_ID      0x8A    /* 3G */
-#define GTP_EXT_UTRAN_CONT     0x8B    /* 3G */
-#define GTP_EXT_RAB_SETUP      0x8C    /* 3G */
-#define GTP_EXT_HDR_LIST       0x8D    /* 3G */
-#define GTP_EXT_TRIGGER_ID     0x8E    /* 3G   142 7.7.41 */
-#define GTP_EXT_OMC_ID         0x8F    /* 3G   143 TLV OMC Identity 7.7.42 */
-#define GTP_EXT_RAN_TR_CONT                    0x90    /* 3G   144 TLV RAN Transparent Container 7.7.43 */
-#define GTP_EXT_PDP_CONT_PRIO          0x91    /* 3G   145 TLV PDP Context Prioritization 7.7.45 */
-#define GTP_EXT_ADD_RAB_SETUP_INF      0x92    /* 3G   146 TLV Additional RAB Setup Information 7.7.45A */
-#define GTP_EXT_SSGN_NO                                0x93    /* 3G   147 TLV SGSN Number 7.7.47 */
-#define GTP_EXT_COMMON_FLGS                    0x94    /* 3G   148 TLV Common Flags 7.7.48 */
-#define GTP_EXT_APN_RES                                0x95    /* 3G   149 */
-#define GTP_EXT_RA_PRIO_LCS                    0x96    /* 3G   150 TLV Radio Priority LCS 7.7.25B */
-#define GTP_EXT_RAT_TYPE                       0x97    /* 3G   151 TLV RAT Type 7.7.50 */
-#define GTP_EXT_USR_LOC_INF                    0x98    /* 3G   152 TLV User Location Information 7.7.51 */
-#define GTP_EXT_MS_TIME_ZONE           0x99    /* 3G   153 TLV MS Time Zone 7.7.52 */
-
-#define GTP_EXT_IMEISV                         0x9A    /* 3G */
-#define GTP_EXT_CAMEL_CHG_INF_CON      0x9B    /* 3G   155 TLV CAMEL Charging Information Container 7.7.54 */
-#define GTP_EXT_MBMS_UE_CTX                    0x9C    /* 3G   156 TLV MBMS UE Context 7.7.55 */
-#define GTP_EXT_TMGI                           0x9D    /* 3G   157 TLV Temporary Mobile Group Identity (TMGI) 7.7.56 */
-#define GTP_EXT_RIM_RA                         0x9E    /* 3G   158 TLV RIM Routing Address 7.7.57 */
-#define GTP_EXT_MBMS_PROT_CONF_OPT     0x9F    /* 3G   159 TLV MBMS Protocol Configuration Options 7.7.58 */
-#define GTP_EXT_MBMS_SA                                0xA0    /* 3G   160 TLV MBMS Service Area 7.7.60 */
-#define GTP_EXT_SRC_RNC_PDP_CTX_INF 0xA1       /* 3G   161 TLV Source RNC PDCP context info 7.7.61 */
-#define GTP_EXT_ADD_TRS_INF                    0xA2    /* 3G   162 TLV Additional Trace Info 7.7.62 */
-#define GTP_EXT_HOP_COUNT                      0xA3    /* 3G   163 TLV Hop Counter 7.7.63 */
-#define GTP_EXT_SEL_PLMN_ID                    0xA4    /* 3G   164 TLV Selected PLMN ID 7.7.64 */
-#define GTP_EXT_MBMS_SES_ID                    0xA5    /* 3G   165 TLV MBMS Session Identifier 7.7.65 */
-#define GTP_EXT_MBMS_2G_3G_IND         0xA6    /* 3G   166 TLV MBMS 2G/3G Indicator 7.7.66 */
-#define GTP_EXT_ENH_NSAPI                      0xA7    /* 3G   167 TLV Enhanced NSAPI 7.7.67 */
-#define GTP_EXT_MBMS_SES_DUR           0xA8    /* 3G   168 TLV MBMS Session Duration 7.7.59 */
-#define GTP_EXT_ADD_MBMS_TRS_INF       0xA9    /* 3G   169 TLV Additional MBMS Trace Info 7.7.68 */
-#define GTP_EXT_MBMS_SES_ID_REP_NO     0xAA    /* 3G   170 TLV MBMS Session Identity Repetition Number 7.7.69 */
-#define GTP_EXT_MBMS_TIME_TO_DATA_TR 0xAB      /* 3G   171 TLV MBMS Time To Data Transfer 7.7.70 */
-#define GTP_EXT_PS_HO_REQ_CTX          0xAC    /* 3G   172 TLV PS Handover Request Context 7.7.71 */
-#define GTP_EXT_BSS_CONT                       0xAD    /* 3G   173 TLV BSS Container 7.7.72 */
-#define GTP_EXT_CELL_ID                                0xAE    /* 3G   174 TLV Cell Identification 7.7.73 */
-#define GTP_EXT_PDU_NO                         0xAF    /* 3G   175 TLV PDU Numbers 7.7.74 */
-#define GTP_EXT_BSSGP_CAUSE                    0xB0    /* 3G   176 TLV BSSGP Cause 7.7.75 */
-#define GTP_EXT_REQ_MBMS_BEARER_CAP 0xB1       /* 3G   177 TLV Required MBMS bearer capabilities       7.7.76 */
-#define GTP_EXT_RIM_ROUTING_ADDR_DISC 0xB2     /* 3G   178 TLV RIM Routing Address Discriminator       7.7.77 */
-#define GTP_EXT_LIST_OF_SETUP_PFCS     0xB3    /* 3G   179 TLV List of set-up PFCs     7.7.78 */
-#define GTP_EXT_PS_HANDOVER_XIP_PAR 0xB4       /* 3G   180 TLV PS Handover XID Parameters      7.7.79 */
-#define GTP_EXT_MS_INF_CHG_REP_ACT     0xB5    /* 3G   181 TLV MS Info Change Reporting Action 7.7.80 */
-#define GTP_EXT_DIRECT_TUNNEL_FLGS     0xB6    /* 3G   182 TLV Direct Tunnel Flags     7.7.81 */
-#define GTP_EXT_CORRELATION_ID         0xB7    /* 3G   183 TLV Correlation-ID  7.7.82 */
-#define GTP_EXT_BEARER_CONTROL_MODE 0xB8       /* 3G   184 TLV Bearer Control Mode     7.7.83 */
-/* 239-250     Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33])*/
-
-#define GTP_EXT_C1                     0xC1
-#define GTP_EXT_C2                     0xC2
-#define GTP_EXT_REL_PACK       0xF9    /* charging */
-#define GTP_EXT_CAN_PACK       0xFA    /* charging */
-#define GTP_EXT_CHRG_ADDR      0xFB    /* 3G   251     TLV     Charging Gateway Address        7.7.44 */
-/* 252-254     Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33])*/
-#define GTP_EXT_DATA_REQ       0xFC    /* charging */
-#define GTP_EXT_DATA_RESP      0xFD    /* charging */
-#define GTP_EXT_NODE_ADDR      0xFE    /* charging */
-#define GTP_EXT_PRIV_EXT       0xFF
+#define GTP_EXT_CAUSE                 0x01
+#define GTP_EXT_IMSI                  0x02
+#define GTP_EXT_RAI                   0x03
+#define GTP_EXT_TLLI                  0x04
+#define GTP_EXT_PTMSI                 0x05
+#define GTP_EXT_QOS_GPRS              0x06
+#define GTP_EXT_REORDER               0x08
+#define GTP_EXT_AUTH_TRI              0x09
+#define GTP_EXT_MAP_CAUSE             0x0B
+#define GTP_EXT_PTMSI_SIG             0x0C
+#define GTP_EXT_MS_VALID              0x0D
+#define GTP_EXT_RECOVER               0x0E
+#define GTP_EXT_SEL_MODE              0x0F
+
+#define GTP_EXT_16                    0x10
+#define GTP_EXT_FLOW_LABEL            0x10
+#define GTP_EXT_TEID                  0x10    /* 0xFF10 3G */
+
+#define GTP_EXT_17                    0x11
+#define GTP_EXT_FLOW_SIG              0x11
+#define GTP_EXT_TEID_CP               0x11    /* 0xFF11 3G */
+
+#define GTP_EXT_18                    0x12
+#define GTP_EXT_FLOW_II               0x12
+#define GTP_EXT_TEID_II               0x12    /* 0xFF12 3G */
+
+#define GTP_EXT_19                    0x13    /* 19 TV Teardown Ind 7.7.16 */
+#define GTP_EXT_MS_REASON             0x13    /* same as 0x1D GTPv1_EXT_MS_REASON */
+#define GTP_EXT_TEAR_IND              0x13    /* 0xFF13 3G */
+
+#define GTP_EXT_NSAPI                 0x14    /* 3G */
+#define GTP_EXT_RANAP_CAUSE           0x15    /* 3G */
+#define GTP_EXT_RAB_CNTXT             0x16    /* 3G */
+#define GTP_EXT_RP_SMS                0x17    /* 3G */
+#define GTP_EXT_RP                    0x18    /* 3G */
+#define GTP_EXT_PKT_FLOW_ID           0x19    /* 3G */
+#define GTP_EXT_CHRG_CHAR             0x1A    /* 3G */
+#define GTP_EXT_TRACE_REF             0x1B    /* 3G */
+#define GTP_EXT_TRACE_TYPE            0x1C    /* 3G */
+#define GTPv1_EXT_MS_REASON           0x1D    /* 3G 29 TV MS Not Reachable Reason 7.7.25A */
+/* 117-126 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
+#define GTP_EXT_TR_COMM               0x7E    /* charging */
+#define GTP_EXT_CHRG_ID               0x7F    /* 127 TV Charging ID 7.7.26 */
+#define GTP_EXT_USER_ADDR             0x80
+#define GTP_EXT_MM_CNTXT              0x81
+#define GTP_EXT_PDP_CNTXT             0x82
+#define GTP_EXT_APN                   0x83
+#define GTP_EXT_PROTO_CONF            0x84
+#define GTP_EXT_GSN_ADDR              0x85
+#define GTP_EXT_MSISDN                0x86
+#define GTP_EXT_QOS_UMTS              0x87    /* 3G */
+#define GTP_EXT_AUTH_QUI              0x88    /* 3G */
+#define GTP_EXT_TFT                   0x89    /* 3G */
+#define GTP_EXT_TARGET_ID             0x8A    /* 3G */
+#define GTP_EXT_UTRAN_CONT            0x8B    /* 3G */
+#define GTP_EXT_RAB_SETUP             0x8C    /* 3G */
+#define GTP_EXT_HDR_LIST              0x8D    /* 3G */
+#define GTP_EXT_TRIGGER_ID            0x8E    /* 3G   142 7.7.41 */
+#define GTP_EXT_OMC_ID                0x8F    /* 3G   143 TLV OMC Identity 7.7.42 */
+#define GTP_EXT_RAN_TR_CONT           0x90    /* 3G   144 TLV RAN Transparent Container 7.7.43 */
+#define GTP_EXT_PDP_CONT_PRIO         0x91    /* 3G   145 TLV PDP Context Prioritization 7.7.45 */
+#define GTP_EXT_ADD_RAB_SETUP_INF     0x92    /* 3G   146 TLV Additional RAB Setup Information 7.7.45A */
+#define GTP_EXT_SSGN_NO               0x93    /* 3G   147 TLV SGSN Number 7.7.47 */
+#define GTP_EXT_COMMON_FLGS           0x94    /* 3G   148 TLV Common Flags 7.7.48 */
+#define GTP_EXT_APN_RES               0x95    /* 3G   149 */
+#define GTP_EXT_RA_PRIO_LCS           0x96    /* 3G   150 TLV Radio Priority LCS 7.7.25B */
+#define GTP_EXT_RAT_TYPE              0x97    /* 3G   151 TLV RAT Type 7.7.50 */
+#define GTP_EXT_USR_LOC_INF           0x98    /* 3G   152 TLV User Location Information 7.7.51 */
+#define GTP_EXT_MS_TIME_ZONE          0x99    /* 3G   153 TLV MS Time Zone 7.7.52 */
+#define GTP_EXT_IMEISV                0x9A    /* 3G   154 TLV IMEI(SV) 7.7.53 */
+#define GTP_EXT_CAMEL_CHG_INF_CON     0x9B    /* 3G   155 TLV CAMEL Charging Information Container 7.7.54 */
+#define GTP_EXT_MBMS_UE_CTX           0x9C    /* 3G   156 TLV MBMS UE Context 7.7.55 */
+#define GTP_EXT_TMGI                  0x9D    /* 3G   157 TLV Temporary Mobile Group Identity (TMGI) 7.7.56 */
+#define GTP_EXT_RIM_RA                0x9E    /* 3G   158 TLV RIM Routing Address 7.7.57 */
+#define GTP_EXT_MBMS_PROT_CONF_OPT    0x9F    /* 3G   159 TLV MBMS Protocol Configuration Options 7.7.58 */
+#define GTP_EXT_MBMS_SA               0xA0    /* 3G   160 TLV MBMS Service Area 7.7.60 */
+#define GTP_EXT_SRC_RNC_PDP_CTX_INF   0xA1    /* 3G   161 TLV Source RNC PDCP context info 7.7.61 */
+#define GTP_EXT_ADD_TRS_INF           0xA2    /* 3G   162 TLV Additional Trace Info 7.7.62 */
+#define GTP_EXT_HOP_COUNT             0xA3    /* 3G   163 TLV Hop Counter 7.7.63 */
+#define GTP_EXT_SEL_PLMN_ID           0xA4    /* 3G   164 TLV Selected PLMN ID 7.7.64 */
+#define GTP_EXT_MBMS_SES_ID           0xA5    /* 3G   165 TLV MBMS Session Identifier 7.7.65 */
+#define GTP_EXT_MBMS_2G_3G_IND        0xA6    /* 3G   166 TLV MBMS 2G/3G Indicator 7.7.66 */
+#define GTP_EXT_ENH_NSAPI             0xA7    /* 3G   167 TLV Enhanced NSAPI 7.7.67 */
+#define GTP_EXT_MBMS_SES_DUR          0xA8    /* 3G   168 TLV MBMS Session Duration 7.7.59 */
+#define GTP_EXT_ADD_MBMS_TRS_INF      0xA9    /* 3G   169 TLV Additional MBMS Trace Info 7.7.68 */
+#define GTP_EXT_MBMS_SES_ID_REP_NO    0xAA    /* 3G   170 TLV MBMS Session Identity Repetition Number 7.7.69 */
+#define GTP_EXT_MBMS_TIME_TO_DATA_TR  0xAB    /* 3G   171 TLV MBMS Time To Data Transfer 7.7.70 */
+#define GTP_EXT_PS_HO_REQ_CTX         0xAC    /* 3G   172 TLV PS Handover Request Context 7.7.71 */
+#define GTP_EXT_BSS_CONT              0xAD    /* 3G   173 TLV BSS Container 7.7.72 */
+#define GTP_EXT_CELL_ID               0xAE    /* 3G   174 TLV Cell Identification 7.7.73 */
+#define GTP_EXT_PDU_NO                0xAF    /* 3G   175 TLV PDU Numbers 7.7.74 */
+#define GTP_EXT_BSSGP_CAUSE           0xB0    /* 3G   176 TLV BSSGP Cause 7.7.75 */
+#define GTP_EXT_REQ_MBMS_BEARER_CAP   0xB1    /* 3G   177 TLV Required MBMS bearer capabilities       7.7.76 */
+#define GTP_EXT_RIM_ROUTING_ADDR_DISC 0xB2    /* 3G   178 TLV RIM Routing Address Discriminator       7.7.77 */
+#define GTP_EXT_LIST_OF_SETUP_PFCS    0xB3    /* 3G   179 TLV List of set-up PFCs     7.7.78 */
+#define GTP_EXT_PS_HANDOVER_XIP_PAR   0xB4    /* 3G   180 TLV PS Handover XID Parameters      7.7.79 */
+#define GTP_EXT_MS_INF_CHG_REP_ACT    0xB5    /* 3G   181 TLV MS Info Change Reporting Action 7.7.80 */
+#define GTP_EXT_DIRECT_TUNNEL_FLGS    0xB6    /* 3G   182 TLV Direct Tunnel Flags     7.7.81 */
+#define GTP_EXT_CORRELATION_ID        0xB7    /* 3G   183 TLV Correlation-ID  7.7.82 */
+#define GTP_EXT_BEARER_CONTROL_MODE   0xB8    /* 3G   184 TLV Bearer Control Mode     7.7.83 */
+                                              /* 3G   185 TLV MBMS Flow Identifier    7.7.84 */
+                                              /* 3G   186 TLV MBMS IP Multicast Distribution    7.7.85 */
+                                              /* 3G   187 TLV MBMS Distribution Acknowledgement 7.7.86 */
+                                              /* 3G   188 TLV Reliable INTER RAT HANDOVER INFO  7.7.87 */
+                                              /* 3G   189 TLV RFSP Index        7.7.88 */
+                                              /* 3G   190 TLV Fully Qualified Domain Name (FQDN)        7.7.90 */
+#define GTP_EXT_EVO_ALLO_RETE_P1      0xBF    /* 3G   191 TLV Evolved Allocation/Retention Priority I   7.7.91 */
+                                              /* 3G   192 TLV Evolved Allocation/Retention Priority II  7.7.92 */
+                                              /* 3G   193 TLV Extended Common Flags     7.7.93 */
+                                              /* 3G   194 TLV User CSG Information (UCI)        7.7.94 */
+                                              /* 3G   195 TLV CSG Information Reporting Action  7.7.95 */
+                                              /* 3G   196 TLV CSG ID    7.7.96 */
+                                              /* 3G   197 TLV CSG Membership Indication (CMI)   7.7.97 */
+                                              /* 3G   198 TLV Aggregate Maximum Bit Rate (AMBR) 7.7.98 */
+                                              /* 3G   199 TLV UE Network Capability     7.7.99 */
+                                              /* 3G   200 TLV UE-AMBR   7.7.100 */
+                                              /* 3G   201 TLV APN-AMBR with NSAPI       7.7.101 */
+                                              /* 3G   202 TLV GGSN Back-Off Time 7.7.102 */
+                                              /* 3G   203 TLV Signalling Priority Indication 7.7.103 */
+                                              /* 3G   204 TLV Signalling Priority Indication with NSAPI 7.7.104 */
+                                              /* 3G   205 TLV Higher bitrates than 16 Mbps flag 7.7.105 */
+                                              /* 3G   206 TLV Max MBR/APN-AMBR 7.7.106 */
+                                              /* 3G   207 TLV Additional MM context for SRVCC 7.7.107 */
+                                              /* 3G   208 TLV Additional flags for SRVCC 7.7.108  */
+                                              /* 3G   209 TLV STN-SR 7.7.109  */
+                                              /* 3G   210 TLV C-MSISDN 7.7.110  */
+                                              /* 3G   211 TLV Extended RANAP Cause 7.7.111  */
+                                              /*  212-238 TLV Spare. For future use.     */
+
+/* 239-250  Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33])*/
+
+#define GTP_EXT_C1                    0xC1
+#define GTP_EXT_C2                    0xC2
+#define GTP_EXT_REL_PACK              0xF9    /* charging */
+#define GTP_EXT_CAN_PACK              0xFA    /* charging */
+#define GTP_EXT_CHRG_ADDR             0xFB    /* 3G   251     TLV     Charging Gateway Address        7.7.44 */
+/* 252-254  Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33])*/
+#define GTP_EXT_DATA_REQ              0xFC    /* charging */
+#define GTP_EXT_DATA_RESP             0xFD    /* charging */
+#define GTP_EXT_NODE_ADDR             0xFE    /* charging */
+#define GTP_EXT_PRIV_EXT              0xFF
 
 static const value_string gtp_val[] = {
     {GTP_EXT_CAUSE, "Cause of operation"},
@@ -584,43 +798,46 @@ static const value_string gtp_val[] = {
     {GTP_EXT_RAI, "Routing Area Identity"},
     {GTP_EXT_TLLI, "Temporary Logical Link Identity"},
     {GTP_EXT_PTMSI, "Packet TMSI"},
-    {GTP_EXT_QOS_GPRS, "Quality of Service"},
-    {GTP_EXT_REORDER, "Reorder required"},
-    {GTP_EXT_AUTH_TRI, "Authentication triplets"},
-    {GTP_EXT_MAP_CAUSE, "MAP cause"},
-    {GTP_EXT_PTMSI_SIG, "P-TMSI signature"},
-    {GTP_EXT_MS_VALID, "MS validated"},
-    {GTP_EXT_RECOVER, "Recovery"},
-    {GTP_EXT_SEL_MODE, "Selection mode"},
-
-    {GTP_EXT_16, "Flow label data I"},
-    {GTP_EXT_FLOW_LABEL, "Flow label data I"},
-    {GTP_EXT_TEID, "Tunnel Endpoint Identifier Data I"},       /* 3G */
+/*   6 */  {GTP_EXT_QOS_GPRS, "Quality of Service"},
+    /* 6-7 Spare */
+/*   8 */  {GTP_EXT_REORDER, "Reorder required"},
+/*   9 */  {GTP_EXT_AUTH_TRI, "Authentication triplets"},
+       /* 10 Spare */
+/*  11 */  {GTP_EXT_MAP_CAUSE, "MAP cause"},
+/*  12 */  {GTP_EXT_PTMSI_SIG, "P-TMSI signature"},
+/*  13 */  {GTP_EXT_MS_VALID, "MS validated"},
+/*  14 */  {GTP_EXT_RECOVER, "Recovery"},
+/*  15 */  {GTP_EXT_SEL_MODE, "Selection mode"},
+
+/*  16 */  {GTP_EXT_16, "Flow label data I"},
+/*  16 */  {GTP_EXT_FLOW_LABEL, "Flow label data I"},
+/*  16 */  {GTP_EXT_TEID, "Tunnel Endpoint Identifier Data I"},    /* 3G */
 
     {GTP_EXT_17, "Flow label signalling"},
     {GTP_EXT_FLOW_SIG, "Flow label signalling"},
-    {GTP_EXT_TEID_CP, "Tunnel Endpoint Identifier Data Control Plane"},        /* 3G */
+    {GTP_EXT_TEID_CP, "Tunnel Endpoint Identifier Data Control Plane"}, /* 3G */
 
     {GTP_EXT_18, "Flow label data II"},
     {GTP_EXT_FLOW_II, "Flow label data II"},
-    {GTP_EXT_TEID_II, "Tunnel Endpoint Identifier Data II"},   /* 3G */
+    {GTP_EXT_TEID_II, "Tunnel Endpoint Identifier Data II"},    /* 3G */
 
     {GTP_EXT_19, "MS not reachable reason"},
     {GTP_EXT_MS_REASON, "MS not reachable reason"},
-    {GTP_EXT_TEAR_IND, "Teardown ID"}, /* 3G */
-
-    {GTP_EXT_NSAPI, "NSAPI"},  /* 3G */
-    {GTP_EXT_RANAP_CAUSE, "RANAP cause"},      /* 3G */
-    {GTP_EXT_RAB_CNTXT, "RAB context"},        /* 3G */
-    {GTP_EXT_RP_SMS, "Radio Priority for MO SMS"},     /* 3G */
-    {GTP_EXT_RP, "Radio Priority"},    /* 3G */
-    {GTP_EXT_PKT_FLOW_ID, "Packet Flow ID"},   /* 3G */
-    {GTP_EXT_CHRG_CHAR, "Charging characteristics"},   /* 3G */
-    {GTP_EXT_TRACE_REF, "Trace references"},   /* 3G */
-    {GTP_EXT_TRACE_TYPE, "Trace type"},        /* 3G */
-    {GTPv1_EXT_MS_REASON, "MS not reachable reason"},  /* 3G */
-    {GTP_EXT_TR_COMM, "Packet transfer command"},      /* charging */
-    {GTP_EXT_CHRG_ID, "Charging ID"},
+    {GTP_EXT_TEAR_IND, "Teardown ID"},  /* 3G */
+
+    {GTP_EXT_NSAPI, "NSAPI"},   /* 3G */
+    {GTP_EXT_RANAP_CAUSE, "RANAP cause"},   /* 3G */
+    {GTP_EXT_RAB_CNTXT, "RAB context"}, /* 3G */
+    {GTP_EXT_RP_SMS, "Radio Priority for MO SMS"},  /* 3G */
+    {GTP_EXT_RP, "Radio Priority"}, /* 3G */
+    {GTP_EXT_PKT_FLOW_ID, "Packet Flow ID"},    /* 3G */
+    {GTP_EXT_CHRG_CHAR, "Charging characteristics"},    /* 3G */
+    {GTP_EXT_TRACE_REF, "Trace references"},    /* 3G */
+    {GTP_EXT_TRACE_TYPE, "Trace type"}, /* 3G */
+/*  29 */  {GTPv1_EXT_MS_REASON, "MS not reachable reason"},   /* 3G */
+    /* 117-126 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
+/* 126 */  {GTP_EXT_TR_COMM, "Packet transfer command"},   /* charging */
+/* 127 */  {GTP_EXT_CHRG_ID, "Charging ID"},
     {GTP_EXT_USER_ADDR, "End user address"},
     {GTP_EXT_MM_CNTXT, "MM context"},
     {GTP_EXT_PDP_CNTXT, "PDP context"},
@@ -628,183 +845,272 @@ static const value_string gtp_val[] = {
     {GTP_EXT_PROTO_CONF, "Protocol configuration options"},
     {GTP_EXT_GSN_ADDR, "GSN address"},
     {GTP_EXT_MSISDN, "MS international PSTN/ISDN number"},
-    {GTP_EXT_QOS_UMTS, "Quality of service (UMTS)"},   /* 3G */
-    {GTP_EXT_AUTH_QUI, "Authentication quintuplets"},  /* 3G */
-    {GTP_EXT_TFT, "Traffic Flow Template (TFT)"},      /* 3G */
-    {GTP_EXT_TARGET_ID, "Target (RNC) identification"},        /* 3G */
-    {GTP_EXT_UTRAN_CONT, "UTRAN transparent field"},   /* 3G */
-    {GTP_EXT_RAB_SETUP, "RAB setup information"},      /* 3G */
-    {GTP_EXT_HDR_LIST, "Extension Header Types List"}, /* 3G */
-    {GTP_EXT_TRIGGER_ID, "Trigger Id"},        /* 3G */
-    {GTP_EXT_OMC_ID, "OMC Identity"},  /* 3G */
-
-    {GTP_EXT_RAN_TR_CONT, "RAN Transparent Container"},        /* 7.7.43 */
-    {GTP_EXT_PDP_CONT_PRIO, "PDP Context Prioritization"},     /* 7.7.45 */
-    {GTP_EXT_ADD_RAB_SETUP_INF, "Additional RAB Setup Information"},   /* 7.7.45A */
-    {GTP_EXT_SSGN_NO, "SGSN Number"},  /* 7.7.47 */
-    {GTP_EXT_COMMON_FLGS, "Common Flags"},     /* 7.7.48 */
-    {GTP_EXT_APN_RES, "APN Restriction"},      /* 3G */
-    {GTP_EXT_RA_PRIO_LCS, "Radio Priority LCS"},       /* 7.7.25B */
-    {GTP_EXT_RAT_TYPE, "RAT Type"},    /* 3G */
-    {GTP_EXT_USR_LOC_INF, "User Location Information"},        /* 7.7.51 */
-    {GTP_EXT_MS_TIME_ZONE, "MS Time Zone"},    /* 7.7.52 */
-
-    {GTP_EXT_IMEISV, "IMEI(SV)"},      /* 3G */
-    {GTP_EXT_CAMEL_CHG_INF_CON, "CAMEL Charging Information Container"},       /* 7.7.54 */
-    {GTP_EXT_MBMS_UE_CTX, "MBMS UE Context"},  /* 7.7.55 */
-    {GTP_EXT_TMGI, "Temporary Mobile Group Identity (TMGI)"},  /* 7.7.56 */
-    {GTP_EXT_RIM_RA, "RIM Routing Address"},   /* 7.7.57 */
-    {GTP_EXT_MBMS_PROT_CONF_OPT, "MBMS Protocol Configuration Options"},       /* 7.7.58 */
-    {GTP_EXT_MBMS_SA, "MBMS Service Area"},    /* 7.7.60 */
-    {GTP_EXT_SRC_RNC_PDP_CTX_INF, "Source RNC PDCP context info"},     /* 7.7.61 */
-    {GTP_EXT_ADD_TRS_INF, "Additional Trace Info"},    /* 7.7.62 */
-    {GTP_EXT_HOP_COUNT, "Hop Counter"},        /* 7.7.63 */
-    {GTP_EXT_SEL_PLMN_ID, "Selected PLMN ID"}, /* 7.7.64 */
-    {GTP_EXT_MBMS_SES_ID, "MBMS Session Identifier"},  /* 7.7.65 */
-    {GTP_EXT_MBMS_2G_3G_IND, "MBMS 2G/3G Indicator"},  /* 7.7.66 */
-    {GTP_EXT_ENH_NSAPI, "Enhanced NSAPI"},     /* 7.7.67 */
-    {GTP_EXT_MBMS_SES_DUR, "MBMS Session Duration"},   /* 7.7.59 */
-    {GTP_EXT_ADD_MBMS_TRS_INF, "Additional MBMS Trace Info"},  /* 7.7.68 */
-    {GTP_EXT_MBMS_SES_ID_REP_NO, "MBMS Session Identity Repetition Number"},   /* 7.7.69 */
-    {GTP_EXT_MBMS_TIME_TO_DATA_TR, "MBMS Time To Data Transfer"},      /* 7.7.70 */
-    {GTP_EXT_PS_HO_REQ_CTX, "PS Handover Request Context"},    /* 7.7.71 */
-    {GTP_EXT_BSS_CONT, "BSS Container"},       /* 7.7.72 */
-    {GTP_EXT_CELL_ID, "Cell Identification"},  /* 7.7.73 */
-    {GTP_EXT_PDU_NO, "PDU Numbers"},   /* 7.7.74 */
-    {GTP_EXT_BSSGP_CAUSE, "BSSGP Cause"},      /* 7.7.75 */
-    {GTP_EXT_REQ_MBMS_BEARER_CAP, "Required MBMS bearer capabilities"},        /* 7.7.76 */
-    {GTP_EXT_RIM_ROUTING_ADDR_DISC, "RIM Routing Address Discriminator"},      /* 7.7.77 */
-    {GTP_EXT_LIST_OF_SETUP_PFCS, "List of set-up PFCs"},       /* 7.7.78 */
-    {GTP_EXT_PS_HANDOVER_XIP_PAR, "PS Handover XID Parameters"},       /* 7.7.79 */
-    {GTP_EXT_MS_INF_CHG_REP_ACT, "MS Info Change Reporting Action"},   /* 7.7.80 */
-    {GTP_EXT_DIRECT_TUNNEL_FLGS, "Direct Tunnel Flags"},       /* 7.7.81 */
-    {GTP_EXT_CORRELATION_ID, "Correlation-ID"},        /* 7.7.82 */
-    {GTP_EXT_BEARER_CONTROL_MODE, "Bearer Control Mode"},      /* 7.7.83 */
-    {GTP_EXT_REL_PACK, "Sequence numbers of released packets IE"},     /* charging */
-    {GTP_EXT_CAN_PACK, "Sequence numbers of canceled packets IE"},     /* charging */
-    {GTP_EXT_CHRG_ADDR, "Charging Gateway address"},
-    {GTP_EXT_DATA_REQ, "Data record packet"},  /* charging */
-    {GTP_EXT_DATA_RESP, "Requests responded"}, /* charging */
-    {GTP_EXT_NODE_ADDR, "Address of recommended node"},        /* charging */
-    {GTP_EXT_PRIV_EXT, "Private Extension"},
+    {GTP_EXT_QOS_UMTS, "Quality of service (UMTS)"},    /* 3G */
+    {GTP_EXT_AUTH_QUI, "Authentication quintuplets"},   /* 3G */
+    {GTP_EXT_TFT, "Traffic Flow Template (TFT)"},   /* 3G */
+    {GTP_EXT_TARGET_ID, "Target (RNC) identification"}, /* 3G */
+    {GTP_EXT_UTRAN_CONT, "UTRAN transparent field"},    /* 3G */
+    {GTP_EXT_RAB_SETUP, "RAB setup information"},   /* 3G */
+    {GTP_EXT_HDR_LIST, "Extension Header Types List"},  /* 3G */
+    {GTP_EXT_TRIGGER_ID, "Trigger Id"}, /* 3G */
+    {GTP_EXT_OMC_ID, "OMC Identity"},   /* 3G */
+
+    {GTP_EXT_RAN_TR_CONT, "RAN Transparent Container"}, /* 7.7.43 */
+    {GTP_EXT_PDP_CONT_PRIO, "PDP Context Prioritization"},  /* 7.7.45 */
+    {GTP_EXT_ADD_RAB_SETUP_INF, "Additional RAB Setup Information"},    /* 7.7.45A */
+    {GTP_EXT_SSGN_NO, "SGSN Number"},   /* 7.7.47 */
+    {GTP_EXT_COMMON_FLGS, "Common Flags"},  /* 7.7.48 */
+    {GTP_EXT_APN_RES, "APN Restriction"},   /* 3G */
+    {GTP_EXT_RA_PRIO_LCS, "Radio Priority LCS"},    /* 7.7.25B */
+    {GTP_EXT_RAT_TYPE, "RAT Type"}, /* 3G */
+    {GTP_EXT_USR_LOC_INF, "User Location Information"}, /* 7.7.51 */
+    {GTP_EXT_MS_TIME_ZONE, "MS Time Zone"}, /* 7.7.52 */
+
+    {GTP_EXT_IMEISV, "IMEI(SV)"},   /* 3G */
+    {GTP_EXT_CAMEL_CHG_INF_CON, "CAMEL Charging Information Container"},    /* 7.7.54 */
+    {GTP_EXT_MBMS_UE_CTX, "MBMS UE Context"},   /* 7.7.55 */
+    {GTP_EXT_TMGI, "Temporary Mobile Group Identity (TMGI)"},   /* 7.7.56 */
+    {GTP_EXT_RIM_RA, "RIM Routing Address"},    /* 7.7.57 */
+    {GTP_EXT_MBMS_PROT_CONF_OPT, "MBMS Protocol Configuration Options"},    /* 7.7.58 */
+    {GTP_EXT_MBMS_SA, "MBMS Service Area"}, /* 7.7.60 */
+    {GTP_EXT_SRC_RNC_PDP_CTX_INF, "Source RNC PDCP context info"},  /* 7.7.61 */
+    {GTP_EXT_ADD_TRS_INF, "Additional Trace Info"}, /* 7.7.62 */
+    {GTP_EXT_HOP_COUNT, "Hop Counter"}, /* 7.7.63 */
+    {GTP_EXT_SEL_PLMN_ID, "Selected PLMN ID"},  /* 7.7.64 */
+    {GTP_EXT_MBMS_SES_ID, "MBMS Session Identifier"},   /* 7.7.65 */
+    {GTP_EXT_MBMS_2G_3G_IND, "MBMS 2G/3G Indicator"},   /* 7.7.66 */
+    {GTP_EXT_ENH_NSAPI, "Enhanced NSAPI"},  /* 7.7.67 */
+    {GTP_EXT_MBMS_SES_DUR, "MBMS Session Duration"},    /* 7.7.59 */
+    {GTP_EXT_ADD_MBMS_TRS_INF, "Additional MBMS Trace Info"},   /* 7.7.68 */
+    {GTP_EXT_MBMS_SES_ID_REP_NO, "MBMS Session Identity Repetition Number"},    /* 7.7.69 */
+    {GTP_EXT_MBMS_TIME_TO_DATA_TR, "MBMS Time To Data Transfer"},   /* 7.7.70 */
+    {GTP_EXT_PS_HO_REQ_CTX, "PS Handover Request Context"}, /* 7.7.71 */
+    {GTP_EXT_BSS_CONT, "BSS Container"},    /* 7.7.72 */
+    {GTP_EXT_CELL_ID, "Cell Identification"},   /* 7.7.73 */
+    {GTP_EXT_PDU_NO, "PDU Numbers"},    /* 7.7.74 */
+    {GTP_EXT_BSSGP_CAUSE, "BSSGP Cause"},   /* 7.7.75 */
+    {GTP_EXT_REQ_MBMS_BEARER_CAP, "Required MBMS bearer capabilities"}, /* 7.7.76 */
+    {GTP_EXT_RIM_ROUTING_ADDR_DISC, "RIM Routing Address Discriminator"},   /* 7.7.77 */
+    {GTP_EXT_LIST_OF_SETUP_PFCS, "List of set-up PFCs"},    /* 7.7.78 */
+    {GTP_EXT_PS_HANDOVER_XIP_PAR, "PS Handover XID Parameters"},    /* 7.7.79 */
+    {GTP_EXT_MS_INF_CHG_REP_ACT, "MS Info Change Reporting Action"},    /* 7.7.80 */
+    {GTP_EXT_DIRECT_TUNNEL_FLGS, "Direct Tunnel Flags"},    /* 7.7.81 */
+    {GTP_EXT_CORRELATION_ID, "Correlation-ID"}, /* 7.7.82 */
+    {GTP_EXT_BEARER_CONTROL_MODE, "Bearer Control Mode"},   /* 7.7.83 */
+    {185, "MBMS Flow Identifier"},   /* 7.7.84 */
+    {186, "MBMS IP Multicast Distribution"},   /* 7.7.85 */
+    {187, "MBMS Distribution Acknowledgement"},   /* 7.7.86 */
+    {188, "Reliable INTER RAT HANDOVER INFO"},   /* 7.7.87 */
+    {189, "RFSP Index"},   /* 7.7.88 */
+    {190, "Fully Qualified Domain Name (FQDN)"},   /* 7.7.90 */
+    {GTP_EXT_EVO_ALLO_RETE_P1, "Evolved Allocation/Retention Priority I"},   /* 7.7.91 */
+    {192, "Evolved Allocation/Retention Priority II"},   /* 7.7.92 */
+    {193, "Extended Common Flags"},   /* 7.7.93 */
+    {194, "User CSG Information (UCI)"},   /* 7.7.94 */
+    {195, "CSG Information Reporting Action"},   /* 7.7.95 */
+    {196, "CSG ID"},   /* 7.7.96 */
+    {197, "CSG Membership Indication (CMI)"},   /* 7.7.97 */
+    {198, "Aggregate Maximum Bit Rate (AMBR)"},   /* 7.7.98 */
+    {199, "UE Network Capability"},   /* 7.7.99 */
+    {200, "UE-AMBR"},   /* 7.7.100 */
+    {201, "APN-AMBR with NSAPI"},   /* 7.7.101 */
+    {202, "GGSN Back-Off Time"},   /* 7.7.102 */
+    {203, "Signalling Priority Indication"},   /* 7.7.103 */
+    {204, "Signalling Priority Indication with NSAPI"},   /* 7.7.104 */
+    {205, "Higher bitrates than 16 Mbps flag"},   /* 7.7.105  */
+    {206, "Max MBR/APN-AMBR"},   /* 7.7.106  */
+    {207, "Additional MM context for SRVCC"},   /* 7.7.107  */
+    {208, "Additional flags for SRVCC"},   /* 7.7.108  */
+    {209, "STN-SR"},   /* 7.7.109  */
+    {210, "C-MSISDN"},   /* 7.7.110  */
+    {211, "Extended RANAP Cause"},   /* 7.7.111  */
+       /* 212-238 TLV Spare. For future use. */
+       /* 239-250 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
+/* 249 */  {GTP_EXT_REL_PACK, "Sequence numbers of released packets IE"},  /* charging */
+/* 250 */  {GTP_EXT_CAN_PACK, "Sequence numbers of canceled packets IE"},  /* charging */
+/* 251 */  {GTP_EXT_CHRG_ADDR, "Charging Gateway address"}, /* 7.7.44 */
+       /* 252-254 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
+/* 252 */  {GTP_EXT_DATA_REQ, "Data record packet"},   /* charging */
+/* 253 */  {GTP_EXT_DATA_RESP, "Requests responded"},  /* charging */
+/* 254 */  {GTP_EXT_NODE_ADDR, "Address of recommended node"}, /* charging */
+/* 255 */  {GTP_EXT_PRIV_EXT, "Private Extension"},
     {0, NULL}
 };
+static value_string_ext gtp_val_ext = VALUE_STRING_EXT_INIT(gtp_val);
 
-/* It seems like some IE's are renamed in gtpv1 at least reading 
+/* It seems like some IE's are renamed in gtpv1 at least reading
  * 3GPP TS 29.060 version 6.11.0 Release 6
  */
 static const value_string gtpv1_val[] = {
-    {GTP_EXT_CAUSE, "Cause of operation"},
-    {GTP_EXT_IMSI, "IMSI"},
-    {GTP_EXT_RAI, "Routing Area Identity"},
-    {GTP_EXT_TLLI, "Temporary Logical Link Identity"},
-    {GTP_EXT_PTMSI, "Packet TMSI"},
-    {GTP_EXT_QOS_GPRS, "Quality of Service"},
-    {GTP_EXT_REORDER, "Reorder required"},
-    {GTP_EXT_AUTH_TRI, "Authentication triplets"},
-    {GTP_EXT_MAP_CAUSE, "MAP cause"},
-    {GTP_EXT_PTMSI_SIG, "P-TMSI signature"},
-    {GTP_EXT_MS_VALID, "MS validated"},
-    {GTP_EXT_RECOVER, "Recovery"},
-    {GTP_EXT_SEL_MODE, "Selection mode"},
-
-    {GTP_EXT_TEID, "Tunnel Endpoint Identifier Data I"},       /* 3G */
-
-    {GTP_EXT_TEID_CP, "Tunnel Endpoint Identifier Data Control Plane"},        /* 3G */
-
-    {GTP_EXT_TEID_II, "Tunnel Endpoint Identifier Data II"},   /* 3G */
-
-    {GTP_EXT_TEAR_IND, "Teardown ID"}, /* 3G */
-
-    {GTP_EXT_NSAPI, "NSAPI"},  /* 3G */
-    {GTP_EXT_RANAP_CAUSE, "RANAP cause"},      /* 3G */
-    {GTP_EXT_RAB_CNTXT, "RAB context"},        /* 3G */
-    {GTP_EXT_RP_SMS, "Radio Priority for MO SMS"},     /* 3G */
-    {GTP_EXT_RP, "Radio Priority"},    /* 3G */
-    {GTP_EXT_PKT_FLOW_ID, "Packet Flow ID"},   /* 3G */
-    {GTP_EXT_CHRG_CHAR, "Charging characteristics"},   /* 3G */
-    {GTP_EXT_TRACE_REF, "Trace references"},   /* 3G */
-    {GTP_EXT_TRACE_TYPE, "Trace type"},        /* 3G */
-    {GTPv1_EXT_MS_REASON, "MS not reachable reason"},  /* 3G */
-    {GTP_EXT_TR_COMM, "Packet transfer command"},      /* charging */
-    {GTP_EXT_CHRG_ID, "Charging ID"},
-    {GTP_EXT_USER_ADDR, "End user address"},
-    {GTP_EXT_MM_CNTXT, "MM context"},
-    {GTP_EXT_PDP_CNTXT, "PDP context"},
-    {GTP_EXT_APN, "Access Point Name"},
-    {GTP_EXT_PROTO_CONF, "Protocol configuration options"},
-    {GTP_EXT_GSN_ADDR, "GSN address"},
-    {GTP_EXT_MSISDN, "MS international PSTN/ISDN number"},
-    {GTP_EXT_QOS_UMTS, "Quality of service (UMTS)"},   /* 3G */
-    {GTP_EXT_AUTH_QUI, "Authentication quintuplets"},  /* 3G */
-    {GTP_EXT_TFT, "Traffic Flow Template (TFT)"},      /* 3G */
-    {GTP_EXT_TARGET_ID, "Target (RNC) identification"},        /* 3G */
-    {GTP_EXT_UTRAN_CONT, "UTRAN transparent field"},   /* 3G */
-    {GTP_EXT_RAB_SETUP, "RAB setup information"},      /* 3G */
-    {GTP_EXT_HDR_LIST, "Extension Header Types List"}, /* 3G */
-    {GTP_EXT_TRIGGER_ID, "Trigger Id"},        /* 3G */
-    {GTP_EXT_OMC_ID, "OMC Identity"},  /* 3G */
-
-    {GTP_EXT_RAN_TR_CONT, "RAN Transparent Container"},        /* 7.7.43 */
-    {GTP_EXT_PDP_CONT_PRIO, "PDP Context Prioritization"},     /* 7.7.45 */
-    {GTP_EXT_ADD_RAB_SETUP_INF, "Additional RAB Setup Information"},   /* 7.7.45A */
-    {GTP_EXT_SSGN_NO, "SGSN Number"},  /* 7.7.47 */
-    {GTP_EXT_COMMON_FLGS, "Common Flags"},     /* 7.7.48 */
-    {GTP_EXT_APN_RES, "APN Restriction"},      /* 3G */
-    {GTP_EXT_RA_PRIO_LCS, "Radio Priority LCS"},       /* 7.7.25B */
-    {GTP_EXT_RAT_TYPE, "RAT Type"},    /* 3G */
-    {GTP_EXT_USR_LOC_INF, "User Location Information"},        /* 7.7.51 */
-    {GTP_EXT_MS_TIME_ZONE, "MS Time Zone"},    /* 7.7.52 */
-
-    {GTP_EXT_IMEISV, "IMEI(SV)"},      /* 3G */
-    {GTP_EXT_CAMEL_CHG_INF_CON, "CAMEL Charging Information Container"},       /* 7.7.54 */
-    {GTP_EXT_MBMS_UE_CTX, "MBMS UE Context"},  /* 7.7.55 */
-    {GTP_EXT_TMGI, "Temporary Mobile Group Identity (TMGI)"},  /* 7.7.56 */
-    {GTP_EXT_RIM_RA, "RIM Routing Address"},   /* 7.7.57 */
-    {GTP_EXT_MBMS_PROT_CONF_OPT, "MBMS Protocol Configuration Options"},       /* 7.7.58 */
-    {GTP_EXT_MBMS_SA, "MBMS Service Area"},    /* 7.7.60 */
-    {GTP_EXT_SRC_RNC_PDP_CTX_INF, "Source RNC PDCP context info"},     /* 7.7.61 */
-    {GTP_EXT_ADD_TRS_INF, "Additional Trace Info"},    /* 7.7.62 */
-    {GTP_EXT_HOP_COUNT, "Hop Counter"},        /* 7.7.63 */
-    {GTP_EXT_SEL_PLMN_ID, "Selected PLMN ID"}, /* 7.7.64 */
-    {GTP_EXT_MBMS_SES_ID, "MBMS Session Identifier"},  /* 7.7.65 */
-    {GTP_EXT_MBMS_2G_3G_IND, "MBMS 2G/3G Indicator"},  /* 7.7.66 */
-    {GTP_EXT_ENH_NSAPI, "Enhanced NSAPI"},     /* 7.7.67 */
-    {GTP_EXT_MBMS_SES_DUR, "MBMS Session Duration"},   /* 7.7.59 */
-    {GTP_EXT_ADD_MBMS_TRS_INF, "Additional MBMS Trace Info"},  /* 7.7.68 */
-    {GTP_EXT_MBMS_SES_ID_REP_NO, "MBMS Session Identity Repetition Number"},   /* 7.7.69 */
-    {GTP_EXT_MBMS_TIME_TO_DATA_TR, "MBMS Time To Data Transfer"},      /* 7.7.70 */
-    {GTP_EXT_PS_HO_REQ_CTX, "PS Handover Request Context"},    /* 7.7.71 */
-    {GTP_EXT_BSS_CONT, "BSS Container"},       /* 7.7.72 */
-    {GTP_EXT_CELL_ID, "Cell Identification"},  /* 7.7.73 */
-    {GTP_EXT_PDU_NO, "PDU Numbers"},   /* 7.7.74 */
-    {GTP_EXT_BSSGP_CAUSE, "BSSGP Cause"},      /* 7.7.75 */
-    {GTP_EXT_REL_PACK, "Sequence numbers of released packets IE"},     /* charging */
-    {GTP_EXT_CAN_PACK, "Sequence numbers of canceled packets IE"},     /* charging */
-    {GTP_EXT_CHRG_ADDR, "Charging Gateway address"},
-    {GTP_EXT_DATA_REQ, "Data record packet"},  /* charging */
-    {GTP_EXT_DATA_RESP, "Requests responded"}, /* charging */
-    {GTP_EXT_NODE_ADDR, "Address of recommended node"},        /* charging */
-    {GTP_EXT_PRIV_EXT, "Private Extension"},
+/*   1 */  {GTP_EXT_CAUSE, "Cause of operation"},
+/*   2 */  {GTP_EXT_IMSI, "IMSI"},
+/*   3 */  {GTP_EXT_RAI, "Routing Area Identity"},
+/*   4 */  {GTP_EXT_TLLI, "Temporary Logical Link Identity"},
+/*   5 */  {GTP_EXT_PTMSI, "Packet TMSI"},
+/*   6 */  {GTP_EXT_QOS_GPRS, "Quality of Service"},
+    /* 6-7 Spare */
+/*   7 */  {7, "Spare"},
+/*   8 */  {GTP_EXT_REORDER, "Reorder required"},
+/*   9 */  {GTP_EXT_AUTH_TRI, "Authentication triplets"},
+       /* 10 Spare */
+/*  10 */  {10, "Spare"},
+/*  11 */  {GTP_EXT_MAP_CAUSE, "MAP cause"},
+/*  12 */  {GTP_EXT_PTMSI_SIG, "P-TMSI signature"},
+/*  13 */  {GTP_EXT_MS_VALID, "MS validated"},
+/*  14 */  {GTP_EXT_RECOVER, "Recovery"},
+/*  15 */  {GTP_EXT_SEL_MODE, "Selection mode"},
+/*  16 */  {GTP_EXT_TEID, "Tunnel Endpoint Identifier Data I"},    /* 3G */
+/*  17 */  {GTP_EXT_TEID_CP, "Tunnel Endpoint Identifier Data Control Plane"}, /* 3G */
+/*  18 */  {GTP_EXT_TEID_II, "Tunnel Endpoint Identifier Data II"},    /* 3G */
+/*  19 */  {GTP_EXT_TEAR_IND, "Teardown ID"},  /* 3G */
+
+/*  20 */  {GTP_EXT_NSAPI, "NSAPI"},   /* 3G */
+/*  21 */  {GTP_EXT_RANAP_CAUSE, "RANAP cause"},   /* 3G */
+/*  22 */  {GTP_EXT_RAB_CNTXT, "RAB context"}, /* 3G */
+/*  23 */  {GTP_EXT_RP_SMS, "Radio Priority for MO SMS"},  /* 3G */
+/*  24 */  {GTP_EXT_RP, "Radio Priority"}, /* 3G */
+/*  25 */  {GTP_EXT_PKT_FLOW_ID, "Packet Flow ID"},    /* 3G */
+/*  26 */  {GTP_EXT_CHRG_CHAR, "Charging characteristics"},    /* 3G */
+/*  27 */  {GTP_EXT_TRACE_REF, "Trace references"},    /* 3G */
+/*  28 */  {GTP_EXT_TRACE_TYPE, "Trace type"}, /* 3G */
+/*  29 */  {GTPv1_EXT_MS_REASON, "MS not reachable reason"},   /* 3G */
+    /* 117-126 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
+/* 126 */  {GTP_EXT_TR_COMM, "Packet transfer command"},   /* charging */
+/* 127 */  {GTP_EXT_CHRG_ID, "Charging ID"},
+
+/* 128 */  {GTP_EXT_USER_ADDR, "End user address"},
+/* 129 */  {GTP_EXT_MM_CNTXT, "MM context"},
+/* 130 */  {GTP_EXT_PDP_CNTXT, "PDP context"},
+/* 131 */  {GTP_EXT_APN, "Access Point Name"},
+/* 132 */  {GTP_EXT_PROTO_CONF, "Protocol configuration options"},
+/* 133 */  {GTP_EXT_GSN_ADDR, "GSN address"},
+/* 134 */  {GTP_EXT_MSISDN, "MS international PSTN/ISDN number"},
+/* 135 */  {GTP_EXT_QOS_UMTS, "Quality of service (UMTS)"},    /* 3G */
+/* 136 */  {GTP_EXT_AUTH_QUI, "Authentication quintuplets"},   /* 3G */
+/* 137 */  {GTP_EXT_TFT, "Traffic Flow Template (TFT)"},   /* 3G */
+/* 138 */  {GTP_EXT_TARGET_ID, "Target (RNC) identification"}, /* 3G */
+/* 139 */  {GTP_EXT_UTRAN_CONT, "UTRAN transparent field"},    /* 3G */
+/* 140 */  {GTP_EXT_RAB_SETUP, "RAB setup information"},   /* 3G */
+/* 141 */  {GTP_EXT_HDR_LIST, "Extension Header Types List"},  /* 3G */
+/* 142 */  {GTP_EXT_TRIGGER_ID, "Trigger Id"}, /* 3G */
+/* 143 */  {GTP_EXT_OMC_ID, "OMC Identity"},   /* 3G */
+/* 144 */  {GTP_EXT_RAN_TR_CONT, "RAN Transparent Container"}, /* 7.7.43 */
+/* 145 */  {GTP_EXT_PDP_CONT_PRIO, "PDP Context Prioritization"},  /* 7.7.45 */
+/* 146 */  {GTP_EXT_ADD_RAB_SETUP_INF, "Additional RAB Setup Information"},    /* 7.7.45A */
+/* 147 */  {GTP_EXT_SSGN_NO, "SGSN Number"},   /* 7.7.47 */
+/* 148 */  {GTP_EXT_COMMON_FLGS, "Common Flags"},  /* 7.7.48 */
+/* 149 */  {GTP_EXT_APN_RES, "APN Restriction"},   /* 3G */
+/* 150 */  {GTP_EXT_RA_PRIO_LCS, "Radio Priority LCS"},    /* 7.7.25B */
+/* 151 */  {GTP_EXT_RAT_TYPE, "RAT Type"}, /* 3G */
+/* 152 */  {GTP_EXT_USR_LOC_INF, "User Location Information"}, /* 7.7.51 */
+/* 153 */  {GTP_EXT_MS_TIME_ZONE, "MS Time Zone"}, /* 7.7.52 */
+
+/* 154 */  {GTP_EXT_IMEISV, "IMEI(SV)"},   /* 3G */
+/* 155 */  {GTP_EXT_CAMEL_CHG_INF_CON, "CAMEL Charging Information Container"},    /* 7.7.54 */
+/* 156 */  {GTP_EXT_MBMS_UE_CTX, "MBMS UE Context"},   /* 7.7.55 */
+/* 157 */  {GTP_EXT_TMGI, "Temporary Mobile Group Identity (TMGI)"},   /* 7.7.56 */
+/* 158 */  {GTP_EXT_RIM_RA, "RIM Routing Address"},    /* 7.7.57 */
+/* 159 */  {GTP_EXT_MBMS_PROT_CONF_OPT, "MBMS Protocol Configuration Options"},    /* 7.7.58 */
+/* 160 */  {GTP_EXT_MBMS_SA, "MBMS Service Area"}, /* 7.7.60 */
+/* 161 */  {GTP_EXT_SRC_RNC_PDP_CTX_INF, "Source RNC PDCP context info"},  /* 7.7.61 */
+/* 162 */  {GTP_EXT_ADD_TRS_INF, "Additional Trace Info"}, /* 7.7.62 */
+/* 163 */  {GTP_EXT_HOP_COUNT, "Hop Counter"}, /* 7.7.63 */
+/* 164 */  {GTP_EXT_SEL_PLMN_ID, "Selected PLMN ID"},  /* 7.7.64 */
+/* 165 */  {GTP_EXT_MBMS_SES_ID, "MBMS Session Identifier"},   /* 7.7.65 */
+/* 166 */  {GTP_EXT_MBMS_2G_3G_IND, "MBMS 2G/3G Indicator"},   /* 7.7.66 */
+/* 167 */  {GTP_EXT_ENH_NSAPI, "Enhanced NSAPI"},  /* 7.7.67 */
+/* 168 */  {GTP_EXT_MBMS_SES_DUR, "MBMS Session Duration"},    /* 7.7.59 */
+/* 169 */  {GTP_EXT_ADD_MBMS_TRS_INF, "Additional MBMS Trace Info"},   /* 7.7.68 */
+/* 170 */  {GTP_EXT_MBMS_SES_ID_REP_NO, "MBMS Session Identity Repetition Number"},    /* 7.7.69 */
+/* 171 */  {GTP_EXT_MBMS_TIME_TO_DATA_TR, "MBMS Time To Data Transfer"},   /* 7.7.70 */
+/* 172 */  {GTP_EXT_PS_HO_REQ_CTX, "PS Handover Request Context"}, /* 7.7.71 */
+/* 173 */  {GTP_EXT_BSS_CONT, "BSS Container"},    /* 7.7.72 */
+/* 174 */  {GTP_EXT_CELL_ID, "Cell Identification"},   /* 7.7.73 */
+/* 175 */  {GTP_EXT_PDU_NO, "PDU Numbers"},    /* 7.7.74 */
+/* 176 */  {GTP_EXT_BSSGP_CAUSE, "BSSGP Cause"},   /* 7.7.75 */
+
+/* 177 */  {GTP_EXT_REQ_MBMS_BEARER_CAP, "Required MBMS bearer capabilities"}, /* 7.7.76 */
+/* 178 */  {GTP_EXT_RIM_ROUTING_ADDR_DISC, "RIM Routing Address Discriminator"},   /* 7.7.77 */
+/* 179 */  {GTP_EXT_LIST_OF_SETUP_PFCS, "List of set-up PFCs"},    /* 7.7.78 */
+/* 180 */  {GTP_EXT_PS_HANDOVER_XIP_PAR, "PS Handover XID Parameters"},    /* 7.7.79 */
+/* 181 */  {GTP_EXT_MS_INF_CHG_REP_ACT, "MS Info Change Reporting Action"},    /* 7.7.80 */
+/* 182 */  {GTP_EXT_DIRECT_TUNNEL_FLGS, "Direct Tunnel Flags"},    /* 7.7.81 */
+/* 183 */  {GTP_EXT_CORRELATION_ID, "Correlation-ID"}, /* 7.7.82 */
+/* 184 */  {GTP_EXT_BEARER_CONTROL_MODE, "Bearer Control Mode"},   /* 7.7.83 */
+    {185, "MBMS Flow Identifier"},   /* 7.7.84 */
+    {186, "MBMS IP Multicast Distribution"},   /* 7.7.85 */
+    {187, "MBMS Distribution Acknowledgement"},   /* 7.7.86 */
+    {188, "Reliable INTER RAT HANDOVER INFO"},   /* 7.7.87 */
+    {189, "RFSP Index"},   /* 7.7.88 */
+    {190, "Fully Qualified Domain Name (FQDN)"},   /* 7.7.90 */
+    {GTP_EXT_EVO_ALLO_RETE_P1, "Evolved Allocation/Retention Priority I"},   /* 7.7.91 */
+    {192, "Evolved Allocation/Retention Priority II"},   /* 7.7.92 */
+    {193, "Extended Common Flags"},   /* 7.7.93 */
+    {194, "User CSG Information (UCI)"},   /* 7.7.94 */
+    {195, "CSG Information Reporting Action"},   /* 7.7.95 */
+    {196, "CSG ID"},   /* 7.7.96 */
+    {197, "CSG Membership Indication (CMI)"},   /* 7.7.97 */
+    {198, "Aggregate Maximum Bit Rate (AMBR)"},   /* 7.7.98 */
+    {199, "UE Network Capability"},   /* 7.7.99 */
+    {200, "UE-AMBR"},   /* 7.7.100 */
+    {201, "APN-AMBR with NSAPI"},   /* 7.7.101 */
+    {202, "GGSN Back-Off Time"},   /* 7.7.102 */
+    {203, "Signalling Priority Indication"},   /* 7.7.103 */
+    {204, "Signalling Priority Indication with NSAPI"},   /* 7.7.104 */
+    {205, "Higher bitrates than 16 Mbps flag"},   /* 7.7.105  */
+    {206, "Max MBR/APN-AMBR"},   /* 7.7.106  */
+    {207, "Additional MM context for SRVCC"},   /* 7.7.107  */
+    {208, "Additional flags for SRVCC"},   /* 7.7.108  */
+    {209, "STN-SR"},   /* 7.7.109  */
+    {210, "C-MSISDN"},   /* 7.7.110  */
+    {211, "Extended RANAP Cause"},   /* 7.7.111  */
+       /* 212-238 TLV Spare. For future use. */
+       /* 239-250 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
+/* 249 */  {GTP_EXT_REL_PACK, "Sequence numbers of released packets IE"},  /* charging */
+/* 250 */  {GTP_EXT_CAN_PACK, "Sequence numbers of canceled packets IE"},  /* charging */
+/* 251 */  {GTP_EXT_CHRG_ADDR, "Charging Gateway address"}, /* 7.7.44 */
+       /* 252-254 Reserved for the GPRS charging protocol (see GTP' in 3GPP TS 32.295 [33]) */
+/* 252 */  {GTP_EXT_DATA_REQ, "Data record packet"},   /* charging */
+/* 253 */  {GTP_EXT_DATA_RESP, "Requests responded"},  /* charging */
+/* 254 */  {GTP_EXT_NODE_ADDR, "Address of recommended node"}, /* charging */
+/* 255 */  {GTP_EXT_PRIV_EXT, "Private Extension"},
+
     {0, NULL}
 };
+static value_string_ext gtpv1_val_ext = VALUE_STRING_EXT_INIT(gtpv1_val);
 
-/* GPRS:       9.60 v7.6.0, page 37
- * UMTS:       29.060 v4.0, page 45
+/* GPRS:    9.60 v7.6.0, page 37
+ * UMTS:    29.060 v4.0, page 45
+ * ETSI TS 129 060 V9.4.0 (2010-10) Ch 7.7.1
  */
 static const value_string cause_type[] = {
-    {0, "Request IMSI"},
-    {1, "Request IMEI"},
-    {2, "Request IMSI and IMEI"},
-    {3, "No identity needed"},
-    {4, "MS refuses"},
-    {5, "MS is not GPRS responding"},
-    {59, "System failure"},    /* charging */
-    {60, "The transmit buffers are becoming full"},    /* charging */
-    {61, "The receive buffers are becoming full"},     /* charging */
-    {62, "Another node is about to go down"},  /* charging */
-    {63, "This node is about to go down"},     /* charging */
+    {  0, "Request IMSI"},
+    {  1, "Request IMEI"},
+    {  2, "Request IMSI and IMEI"},
+    {  3, "No identity needed"},
+    {  4, "MS refuses"},
+    {  5, "MS is not GPRS responding"},
+    /* For future use 6-48 */
+    /* Cause values reserved for GPRS charging
+     * protocol use (see GTP' in 3GPP TS 32.295 [33])
+     * 49-63
+     */
+    { 59, "System failure"}, /* charging */
+    { 60, "The transmit buffers are becoming full"}, /* charging */
+    { 61, "The receive buffers are becoming full"},  /* charging */
+    { 62, "Another node is about to go down"},       /* charging */
+    { 63, "This node is about to go down"},          /* charging */
+    /* For future use 64-127 */
     {128, "Request accepted"},
+    {129, "New PDP type due to network preference"},
+    {130, "New PDP type due to single address bearer only"},
+    /* For future use 131-176 */
+    /* Cause values reserved for GPRS charging
+     * protocol use (see GTP' in 3GPP TS 32.295 [33])
+     * 177-191
+     */
+    {177, "CDR decoding error"},
+
     {192, "Non-existent"},
     {193, "Invalid message format"},
     {194, "IMSI not known"},
@@ -840,15 +1146,23 @@ static const value_string cause_type[] = {
     {224, "MS MBMS Capabilities Insufficient"},
     {225, "Invalid Correlation-ID"},
     {226, "MBMS Bearer Context Superseded"},
-    {252, "Request related to possibly duplicated packets already fulfilled"}, /* charging */
-    {253, "Request already fulfilled"},        /* charging */
-    {254, "Sequence numbers of released/cancelled packets IE incorrect"},      /* charging */
-    {255, "Request not fulfilled"},    /* charging */
+    {227, "Bearer Control Mode violation"},
+    {228, "Collision with network initiated request"},
+    /* For future use 229-240 */
+    /* Cause values reserved for GPRS charging
+     * protocol use (see GTP' in 3GPP TS 32.295 [33])
+     * 241-255
+     */
+    {252, "Request related to possibly duplicated packets already fulfilled"},  /* charging */
+    {253, "Request already fulfilled"}, /* charging */
+    {254, "Sequence numbers of released/cancelled packets IE incorrect"},   /* charging */
+    {255, "Request not fulfilled"}, /* charging */
     {0, NULL}
 };
+static value_string_ext cause_type_ext = VALUE_STRING_EXT_INIT(cause_type);
 
-/* GPRS:       9.02 v7.7.0
- * UMTS:       29.002 v4.2.1, chapter 17.5, page 268
+/* GPRS:    9.02 v7.7.0
+ * UMTS:    29.002 v4.2.1, chapter 17.5, page 268
  * Imported gsm_old_GSMMAPLocalErrorcode_vals from gsm_map from gsm_map
  */
 
@@ -926,24 +1240,24 @@ static const value_string qos_precedence_type[] = {
 
 static const value_string qos_mean_type[] = {
     {0x00, "Subscribed mean throughput (in MS to network direction)"},
-    {0x01, "100 oct/h"},       /* Class 2 */
-    {0x02, "200 oct/h"},       /* Class 3 */
-    {0x03, "500 oct/h"},       /* Class 4 */
-    {0x04, "1 000 oct/h"},     /* Class 5 */
-    {0x05, "2 000 oct/h"},     /* Class 6 */
-    {0x06, "5 000 oct/h"},     /* Class 7 */
-    {0x07, "10 000 oct/h"},    /* Class 8 */
-    {0x08, "20 000 oct/h"},    /* Class 9 */
-    {0x09, "50 000 oct/h"},    /* Class 10 */
-    {0x0A, "100 000 oct/h"},   /* Class 11 */
-    {0x0B, "200 000 oct/h"},   /* Class 12 */
-    {0x0C, "500 000 oct/h"},   /* Class 13 */
-    {0x0D, "1 000 000 oct/h"}, /* Class 14 */
-    {0x0E, "2 000 000 oct/h"}, /* Class 15 */
-    {0x0F, "5 000 000 oct/h"}, /* Class 16 */
-    {0x10, "10 000 000 oct/h"},        /* Class 17 */
-    {0x11, "20 000 000 oct/h"},        /* Class 18 */
-    {0x12, "50 000 000 oct/h"},        /* Class 19 */
+    {0x01, "100 oct/h"},        /* Class 2 */
+    {0x02, "200 oct/h"},        /* Class 3 */
+    {0x03, "500 oct/h"},        /* Class 4 */
+    {0x04, "1 000 oct/h"},      /* Class 5 */
+    {0x05, "2 000 oct/h"},      /* Class 6 */
+    {0x06, "5 000 oct/h"},      /* Class 7 */
+    {0x07, "10 000 oct/h"},     /* Class 8 */
+    {0x08, "20 000 oct/h"},     /* Class 9 */
+    {0x09, "50 000 oct/h"},     /* Class 10 */
+    {0x0A, "100 000 oct/h"},    /* Class 11 */
+    {0x0B, "200 000 oct/h"},    /* Class 12 */
+    {0x0C, "500 000 oct/h"},    /* Class 13 */
+    {0x0D, "1 000 000 oct/h"},  /* Class 14 */
+    {0x0E, "2 000 000 oct/h"},  /* Class 15 */
+    {0x0F, "5 000 000 oct/h"},  /* Class 16 */
+    {0x10, "10 000 000 oct/h"}, /* Class 17 */
+    {0x11, "20 000 000 oct/h"}, /* Class 18 */
+    {0x12, "50 000 000 oct/h"}, /* Class 19 */
 /* QoS Mean throughput classes from 0x13 to 0x1E (from 19 to 30) are subscribed */
     {0x13, "Reserved"},
     {0x14, "Reserved"},
@@ -957,16 +1271,17 @@ static const value_string qos_mean_type[] = {
     {0x1C, "Reserved"},
     {0x1D, "Reserved"},
     {0x1E, "Reserved"},
-    {0x1F, "Best effort"},     /* Class 1 */
+    {0x1F, "Best effort"},  /* Class 1 */
     {0, NULL}
 };
+static value_string_ext qos_mean_type_ext = VALUE_STRING_EXT_INIT(qos_mean_type);
 
 static const value_string qos_del_err_sdu[] = {
     {0x00, "Subscribed delivery of erroneous SDUs (in MS to network direction)"},
     {0x01, "No detect ('-')"},
     {0x02, "Erroneous SDUs are delivered ('yes')"},
     {0x03, "Erroneous SDUs are not delivered ('no')"},
-    {0x07, "Reserved"},                /* All other values are reserved */
+    {0x07, "Reserved"},  /* All other values are reserved */
     {0, NULL}
 };
 
@@ -974,7 +1289,7 @@ static const value_string qos_del_order[] = {
     {0x00, "Subscribed delivery order (in MS to network direction)"},
     {0x01, "With delivery order ('yes')"},
     {0x02, "Without delivery order ('no')"},
-    {0x03, "Reserved"},                /* All other values are reserved */
+    {0x03, "Reserved"},  /* All other values are reserved */
     {0, NULL}
 };
 
@@ -984,7 +1299,7 @@ static const value_string qos_traf_class[] = {
     {0x02, "Streaming class"},
     {0x03, "Interactive class"},
     {0x04, "Background class"},
-    {0x07, "Reserved"},                /* All other values are reserved */
+    {0x07, "Reserved"},  /* All other values are reserved */
     {0, NULL}
 };
 
@@ -994,7 +1309,7 @@ static const value_string qos_max_sdu_size[] = {
     {0x97, "1502 octets"},
     {0x98, "1510 octets"},
     {0x99, "1520 octets"},
-    {0, NULL}                  /* All other values are reserved */
+    {0, NULL}             /* All other values are reserved */
 };
 
 static const value_string qos_max_ul[] = {
@@ -1026,7 +1341,7 @@ static const value_string qos_res_ber[] = {
     {0x07, "1/100 000 = 1x10^-5"},
     {0x08, "1/1 000 000 = 1x10^-6"},
     {0x09, "3/50 000 000 = 6x10^-8"},
-    {0x0F, "Reserved"},                /* All other values are reserved */
+    {0x0F, "Reserved"},    /* All other values are reserved */
     {0, NULL}
 };
 
@@ -1039,7 +1354,7 @@ static const value_string qos_sdu_err_ratio[] = {
     {0x05, "1/100 000 = 1x10^-5"},
     {0x06, "1/1 000 000 = 1x10^-6"},
     {0x07, "1/10 = 1x10^-1"},
-    {0x0F, "Reserved"},                /* All other values are reserved */
+    {0x0F, "Reserved"},    /* All other values are reserved */
     {0, NULL}
 };
 
@@ -1053,7 +1368,7 @@ static const value_string qos_traf_handl_prio[] = {
 
 static const value_string qos_trans_delay[] = {
     {0x00, "Subscribed Transfer Delay (in MS to network direction)"},
-    {0x01, "10 ms"},           /* Using a granularity of 10 ms */
+    {0x01, "10 ms"},        /* Using a granularity of 10 ms */
     {0x02, "20 ms"},
     {0x03, "30 ms"},
     {0x04, "40 ms"},
@@ -1068,7 +1383,7 @@ static const value_string qos_trans_delay[] = {
     {0x0D, "130 ms"},
     {0x0E, "140 ms"},
     {0x0F, "150 ms"},
-    {0x10, "200 ms"},          /* (For values from 0x10 to 0x1F, value = 200 ms + (value - 0x10) * 50 ms */
+    {0x10, "200 ms"},       /* (For values from 0x10 to 0x1F, value = 200 ms + (value - 0x10) * 50 ms */
     {0x11, "250 ms"},
     {0x12, "300 ms"},
     {0x13, "350 ms"},
@@ -1084,7 +1399,7 @@ static const value_string qos_trans_delay[] = {
     {0x1D, "850 ms"},
     {0x1E, "900 ms"},
     {0x1F, "950 ms"},
-    {0x20, "1000 ms"},         /* For values from 0x20 to 0x3E, value = 1000 ms + (value - 0x20) * 100 ms */
+    {0x20, "1000 ms"},      /* For values from 0x20 to 0x3E, value = 1000 ms + (value - 0x20) * 100 ms */
     {0x21, "1100 ms"},
     {0x22, "1200 ms"},
     {0x23, "1300 ms"},
@@ -1118,6 +1433,7 @@ static const value_string qos_trans_delay[] = {
     {0x3F, "Reserved"},
     {0, NULL}
 };
+static value_string_ext qos_trans_delay_ext = VALUE_STRING_EXT_INIT(qos_trans_delay);
 
 static const value_string qos_guar_ul[] = {
     {0x00, "Subscribed guaranteed bit rate for uplink (in MS to network direction)"},
@@ -1153,7 +1469,7 @@ static const value_string sel_mode_type[] = {
     {0, "MS or network provided APN, subscribed verified"},
     {1, "MS provided APN, subscription not verified"},
     {2, "Network provided APN, subscription not verified"},
-    {3, "For future use (Network provided APN, subscription not verified"},    /* Shall not be sent. If received, shall be sent as value 2 */
+    {3, "For future use (Network provided APN, subscription not verified"}, /* Shall not be sent. If received, shall be sent as value 2 */
     {0, NULL}
 };
 
@@ -1178,10 +1494,12 @@ static const value_string ms_not_reachable_type[] = {
     {8, "MS purged for GPRS"},
     {9, "Unidentified subscriber via the MSC"},
     {10, "Unidentified subscriber via the SGSN"},
+    {11, "Deregistered in the HSS/HLR for IMS"},
+    {12, "No response via the IP-SM-GW"},
     {0, NULL}
 };
 
-/* UMTS:       25.413 v3.4.0, chapter 9.2.1.4, page 80
+/* UMTS:   25.413 v3.4.0, chapter 9.2.1.4, page 80
  */
 static const value_string ranap_cause_type[] = {
 /* Radio Network Layer Cause (1-->64) */
@@ -1280,6 +1598,7 @@ static const value_string ranap_cause_type[] = {
 
     {0, NULL}
 };
+static value_string_ext ranap_cause_type_ext = VALUE_STRING_EXT_INIT(ranap_cause_type);
 
 static const value_string mm_sec_modep[] = {
     {0, "Used cipher value, UMTS keys and Quintuplets"},
@@ -1300,27 +1619,27 @@ static const value_string gtp_cipher_algorithm[] = {
     {7, "GEA/7"},
     {0, NULL}
 };
-static const value_string gtp_ext_rat_type_vals[] = {   
-      {0, "Reserved"},   
-      {1, "UTRAN"},   
-      {2, "GERAN"},   
-      {3, "WLAN"},   
-      {4, "GAN"},   
-      {5, "HSPA Evolution"},   
-      {0, NULL}   
-}; 
-
-#define MM_PROTO_GROUP_CALL_CONTROL    0x00
-#define MM_PROTO_BROADCAST_CALL_CONTROL        0x01
-#define MM_PROTO_PDSS1                 0x02
-#define MM_PROTO_CALL_CONTROL          0x03
-#define MM_PROTO_PDSS2                 0x04
-#define MM_PROTO_MM_NON_GPRS           0x05
-#define MM_PROTO_RR_MGMT               0x06
-#define MM_PROTO_MM_GPRS               0x08
-#define MM_PROTO_SMS                   0x09
-#define MM_PROTO_SESSION_MGMT          0x0A
-#define MM_PROTO_NON_CALL_RELATED      0x0B
+static const value_string gtp_ext_rat_type_vals[] = {
+      {0, "Reserved"},
+      {1, "UTRAN"},
+      {2, "GERAN"},
+      {3, "WLAN"},
+      {4, "GAN"},
+      {5, "HSPA Evolution"},
+      {0, NULL}
+};
+
+#define MM_PROTO_GROUP_CALL_CONTROL     0x00
+#define MM_PROTO_BROADCAST_CALL_CONTROL 0x01
+#define MM_PROTO_PDSS1                  0x02
+#define MM_PROTO_CALL_CONTROL           0x03
+#define MM_PROTO_PDSS2                  0x04
+#define MM_PROTO_MM_NON_GPRS            0x05
+#define MM_PROTO_RR_MGMT                0x06
+#define MM_PROTO_MM_GPRS                0x08
+#define MM_PROTO_SMS                    0x09
+#define MM_PROTO_SESSION_MGMT           0x0A
+#define MM_PROTO_NON_CALL_RELATED       0x0B
 
 static const value_string tft_code_type[] = {
     {0, "Spare"},
@@ -1342,6 +1661,7 @@ static dissector_handle_t data_handle;
 static dissector_handle_t gtpcdr_handle;
 static dissector_handle_t sndcpxid_handle;
 static dissector_handle_t gtpv2_handle;
+static dissector_handle_t bssgp_handle;
 static dissector_table_t bssap_pdu_type_table;
 
 static gtp_msg_hash_t *gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, gint seq_nr, guint msgtype);
@@ -1432,6 +1752,7 @@ static int decode_gtp_ps_handover_xid(tvbuff_t * tvb, int offset, packet_info *
 static int decode_gtp_direct_tnl_flg(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
 static int decode_gtp_ms_inf_chg_rep_act(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
 static int decode_gtp_corrl_id(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
+static int decode_gtp_evolved_allc_rtn_p1(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
 static int decode_gtp_bearer_cntrl_mod(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
 static int decode_gtp_chrg_addr(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
 static int decode_gtp_rel_pack(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree);
@@ -1484,63 +1805,63 @@ static const gtp_opt_t gtpopt[] = {
     {GTP_EXT_PROTO_CONF, decode_gtp_proto_conf},
     {GTP_EXT_GSN_ADDR, decode_gtp_gsn_addr},
     {GTP_EXT_MSISDN, decode_gtp_msisdn},
-    {GTP_EXT_QOS_UMTS, decode_gtp_qos_umts},   /* 3G */
-    {GTP_EXT_AUTH_QUI, decode_gtp_auth_qui},   /* 3G */
-    {GTP_EXT_TFT, decode_gtp_tft},     /* 3G */
-    {GTP_EXT_TARGET_ID, decode_gtp_target_id}, /* 3G */
-    {GTP_EXT_UTRAN_CONT, decode_gtp_utran_cont},       /* 3G */
-    {GTP_EXT_RAB_SETUP, decode_gtp_rab_setup}, /* 3G */
-    {GTP_EXT_HDR_LIST, decode_gtp_hdr_list},   /* 3G */
-    {GTP_EXT_TRIGGER_ID, decode_gtp_trigger_id},       /* 3G */
-    {GTP_EXT_OMC_ID, decode_gtp_omc_id},       /* 3G */
+    {GTP_EXT_QOS_UMTS, decode_gtp_qos_umts},    /* 3G */
+    {GTP_EXT_AUTH_QUI, decode_gtp_auth_qui},    /* 3G */
+    {GTP_EXT_TFT, decode_gtp_tft},  /* 3G */
+    {GTP_EXT_TARGET_ID, decode_gtp_target_id},  /* 3G */
+    {GTP_EXT_UTRAN_CONT, decode_gtp_utran_cont},    /* 3G */
+    {GTP_EXT_RAB_SETUP, decode_gtp_rab_setup},  /* 3G */
+    {GTP_EXT_HDR_LIST, decode_gtp_hdr_list},    /* 3G */
+    {GTP_EXT_TRIGGER_ID, decode_gtp_trigger_id},    /* 3G */
+    {GTP_EXT_OMC_ID, decode_gtp_omc_id},    /* 3G */
     /* TS 29 060 V6.11.0 */
-    {GTP_EXT_RAN_TR_CONT, decode_gtp_ran_tr_cont},     /* 7.7.43 */
-    {GTP_EXT_PDP_CONT_PRIO, decode_gtp_pdp_cont_prio}, /* 7.7.45 */
-    {GTP_EXT_ADD_RAB_SETUP_INF, decode_gtp_add_rab_setup_inf}, /* 7.7.45A */
-    {GTP_EXT_SSGN_NO, decode_gtp_ssgn_no},     /* 7.7.47 */
-    {GTP_EXT_COMMON_FLGS, decode_gtp_common_flgs},     /* 7.7.48 */
-    {GTP_EXT_APN_RES, decode_gtp_apn_res},     /* 3G */
-    {GTP_EXT_RA_PRIO_LCS, decode_gtp_ra_prio_lcs},     /* 7.7.25B */
-    {GTP_EXT_RAT_TYPE, decode_gtp_rat_type},   /* 3G */
-    {GTP_EXT_USR_LOC_INF, decode_gtp_usr_loc_inf},     /* 7.7.51 */
-    {GTP_EXT_MS_TIME_ZONE, decode_gtp_ms_time_zone},   /* 7.7.52 */
-    {GTP_EXT_IMEISV, decode_gtp_imeisv},       /* 3G 7.7.53 */
-    {GTP_EXT_CAMEL_CHG_INF_CON, decode_gtp_camel_chg_inf_con}, /* 7.7.54 */
-    {GTP_EXT_MBMS_UE_CTX, decode_gtp_mbms_ue_ctx},     /* 7.7.55 */
-    {GTP_EXT_TMGI, decode_gtp_tmgi},   /* 7.7.56 */
-    {GTP_EXT_RIM_RA, decode_gtp_rim_ra},       /* 7.7.57 */
-    {GTP_EXT_MBMS_PROT_CONF_OPT, decode_gtp_mbms_prot_conf_opt},       /* 7.7.58 */
-    {GTP_EXT_MBMS_SA, decode_gtp_mbms_sa},     /* 7.7.60 */
-    {GTP_EXT_SRC_RNC_PDP_CTX_INF, decode_gtp_src_rnc_pdp_ctx_inf},     /* 7.7.61 */
-    {GTP_EXT_ADD_TRS_INF, decode_gtp_add_trs_inf},     /* 7.7.62 */
-    {GTP_EXT_HOP_COUNT, decode_gtp_hop_count}, /* 7.7.63 */
-    {GTP_EXT_SEL_PLMN_ID, decode_gtp_sel_plmn_id},     /* 7.7.64 */
-    {GTP_EXT_MBMS_SES_ID, decode_gtp_mbms_ses_id},     /* 7.7.65 */
-    {GTP_EXT_MBMS_2G_3G_IND, decode_gtp_mbms_2g_3g_ind},       /* 7.7.66 */
-    {GTP_EXT_ENH_NSAPI, decode_gtp_enh_nsapi}, /* 7.7.67 */
-    {GTP_EXT_MBMS_SES_DUR, decode_gtp_mbms_ses_dur},   /* 7.7.59 */
-    {GTP_EXT_ADD_MBMS_TRS_INF, decode_gtp_add_mbms_trs_inf},   /* 7.7.68 */
-    {GTP_EXT_MBMS_SES_ID_REP_NO, decode_gtp_mbms_ses_id_rep_no},       /* 7.7.69 */
-    {GTP_EXT_MBMS_TIME_TO_DATA_TR, decode_gtp_mbms_time_to_data_tr},   /* 7.7.70 */
-    {GTP_EXT_PS_HO_REQ_CTX, decode_gtp_ps_ho_req_ctx}, /* 7.7.71 */
-    {GTP_EXT_BSS_CONT, decode_gtp_bss_cont},   /* 7.7.72 */
-    {GTP_EXT_CELL_ID, decode_gtp_cell_id},     /* 7.7.73 */
-    {GTP_EXT_PDU_NO, decode_gtp_pdu_no},       /* 7.7.74 */
-    {GTP_EXT_BSSGP_CAUSE, decode_gtp_bssgp_cause},     /* 7.7.75 */
-    {GTP_EXT_REQ_MBMS_BEARER_CAP, decode_gtp_mbms_bearer_cap}, /* 7.7.76 */
-    {GTP_EXT_RIM_ROUTING_ADDR_DISC, decode_gtp_rim_ra_disc},   /* 7.7.77 */
-    {GTP_EXT_LIST_OF_SETUP_PFCS, decode_gtp_lst_set_up_pfc},   /* 7.7.78 */
-    {GTP_EXT_PS_HANDOVER_XIP_PAR, decode_gtp_ps_handover_xid}, /* 7.7.79 */
-    {GTP_EXT_MS_INF_CHG_REP_ACT, decode_gtp_ms_inf_chg_rep_act},       /* 7.7.80 */
-    {GTP_EXT_DIRECT_TUNNEL_FLGS, decode_gtp_direct_tnl_flg},   /* 7.7.81 */
-    {GTP_EXT_CORRELATION_ID, decode_gtp_corrl_id},     /* 7.7.82 */
-    {GTP_EXT_BEARER_CONTROL_MODE, decode_gtp_bearer_cntrl_mod},        /* 7.7.83 */
-
-    {GTP_EXT_REL_PACK, decode_gtp_rel_pack},   /* charging */
-    {GTP_EXT_CAN_PACK, decode_gtp_can_pack},   /* charging */
+    {GTP_EXT_RAN_TR_CONT, decode_gtp_ran_tr_cont},  /* 7.7.43 */
+    {GTP_EXT_PDP_CONT_PRIO, decode_gtp_pdp_cont_prio},  /* 7.7.45 */
+    {GTP_EXT_ADD_RAB_SETUP_INF, decode_gtp_add_rab_setup_inf},  /* 7.7.45A */
+    {GTP_EXT_SSGN_NO, decode_gtp_ssgn_no},  /* 7.7.47 */
+    {GTP_EXT_COMMON_FLGS, decode_gtp_common_flgs},  /* 7.7.48 */
+    {GTP_EXT_APN_RES, decode_gtp_apn_res},  /* 3G */
+    {GTP_EXT_RA_PRIO_LCS, decode_gtp_ra_prio_lcs},  /* 7.7.25B */
+    {GTP_EXT_RAT_TYPE, decode_gtp_rat_type},    /* 3G */
+    {GTP_EXT_USR_LOC_INF, decode_gtp_usr_loc_inf},  /* 7.7.51 */
+    {GTP_EXT_MS_TIME_ZONE, decode_gtp_ms_time_zone},    /* 7.7.52 */
+    {GTP_EXT_IMEISV, decode_gtp_imeisv},    /* 3G 7.7.53 */
+    {GTP_EXT_CAMEL_CHG_INF_CON, decode_gtp_camel_chg_inf_con},  /* 7.7.54 */
+    {GTP_EXT_MBMS_UE_CTX, decode_gtp_mbms_ue_ctx},  /* 7.7.55 */
+    {GTP_EXT_TMGI, decode_gtp_tmgi},    /* 7.7.56 */
+    {GTP_EXT_RIM_RA, decode_gtp_rim_ra},    /* 7.7.57 */
+    {GTP_EXT_MBMS_PROT_CONF_OPT, decode_gtp_mbms_prot_conf_opt},    /* 7.7.58 */
+    {GTP_EXT_MBMS_SA, decode_gtp_mbms_sa},  /* 7.7.60 */
+    {GTP_EXT_SRC_RNC_PDP_CTX_INF, decode_gtp_src_rnc_pdp_ctx_inf},  /* 7.7.61 */
+    {GTP_EXT_ADD_TRS_INF, decode_gtp_add_trs_inf},  /* 7.7.62 */
+    {GTP_EXT_HOP_COUNT, decode_gtp_hop_count},  /* 7.7.63 */
+    {GTP_EXT_SEL_PLMN_ID, decode_gtp_sel_plmn_id},  /* 7.7.64 */
+    {GTP_EXT_MBMS_SES_ID, decode_gtp_mbms_ses_id},  /* 7.7.65 */
+    {GTP_EXT_MBMS_2G_3G_IND, decode_gtp_mbms_2g_3g_ind},    /* 7.7.66 */
+    {GTP_EXT_ENH_NSAPI, decode_gtp_enh_nsapi},  /* 7.7.67 */
+    {GTP_EXT_MBMS_SES_DUR, decode_gtp_mbms_ses_dur},    /* 7.7.59 */
+    {GTP_EXT_ADD_MBMS_TRS_INF, decode_gtp_add_mbms_trs_inf},    /* 7.7.68 */
+    {GTP_EXT_MBMS_SES_ID_REP_NO, decode_gtp_mbms_ses_id_rep_no},    /* 7.7.69 */
+    {GTP_EXT_MBMS_TIME_TO_DATA_TR, decode_gtp_mbms_time_to_data_tr},    /* 7.7.70 */
+    {GTP_EXT_PS_HO_REQ_CTX, decode_gtp_ps_ho_req_ctx},  /* 7.7.71 */
+    {GTP_EXT_BSS_CONT, decode_gtp_bss_cont},    /* 7.7.72 */
+    {GTP_EXT_CELL_ID, decode_gtp_cell_id},  /* 7.7.73 */
+    {GTP_EXT_PDU_NO, decode_gtp_pdu_no},    /* 7.7.74 */
+    {GTP_EXT_BSSGP_CAUSE, decode_gtp_bssgp_cause},  /* 7.7.75 */
+    {GTP_EXT_REQ_MBMS_BEARER_CAP, decode_gtp_mbms_bearer_cap},  /* 7.7.76 */
+    {GTP_EXT_RIM_ROUTING_ADDR_DISC, decode_gtp_rim_ra_disc},    /* 7.7.77 */
+    {GTP_EXT_LIST_OF_SETUP_PFCS, decode_gtp_lst_set_up_pfc},    /* 7.7.78 */
+    {GTP_EXT_PS_HANDOVER_XIP_PAR, decode_gtp_ps_handover_xid},  /* 7.7.79 */
+    {GTP_EXT_MS_INF_CHG_REP_ACT, decode_gtp_ms_inf_chg_rep_act},    /* 7.7.80 */
+    {GTP_EXT_DIRECT_TUNNEL_FLGS, decode_gtp_direct_tnl_flg},    /* 7.7.81 */
+    {GTP_EXT_CORRELATION_ID, decode_gtp_corrl_id},  /* 7.7.82 */
+    {GTP_EXT_BEARER_CONTROL_MODE, decode_gtp_bearer_cntrl_mod}, /* 7.7.83 */
+    {GTP_EXT_EVO_ALLO_RETE_P1, decode_gtp_evolved_allc_rtn_p1}, /* 7.7.91 */
+    {GTP_EXT_REL_PACK, decode_gtp_rel_pack},    /* charging */
+    {GTP_EXT_CAN_PACK, decode_gtp_can_pack},    /* charging */
     {GTP_EXT_CHRG_ADDR, decode_gtp_chrg_addr},
-    {GTP_EXT_DATA_REQ, decode_gtp_data_req},   /* charging */
-    {GTP_EXT_DATA_RESP, decode_gtp_data_resp}, /* charging */
+    {GTP_EXT_DATA_REQ, decode_gtp_data_req},    /* charging */
+    {GTP_EXT_DATA_RESP, decode_gtp_data_resp},  /* charging */
     {GTP_EXT_NODE_ADDR, decode_gtp_node_addr},
     {GTP_EXT_PRIV_EXT, decode_gtp_priv_ext},
     {0, decode_gtp_unknown}
@@ -1555,58 +1876,53 @@ struct _gtp_hdr {
 static guint8 gtp_version = 0;
 static const char *yesno[] = { "no", "yes" };
 
-static gchar *id_to_str(const guint8 * ad)
-{
+#define BCD2CHAR(d)         ((d) | 0x30)
 
-    static gchar str[17] = "                ";
-    guint8 bits8to5, bits4to1;
-    int i, j = 0;
-    static const gchar hex_digits[10] = "0123456789";
-
-    for (i = 0; i < 8; i++) {
-       bits8to5 = (ad[i] >> 4) & 0x0F;
-       bits4to1 = ad[i] & 0x0F;
-       if (bits4to1 < 0xA)
-           str[j++] = hex_digits[bits4to1];
-       if (bits8to5 < 0xA)
-           str[j++] = hex_digits[bits8to5];
-    }
-    str[j] = '\0';
-    return str;
-}
-
-static gchar *imsi_to_str(const guint8 * ad)
+static gchar *
+id_to_str(tvbuff_t *tvb, gint offset)
 {
-
     static gchar str[17] = "                ";
-    int i, j = 0;
-
-    for (i = 0; i < 8; i++) {
-       if ((ad[i] & 0x0F) <= 9)
-           str[j++] = (ad[i] & 0x0F) + 0x30;
-       if (((ad[i] >> 4) & 0x0F) <= 9)
-           str[j++] = ((ad[i] >> 4) & 0x0F) + 0x30;
+    guint8 bits8to5, bits4to1;
+    int i, j;
+    guint8 ad;
+
+    for (i = j = 0; i < 8; i++) {
+        ad = tvb_get_guint8(tvb, offset + i);
+        bits8to5 = hi_nibble(ad);
+        bits4to1 = lo_nibble(ad);
+        if (bits4to1 <= 9)
+            str[j++] = BCD2CHAR(bits4to1);
+        else
+            j++;
+        if (bits8to5 <= 9)
+            str[j++] = BCD2CHAR(bits8to5);
+        else
+            j++;
     }
     str[j] = '\0';
-
     return str;
 }
 
-static gchar *msisdn_to_str(const guint8 * ad, int len)
+static gchar *
+msisdn_to_str(tvbuff_t *tvb, gint offset, int len)
 {
-
     static gchar str[18] = "+                ";
     guint8 bits8to5, bits4to1;
-    int i, j = 1;
-    static const gchar hex_digits[10] = "0123456789";
-
-    for (i = 1; i < len && i < 9; i++) {
-       bits8to5 = (ad[i] >> 4) & 0x0F;
-       bits4to1 = ad[i] & 0x0F;
-       if (bits4to1 < 0xA)
-           str[j++] = hex_digits[bits4to1];
-       if (bits8to5 < 0xA)
-           str[j++] = hex_digits[bits8to5];
+    int i, j;
+    guint ad;
+
+    for (i = j = 1; i < MIN(len, 9); i++) {
+        ad = tvb_get_guint8(tvb, offset + i);
+        bits8to5 = hi_nibble(ad);
+        bits4to1 = lo_nibble(ad);
+        if (bits4to1 <= 9)
+            str[j++] = BCD2CHAR(bits4to1);
+        else
+            j++;
+        if (bits8to5 <= 9)
+            str[j++] = BCD2CHAR(bits8to5);
+        else
+            j++;
     }
     str[j] = '\0';
 
@@ -1632,330 +1948,330 @@ typedef struct _message {
 static _gtp_mess_items gprs_mess_items[] = {
 
     {
-     GTP_MSG_ECHO_REQ, {
-                       {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                       {0, 0}
-                       }
-     },
+        GTP_MSG_ECHO_REQ, {
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_ECHO_RESP, {
-                        {GTP_EXT_RECOVER, GTP_MANDATORY},
-                        {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                        {0, 0}
-                        }
-     },
+        GTP_MSG_ECHO_RESP, {
+            {GTP_EXT_RECOVER, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_VER_NOT_SUPP, {
-                           {0, 0}
-                           }
-     },
+        GTP_MSG_VER_NOT_SUPP, {
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_NODE_ALIVE_REQ, {
-                             {GTP_EXT_NODE_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_NODE_ALIVE_REQ, {
+            {GTP_EXT_NODE_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_NODE_ALIVE_RESP, {
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_NODE_ALIVE_RESP, {
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_REDIR_REQ, {
-                        {GTP_EXT_CAUSE, GTP_MANDATORY},
-                        {GTP_EXT_NODE_ADDR, GTP_OPTIONAL},
-                        {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                        {0, 0}
-                        }
-     },
+        GTP_MSG_REDIR_REQ, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_NODE_ADDR, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_REDIR_RESP, {
-                         {GTP_EXT_CAUSE, GTP_MANDATORY},
-                         {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                         {0, 0}
-                         }
-     },
+        GTP_MSG_REDIR_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_CREATE_PDP_REQ, {
-                             {GTP_EXT_QOS_GPRS, GTP_MANDATORY},
-                             {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                             {GTP_EXT_SEL_MODE, GTP_MANDATORY},
-                             {GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
-                             {GTP_EXT_FLOW_SIG, GTP_MANDATORY},
-                             {GTP_EXT_MSISDN, GTP_MANDATORY},
-                             {GTP_EXT_USER_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_APN, GTP_MANDATORY},
-                             {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_CREATE_PDP_REQ, {
+            {GTP_EXT_QOS_GPRS, GTP_MANDATORY},
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_SEL_MODE, GTP_MANDATORY},
+            {GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
+            {GTP_EXT_FLOW_SIG, GTP_MANDATORY},
+            {GTP_EXT_MSISDN, GTP_MANDATORY},
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY},
+            {GTP_EXT_APN, GTP_MANDATORY},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_CREATE_PDP_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
-                              {GTP_EXT_REORDER, GTP_CONDITIONAL},
-                              {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                              {GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
-                              {GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
-                              {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
-                              {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_CREATE_PDP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
+            {GTP_EXT_REORDER, GTP_CONDITIONAL},
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
+            {GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
+            {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_UPDATE_PDP_REQ, {
-                             {GTP_EXT_QOS_GPRS, GTP_MANDATORY},
-                             {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                             {GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
-                             {GTP_EXT_FLOW_SIG, GTP_MANDATORY},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0},
-                             }
-     },
+        GTP_MSG_UPDATE_PDP_REQ, {
+            {GTP_EXT_QOS_GPRS, GTP_MANDATORY},
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
+            {GTP_EXT_FLOW_SIG, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0},
+        }
+    },
     {
-     GTP_MSG_UPDATE_PDP_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
-                              {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                              {GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
-                              {GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
-                              {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_UPDATE_PDP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
+            {GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_DELETE_PDP_REQ, {
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_DELETE_PDP_REQ, {
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_DELETE_PDP_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0},
-                              }
-     },
+        GTP_MSG_DELETE_PDP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0},
+        }
+    },
     {
-     GTP_MSG_CREATE_AA_PDP_REQ, {
-                                {GTP_EXT_QOS_GPRS, GTP_MANDATORY},
-                                {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                                {GTP_EXT_SEL_MODE, GTP_MANDATORY},
-                                {GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
-                                {GTP_EXT_FLOW_SIG, GTP_MANDATORY},
-                                {GTP_EXT_USER_ADDR, GTP_MANDATORY},
-                                {GTP_EXT_APN, GTP_MANDATORY},
-                                {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
-                                {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                                {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                                {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                {0, 0}
-                                }
-     },
+        GTP_MSG_INIT_PDP_CONTEXT_ACT_REQ, {
+            {GTP_EXT_QOS_GPRS, GTP_MANDATORY},
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_SEL_MODE, GTP_MANDATORY},
+            {GTP_EXT_FLOW_LABEL, GTP_MANDATORY},
+            {GTP_EXT_FLOW_SIG, GTP_MANDATORY},
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY},
+            {GTP_EXT_APN, GTP_MANDATORY},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_CREATE_AA_PDP_RESP, {
-                                 {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                 {GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
-                                 {GTP_EXT_REORDER, GTP_CONDITIONAL},
-                                 {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                                 {GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
-                                 {GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
-                                 {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
-                                 {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
-                                 {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
-                                 {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                                 {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                                 {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
-                                 {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                 {0, 0}
-                                 }
-     },
+        GTP_MSG_INIT_PDP_CONTEXT_ACT_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_QOS_GPRS, GTP_CONDITIONAL},
+            {GTP_EXT_REORDER, GTP_CONDITIONAL},
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_FLOW_LABEL, GTP_CONDITIONAL},
+            {GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
+            {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_DELETE_AA_PDP_REQ, {
-                                {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                {0, 0}
-                                }
-     },
+        GTP_MSG_DELETE_AA_PDP_REQ, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_DELETE_AA_PDP_RESP, {
-                                 {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                 {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                 {0, 0}
-                                 }
-     },
+        GTP_MSG_DELETE_AA_PDP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_ERR_IND, {
-                      {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                      {0, 0}
-                      }
-     },
+        GTP_MSG_ERR_IND, {
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_PDU_NOTIFY_REQ, {
-                             {GTP_EXT_USER_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_PDU_NOTIFY_REQ, {
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_PDU_NOTIFY_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_PDU_NOTIFY_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_PDU_NOTIFY_REJ_REQ, {
-                                 {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                 {GTP_EXT_USER_ADDR, GTP_MANDATORY},
-                                 {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                 {0, 0}
-                                 }
-     },
+        GTP_MSG_PDU_NOTIFY_REJ_REQ, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_PDU_NOTIFY_REJ_RESP, {
-                                  {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                  {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                  {0, 0}
-                                  }
-     },
+        GTP_MSG_PDU_NOTIFY_REJ_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SEND_ROUT_INFO_REQ, {
-                                 {GTP_EXT_IMSI, GTP_MANDATORY},
-                                 {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                 {0, 0}
-                                 }
-     },
+        GTP_MSG_SEND_ROUT_INFO_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SEND_ROUT_INFO_RESP, {
-                                  {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                  {GTP_EXT_IMSI, GTP_MANDATORY},
-                                  {GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
-                                  {GTP_EXT_MS_REASON, GTP_OPTIONAL},
-                                  {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},
-                                  {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                  {0, 0}
-                                  }
-     },
+        GTP_MSG_SEND_ROUT_INFO_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
+            {GTP_EXT_MS_REASON, GTP_OPTIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FAIL_REP_REQ, {
-                           {GTP_EXT_IMSI, GTP_MANDATORY},
-                           {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                           {0, 0}
-                           }
-     },
+        GTP_MSG_FAIL_REP_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FAIL_REP_RESP, {
-                            {GTP_EXT_CAUSE, GTP_MANDATORY},
-                            {GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
-                            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                            {0, 0}
-                            }
-     },
+        GTP_MSG_FAIL_REP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_MS_PRESENT_REQ, {
-                             {GTP_EXT_IMSI, GTP_MANDATORY},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_MS_PRESENT_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_MS_PRESENT_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_MS_PRESENT_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_IDENT_REQ, {
-                        {GTP_EXT_RAI, GTP_MANDATORY},
-                        {GTP_EXT_PTMSI, GTP_MANDATORY},
-                        {GTP_EXT_PTMSI_SIG, GTP_OPTIONAL},
-                        {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                        {0, 0}
-                        }
-     },
+        GTP_MSG_IDENT_REQ, {
+            {GTP_EXT_RAI, GTP_MANDATORY},
+            {GTP_EXT_PTMSI, GTP_MANDATORY},
+            {GTP_EXT_PTMSI_SIG, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_IDENT_RESP, {
-                         {GTP_EXT_CAUSE, GTP_MANDATORY},
-                         {GTP_EXT_IMSI, GTP_CONDITIONAL},
-                         {GTP_EXT_AUTH_TRI, GTP_OPTIONAL},
-                         {GTP_EXT_AUTH_QUI, GTP_OPTIONAL},
-                         {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                         {0, 0}
-                         }
-     },
+        GTP_MSG_IDENT_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},
+            {GTP_EXT_AUTH_TRI, GTP_OPTIONAL},
+            {GTP_EXT_AUTH_QUI, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SGSN_CNTXT_REQ, {
-                             {GTP_EXT_IMSI, GTP_CONDITIONAL},
-                             {GTP_EXT_RAI, GTP_MANDATORY},
-                             {GTP_EXT_TLLI, GTP_MANDATORY},
-                             {GTP_EXT_PTMSI_SIG, GTP_OPTIONAL},
-                             {GTP_EXT_MS_VALID, GTP_OPTIONAL},
-                             {GTP_EXT_FLOW_SIG, GTP_MANDATORY},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_SGSN_CNTXT_REQ, {
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},
+            {GTP_EXT_RAI, GTP_MANDATORY},
+            {GTP_EXT_TLLI, GTP_MANDATORY},
+            {GTP_EXT_PTMSI_SIG, GTP_OPTIONAL},
+            {GTP_EXT_MS_VALID, GTP_OPTIONAL},
+            {GTP_EXT_FLOW_SIG, GTP_MANDATORY},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SGSN_CNTXT_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_IMSI, GTP_CONDITIONAL},
-                              {GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
-                              {GTP_EXT_MM_CNTXT, GTP_CONDITIONAL},
-                              {GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_SGSN_CNTXT_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},
+            {GTP_EXT_FLOW_SIG, GTP_CONDITIONAL},
+            {GTP_EXT_MM_CNTXT, GTP_CONDITIONAL},
+            {GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SGSN_CNTXT_ACK, {
-                             {GTP_EXT_CAUSE, GTP_MANDATORY},
-                             {GTP_EXT_FLOW_II, GTP_CONDITIONAL},
-                             {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_SGSN_CNTXT_ACK, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_FLOW_II, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_DATA_TRANSF_REQ, {
-                              {GTP_EXT_TR_COMM, GTP_MANDATORY},
-                              {GTP_EXT_DATA_REQ, GTP_CONDITIONAL},
-                              {GTP_EXT_REL_PACK, GTP_CONDITIONAL},
-                              {GTP_EXT_CAN_PACK, GTP_CONDITIONAL},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_DATA_TRANSF_REQ, {
+            {GTP_EXT_TR_COMM, GTP_MANDATORY},
+            {GTP_EXT_DATA_REQ, GTP_CONDITIONAL},
+            {GTP_EXT_REL_PACK, GTP_CONDITIONAL},
+            {GTP_EXT_CAN_PACK, GTP_CONDITIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_DATA_TRANSF_RESP, {
-                               {GTP_EXT_CAUSE, GTP_MANDATORY},
-                               {GTP_EXT_DATA_RESP, GTP_MANDATORY},
-                               {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                               {0, 0}
-                               }
-     },
+        GTP_MSG_DATA_TRANSF_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_DATA_RESP, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     0, {
-        {0, 0}
-        }
-     }
+        0, {
+            {0, 0}
+        }
+    }
 };
 
 /* -----------------------------
@@ -1964,661 +2280,661 @@ static _gtp_mess_items gprs_mess_items[] = {
 static _gtp_mess_items umts_mess_items[] = {
     /* 7.2 Path Management Messages */
     {
-     GTP_MSG_ECHO_REQ, {
-                       {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                       {0, 0}
-                       }
-     },
+        GTP_MSG_ECHO_REQ, {
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_ECHO_RESP, {
-                        {GTP_EXT_RECOVER, GTP_MANDATORY},
-                        {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                        {0, 0}
-                        }
-     },
+        GTP_MSG_ECHO_RESP, {
+            {GTP_EXT_RECOVER, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_VER_NOT_SUPP, {
-                           {0, 0}
-                           }
-     },
+        GTP_MSG_VER_NOT_SUPP, {
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SUPP_EXT_HDR, {
-                           {GTP_EXT_HDR_LIST, GTP_MANDATORY},
-                           {0, 0}
-                           }
-     },
+        GTP_MSG_SUPP_EXT_HDR, {
+            {GTP_EXT_HDR_LIST, GTP_MANDATORY},
+            {0, 0}
+        }
+    },
     /* ??? */
     {
-     GTP_MSG_NODE_ALIVE_REQ, {
-                             {GTP_EXT_NODE_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_NODE_ALIVE_REQ, {
+            {GTP_EXT_NODE_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_NODE_ALIVE_RESP, {
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_NODE_ALIVE_RESP, {
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_REDIR_REQ, {
-                        {GTP_EXT_CAUSE, GTP_MANDATORY},
-                        {GTP_EXT_NODE_ADDR, GTP_OPTIONAL},
-                        {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                        {0, 0}
-                        }
-     },
+        GTP_MSG_REDIR_REQ, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_NODE_ADDR, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_REDIR_REQ, {
-                        {0, 0}
-                        }
-     },
+        GTP_MSG_REDIR_REQ, {
+            {0, 0}
+        }
+    },
     /* 7.3 Tunnel Management Messages */
     {
-     GTP_MSG_CREATE_PDP_REQ, {
-                             {GTP_EXT_IMSI, GTP_CONDITIONAL},
-                             /* RAI is in TS 29.060 V6.11.0 */
-                             {GTP_EXT_RAI, GTP_OPTIONAL},      /* Routeing Area Identity (RAI) Optional 7.7.3 */
-                             {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                             {GTP_EXT_SEL_MODE, GTP_CONDITIONAL},
-                             {GTP_EXT_TEID, GTP_MANDATORY},
-                             {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
-                             {GTP_EXT_NSAPI, GTP_MANDATORY},
-                             {GTP_EXT_NSAPI, GTP_CONDITIONAL},
-                             {GTP_EXT_CHRG_CHAR, GTP_OPTIONAL},
-                             {GTP_EXT_TRACE_REF, GTP_OPTIONAL},
-                             {GTP_EXT_TRACE_TYPE, GTP_OPTIONAL},
-                             {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
-                             {GTP_EXT_APN, GTP_CONDITIONAL},
-                             {GTP_EXT_PROTO_CONF, GTP_CONDITIONAL},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_MSISDN, GTP_CONDITIONAL},
-                             {GTP_EXT_QOS_UMTS, GTP_MANDATORY},
-                             {GTP_EXT_TFT, GTP_CONDITIONAL},
-                             {GTP_EXT_TRIGGER_ID, GTP_OPTIONAL},
-                             {GTP_EXT_OMC_ID, GTP_OPTIONAL},
-                             /* TS 29.060 V6.11.0 */
-                             {GTP_EXT_APN_RES, GTP_OPTIONAL},
-                             {GTP_EXT_RAT_TYPE, GTP_OPTIONAL},
-                             {GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},
-                             {GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},
-                             {GTP_EXT_IMEISV, GTP_OPTIONAL},
-                             {GTP_EXT_CAMEL_CHG_INF_CON, GTP_OPTIONAL},
-                             {GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_CREATE_PDP_REQ, {
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},
+            /* RAI is in TS 29.060 V6.11.0 */
+            {GTP_EXT_RAI, GTP_OPTIONAL},        /* Routeing Area Identity (RAI) Optional 7.7.3 */
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_SEL_MODE, GTP_CONDITIONAL},
+            {GTP_EXT_TEID, GTP_MANDATORY},
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
+            {GTP_EXT_NSAPI, GTP_MANDATORY},
+            {GTP_EXT_NSAPI, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_CHAR, GTP_OPTIONAL},
+            {GTP_EXT_TRACE_REF, GTP_OPTIONAL},
+            {GTP_EXT_TRACE_TYPE, GTP_OPTIONAL},
+            {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_APN, GTP_CONDITIONAL},
+            {GTP_EXT_PROTO_CONF, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_MSISDN, GTP_CONDITIONAL},
+            {GTP_EXT_QOS_UMTS, GTP_MANDATORY},
+            {GTP_EXT_TFT, GTP_CONDITIONAL},
+            {GTP_EXT_TRIGGER_ID, GTP_OPTIONAL},
+            {GTP_EXT_OMC_ID, GTP_OPTIONAL},
+            /* TS 29.060 V6.11.0 */
+            {GTP_EXT_APN_RES, GTP_OPTIONAL},
+            {GTP_EXT_RAT_TYPE, GTP_OPTIONAL},
+            {GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},
+            {GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},
+            {GTP_EXT_IMEISV, GTP_OPTIONAL},
+            {GTP_EXT_CAMEL_CHG_INF_CON, GTP_OPTIONAL},
+            {GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_CREATE_PDP_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_REORDER, GTP_CONDITIONAL},
-                              {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                              {GTP_EXT_TEID, GTP_CONDITIONAL},
-                              {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
-                                  {GTP_EXT_NSAPI, GTP_CONDITIONAL},
-                              {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
-                              {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_QOS_UMTS, GTP_CONDITIONAL},
-                              {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
-                              /* TS 29.060 V6.11.0 */
-                              {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},       /* Alternative Charging Gateway Address Optional 7.7.44 */
-                              {GTP_EXT_COMMON_FLGS, GTP_OPTIONAL},     /* Common Flags Optional 7.7.48 */
-                              {GTP_EXT_APN_RES, GTP_OPTIONAL}, /* APN Restriction Optional 7.7.49 */
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
-    {                          /* checked, SGSN -> GGSN */
-     GTP_MSG_UPDATE_PDP_REQ, {
-                             {GTP_EXT_IMSI, GTP_CONDITIONAL},
-                             {GTP_EXT_RAI, GTP_OPTIONAL},      /* Routeing Area Identity (RAI) Optional 7.7.3 */
-                             {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                             {GTP_EXT_TEID, GTP_MANDATORY},
-                             {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
-                             {GTP_EXT_NSAPI, GTP_MANDATORY},
-                             {GTP_EXT_TRACE_REF, GTP_OPTIONAL},
-                             {GTP_EXT_TRACE_TYPE, GTP_OPTIONAL},
-                             {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},       /* Protocol Configuration Options Optional 7.7.31 */
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},        /* SGSN Address for Control Plane Mandatory GSN Address 7.7.32 */
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},        /* SGSN Address for User Traffic Mandatory GSN Address 7.7.32 */
-                             {GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                             {GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* Alternative SGSN Address for User Traffic Conditional GSN Address 7.7.32 */
-                             {GTP_EXT_QOS_UMTS, GTP_MANDATORY},
-                             {GTP_EXT_TFT, GTP_OPTIONAL},
-                             {GTP_EXT_TRIGGER_ID, GTP_OPTIONAL},
-                             {GTP_EXT_OMC_ID, GTP_OPTIONAL},
-                             {GTP_EXT_COMMON_FLGS, GTP_OPTIONAL},                      /* Common Flags Optional 7.7.48 */
-                             {GTP_EXT_RAT_TYPE, GTP_OPTIONAL},                         /* RAT Type Optional 7.7.50 */
-                             {GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},                      /* User Location Information Optional 7.7.51 */
-                             {GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},                     /* MS Time Zone Optional 7.7.52 */
-                             {GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},                      /* Additonal Trace Info Optional 7.7.62 */
-                             {GTP_EXT_DIRECT_TUNNEL_FLGS, GTP_OPTIONAL},       /* Direct Tunnel Flags     7.7.81 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
-    {                          /* checked, GGSN -> SGSN */
-     GTP_MSG_UPDATE_PDP_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_RECOVER, GTP_OPTIONAL},
-                              {GTP_EXT_TEID, GTP_CONDITIONAL},
-                              {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
-                              {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
-                              {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},      /* Protocol Configuration Options Optional 7.7.31 */
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},        /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                              {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},        /* Alternative SGSN Address for User Traffic Conditional GSN Address 7.7.32 */
-                              {GTP_EXT_QOS_UMTS, GTP_CONDITIONAL},
-                              {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
-                              {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},       /* Alternative Charging Gateway Address Optional 7.7.44 */
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {GTP_EXT_COMMON_FLGS, GTP_OPTIONAL},     /* Common Flags Optional 7.7.48 */
-                              {GTP_EXT_APN_RES, GTP_OPTIONAL}, /* APN Restriction Optional 7.7.49 */
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_CREATE_PDP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_REORDER, GTP_CONDITIONAL},
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_TEID, GTP_CONDITIONAL},
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
+            {GTP_EXT_NSAPI, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
+            {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_QOS_UMTS, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
+            /* TS 29.060 V6.11.0 */
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},  /* Alternative Charging Gateway Address Optional 7.7.44 */
+            {GTP_EXT_COMMON_FLGS, GTP_OPTIONAL},        /* Common Flags Optional 7.7.48 */
+            {GTP_EXT_APN_RES, GTP_OPTIONAL},    /* APN Restriction Optional 7.7.49 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
+    {                           /* checked, SGSN -> GGSN */
+        GTP_MSG_UPDATE_PDP_REQ, {
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},
+            {GTP_EXT_RAI, GTP_OPTIONAL},        /* Routeing Area Identity (RAI) Optional 7.7.3 */
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_TEID, GTP_MANDATORY},
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
+            {GTP_EXT_NSAPI, GTP_MANDATORY},
+            {GTP_EXT_TRACE_REF, GTP_OPTIONAL},
+            {GTP_EXT_TRACE_TYPE, GTP_OPTIONAL},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},  /* SGSN Address for Control Plane Mandatory GSN Address 7.7.32 */
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},  /* SGSN Address for User Traffic Mandatory GSN Address 7.7.32 */
+            {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},   /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},   /* Alternative SGSN Address for User Traffic Conditional GSN Address 7.7.32 */
+            {GTP_EXT_QOS_UMTS, GTP_MANDATORY},
+            {GTP_EXT_TFT, GTP_OPTIONAL},
+            {GTP_EXT_TRIGGER_ID, GTP_OPTIONAL},
+            {GTP_EXT_OMC_ID, GTP_OPTIONAL},
+            {GTP_EXT_COMMON_FLGS, GTP_OPTIONAL},                        /* Common Flags Optional 7.7.48 */
+            {GTP_EXT_RAT_TYPE, GTP_OPTIONAL},                           /* RAT Type Optional 7.7.50 */
+            {GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},                        /* User Location Information Optional 7.7.51 */
+            {GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},                       /* MS Time Zone Optional 7.7.52 */
+            {GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},                        /* Additonal Trace Info Optional 7.7.62 */
+            {GTP_EXT_DIRECT_TUNNEL_FLGS, GTP_OPTIONAL}, /* Direct Tunnel Flags     7.7.81 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
+    {                           /* checked, GGSN -> SGSN */
+        GTP_MSG_UPDATE_PDP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},
+            {GTP_EXT_TEID, GTP_CONDITIONAL},
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},   /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},   /* Alternative SGSN Address for User Traffic Conditional GSN Address 7.7.32 */
+            {GTP_EXT_QOS_UMTS, GTP_CONDITIONAL},
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},  /* Alternative Charging Gateway Address Optional 7.7.44 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {GTP_EXT_COMMON_FLGS, GTP_OPTIONAL},        /* Common Flags Optional 7.7.48 */
+            {GTP_EXT_APN_RES, GTP_OPTIONAL},    /* APN Restriction Optional 7.7.49 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_DELETE_PDP_REQ, {
-                             {GTP_EXT_TEAR_IND, GTP_CONDITIONAL},
-                             {GTP_EXT_NSAPI, GTP_MANDATORY},
-                             {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},       /* Protocol Configuration Options Optional 7.7.31 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_DELETE_PDP_REQ, {
+            {GTP_EXT_TEAR_IND, GTP_CONDITIONAL},
+            {GTP_EXT_NSAPI, GTP_MANDATORY},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_DELETE_PDP_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},      /* Protocol Configuration Options Optional 7.7.31 */
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_DELETE_PDP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_ERR_IND, {
-                      {GTP_EXT_TEID, GTP_MANDATORY},
-                      {GTP_EXT_GSN_ADDR, GTP_MANDATORY},       /* GSN Address Mandatory 7.7.32 */
-                      {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                      {0, 0}
-                      }
-     },
+        GTP_MSG_ERR_IND, {
+            {GTP_EXT_TEID, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},  /* GSN Address Mandatory 7.7.32 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_PDU_NOTIFY_REQ, {
-                             {GTP_EXT_IMSI, GTP_MANDATORY},
-                             {GTP_EXT_TEID_CP, GTP_MANDATORY},
-                             {GTP_EXT_USER_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_APN, GTP_MANDATORY},
-                             {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},       /* Protocol Configuration Options Optional 7.7.31 */
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_PDU_NOTIFY_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_TEID_CP, GTP_MANDATORY},
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY},
+            {GTP_EXT_APN, GTP_MANDATORY},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_PDU_NOTIFY_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_PDU_NOTIFY_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_PDU_NOTIFY_REJ_REQ, {
-                                 {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                 {GTP_EXT_TEID_CP, GTP_MANDATORY},
-                                 {GTP_EXT_USER_ADDR, GTP_MANDATORY},
-                                 {GTP_EXT_APN, GTP_MANDATORY},
-                                 {GTP_EXT_PROTO_CONF, GTP_OPTIONAL},   /* Protocol Configuration Options Optional 7.7.31 */
-                                 {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                 {0, 0}
-                                 }
-     },
+        GTP_MSG_PDU_NOTIFY_REJ_REQ, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_TEID_CP, GTP_MANDATORY},
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY},
+            {GTP_EXT_APN, GTP_MANDATORY},
+            {GTP_EXT_PROTO_CONF, GTP_OPTIONAL}, /* Protocol Configuration Options Optional 7.7.31 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_PDU_NOTIFY_REJ_RESP, {
-                                  {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                  {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                  {0, 0}
-                                  }
-     },
+        GTP_MSG_PDU_NOTIFY_REJ_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     /* 7.4 Location Management Messages */
     {
-     GTP_MSG_SEND_ROUT_INFO_REQ, {
-                                 {GTP_EXT_IMSI, GTP_MANDATORY},
-                                 {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                 {0, 0}
-                                 }
-     },
+        GTP_MSG_SEND_ROUT_INFO_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SEND_ROUT_INFO_RESP, {
-                                  {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                  {GTP_EXT_IMSI, GTP_MANDATORY},
-                                  {GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
-                                  {GTPv1_EXT_MS_REASON, GTP_OPTIONAL},
-                                  {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},
-                                  {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                  {0, 0}
-                                  }
-     },
+        GTP_MSG_SEND_ROUT_INFO_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
+            {GTPv1_EXT_MS_REASON, GTP_OPTIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FAIL_REP_REQ, {
-                           {GTP_EXT_IMSI, GTP_MANDATORY},
-                           {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                           {0, 0}
-                           }
-     },
+        GTP_MSG_FAIL_REP_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FAIL_REP_RESP, {
-                            {GTP_EXT_CAUSE, GTP_MANDATORY},
-                            {GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
-                            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                            {0, 0}
-                            }
-     },
+        GTP_MSG_FAIL_REP_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_MAP_CAUSE, GTP_OPTIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_MS_PRESENT_REQ, {
-                             {GTP_EXT_IMSI, GTP_MANDATORY},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_MS_PRESENT_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_MS_PRESENT_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_MS_PRESENT_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     /* 7.5 Mobility Management Messages */
     {
-     GTP_MSG_IDENT_REQ, {
-                        {GTP_EXT_RAI, GTP_MANDATORY},
-                        {GTP_EXT_PTMSI, GTP_MANDATORY},
-                        {GTP_EXT_PTMSI_SIG, GTP_CONDITIONAL},
-                        {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},      /* SGSN Address for Control Plane Optional 7.7.32 */
-                        {GTP_EXT_HOP_COUNT, GTP_OPTIONAL},     /* Hop Counter Optional 7.7.63 */
-                        {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                        {0, 0}
-                        }
-     },
+        GTP_MSG_IDENT_REQ, {
+            {GTP_EXT_RAI, GTP_MANDATORY},
+            {GTP_EXT_PTMSI, GTP_MANDATORY},
+            {GTP_EXT_PTMSI_SIG, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},   /* SGSN Address for Control Plane Optional 7.7.32 */
+            {GTP_EXT_HOP_COUNT, GTP_OPTIONAL},  /* Hop Counter Optional 7.7.63 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_IDENT_RESP, {
-                         {GTP_EXT_CAUSE, GTP_MANDATORY},
-                         {GTP_EXT_IMSI, GTP_CONDITIONAL},
-                         {GTP_EXT_AUTH_TRI, GTP_CONDITIONAL},
-                         {GTP_EXT_AUTH_QUI, GTP_CONDITIONAL},
-                         {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                         {0, 0}
-                         }
-     },
+        GTP_MSG_IDENT_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},
+            {GTP_EXT_AUTH_TRI, GTP_CONDITIONAL},
+            {GTP_EXT_AUTH_QUI, GTP_CONDITIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SGSN_CNTXT_REQ, {
-                             {GTP_EXT_IMSI, GTP_CONDITIONAL},
-                             {GTP_EXT_RAI, GTP_MANDATORY},
-                             {GTP_EXT_TLLI, GTP_CONDITIONAL},
-                             {GTP_EXT_PTMSI, GTP_CONDITIONAL},
-                             {GTP_EXT_PTMSI_SIG, GTP_CONDITIONAL},
-                             {GTP_EXT_MS_VALID, GTP_OPTIONAL},
-                             {GTP_EXT_TEID_CP, GTP_MANDATORY},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_GSN_ADDR, GTP_OPTIONAL}, /* Alternative SGSN Address for Control Plane Optional 7.7.32 */
-                             {GTP_EXT_SSGN_NO, GTP_OPTIONAL},  /* SGSN Number Optional 7.7.47 */
-                             {GTP_EXT_HOP_COUNT, GTP_OPTIONAL},        /* Hop Counter Optional 7.7.63 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_SGSN_CNTXT_REQ, {
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},
+            {GTP_EXT_RAI, GTP_MANDATORY},
+            {GTP_EXT_TLLI, GTP_CONDITIONAL},
+            {GTP_EXT_PTMSI, GTP_CONDITIONAL},
+            {GTP_EXT_PTMSI_SIG, GTP_CONDITIONAL},
+            {GTP_EXT_MS_VALID, GTP_OPTIONAL},
+            {GTP_EXT_TEID_CP, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_GSN_ADDR, GTP_OPTIONAL},   /* Alternative SGSN Address for Control Plane Optional 7.7.32 */
+            {GTP_EXT_SSGN_NO, GTP_OPTIONAL},    /* SGSN Number Optional 7.7.47 */
+            {GTP_EXT_HOP_COUNT, GTP_OPTIONAL},  /* Hop Counter Optional 7.7.63 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SGSN_CNTXT_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_IMSI, GTP_CONDITIONAL},
-                              {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
-                              {GTP_EXT_RAB_CNTXT, GTP_CONDITIONAL},    /* RAB Context Conditional 7.7.19 */
-                              {GTP_EXT_RP_SMS, GTP_OPTIONAL},
-                              {GTP_EXT_RP, GTP_OPTIONAL},
-                              {GTP_EXT_PKT_FLOW_ID, GTP_OPTIONAL},
-                              {GTP_EXT_CHRG_CHAR, GTP_OPTIONAL},       /* CharingCharacteristics Optional 7.7.23 */
-                              {GTP_EXT_RA_PRIO_LCS, GTP_OPTIONAL},     /* Radio Priority LCS Optional 7.7.25B */
-                              {GTP_EXT_MM_CNTXT, GTP_CONDITIONAL},
-                              {GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_PDP_CONT_PRIO, GTP_OPTIONAL},   /* PDP Context Prioritization Optional 7.7.45 */
-                              {GTP_EXT_MBMS_UE_CTX, GTP_OPTIONAL},     /* MBMS UE Context Optional 7.7.55 */
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_SGSN_CNTXT_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
+            {GTP_EXT_RAB_CNTXT, GTP_CONDITIONAL},       /* RAB Context Conditional 7.7.19 */
+            {GTP_EXT_RP_SMS, GTP_OPTIONAL},
+            {GTP_EXT_RP, GTP_OPTIONAL},
+            {GTP_EXT_PKT_FLOW_ID, GTP_OPTIONAL},
+            {GTP_EXT_CHRG_CHAR, GTP_OPTIONAL},  /* CharingCharacteristics Optional 7.7.23 */
+            {GTP_EXT_RA_PRIO_LCS, GTP_OPTIONAL},        /* Radio Priority LCS Optional 7.7.25B */
+            {GTP_EXT_MM_CNTXT, GTP_CONDITIONAL},
+            {GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_PDP_CONT_PRIO, GTP_OPTIONAL},      /* PDP Context Prioritization Optional 7.7.45 */
+            {GTP_EXT_MBMS_UE_CTX, GTP_OPTIONAL},        /* MBMS UE Context Optional 7.7.55 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_SGSN_CNTXT_ACK, {
-                             {GTP_EXT_CAUSE, GTP_MANDATORY},
-                             {GTP_EXT_TEID_II, GTP_CONDITIONAL},
-                             {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_SGSN_CNTXT_ACK, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_TEID_II, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FORW_RELOC_REQ, {
-                             {GTP_EXT_IMSI, GTP_MANDATORY},
-                             {GTP_EXT_TEID_CP, GTP_MANDATORY},
-                             {GTP_EXT_RANAP_CAUSE, GTP_MANDATORY},
-                             {GTP_EXT_CHRG_CHAR, GTP_OPTIONAL},        /* CharingCharacteristics Optional 7.7.23 */
-                             {GTP_EXT_MM_CNTXT, GTP_MANDATORY},
-                             {GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
-                             {GTP_EXT_TARGET_ID, GTP_MANDATORY},
-                             {GTP_EXT_UTRAN_CONT, GTP_MANDATORY},
-                             {GTP_EXT_PDP_CONT_PRIO, GTP_OPTIONAL},    /* PDP Context Prioritization Optional 7.7.45 */
-                             {GTP_EXT_MBMS_UE_CTX, GTP_OPTIONAL},      /* MBMS UE Context Optional 7.7.55 */
-                             {GTP_EXT_SEL_PLMN_ID, GTP_OPTIONAL},      /* Selected PLMN ID Optional 7.7.64 */
-                             {GTP_EXT_PS_HO_REQ_CTX, GTP_OPTIONAL},    /* PS Handover Request Context Optional 7.7.71 */
-                             {GTP_EXT_BSS_CONT, GTP_OPTIONAL}, /* BSS Container Optional 7.7.72 */
-                             {GTP_EXT_CELL_ID, GTP_OPTIONAL},  /* Cell Identification Optional 7.7.73 */
-                             {GTP_EXT_BSSGP_CAUSE, GTP_OPTIONAL},      /* BSSGP Cause Optional 7.7.75 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {GTP_EXT_SSGN_NO, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_FORW_RELOC_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_TEID_CP, GTP_MANDATORY},
+            {GTP_EXT_RANAP_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_CHRG_CHAR, GTP_OPTIONAL},  /* CharingCharacteristics Optional 7.7.23 */
+            {GTP_EXT_MM_CNTXT, GTP_MANDATORY},
+            {GTP_EXT_PDP_CNTXT, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},
+            {GTP_EXT_TARGET_ID, GTP_MANDATORY},
+            {GTP_EXT_UTRAN_CONT, GTP_MANDATORY},
+            {GTP_EXT_PDP_CONT_PRIO, GTP_OPTIONAL},      /* PDP Context Prioritization Optional 7.7.45 */
+            {GTP_EXT_MBMS_UE_CTX, GTP_OPTIONAL},        /* MBMS UE Context Optional 7.7.55 */
+            {GTP_EXT_SEL_PLMN_ID, GTP_OPTIONAL},        /* Selected PLMN ID Optional 7.7.64 */
+            {GTP_EXT_PS_HO_REQ_CTX, GTP_OPTIONAL},      /* PS Handover Request Context Optional 7.7.71 */
+            {GTP_EXT_BSS_CONT, GTP_OPTIONAL},   /* BSS Container Optional 7.7.72 */
+            {GTP_EXT_CELL_ID, GTP_OPTIONAL},    /* Cell Identification Optional 7.7.73 */
+            {GTP_EXT_BSSGP_CAUSE, GTP_OPTIONAL},        /* BSSGP Cause Optional 7.7.75 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {GTP_EXT_SSGN_NO, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FORW_RELOC_RESP, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},
-                              {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
-                              {GTP_EXT_TEID_II, GTP_CONDITIONAL},      /* Tunnel Endpoint Identifier Data II Optional 7.7.15 */
-                              {GTP_EXT_RANAP_CAUSE, GTP_CONDITIONAL},
-                              {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
-                              {GTP_EXT_UTRAN_CONT, GTP_OPTIONAL},
-                              {GTP_EXT_RAB_SETUP, GTP_CONDITIONAL},
-                              {GTP_EXT_ADD_RAB_SETUP_INF, GTP_CONDITIONAL},    /* Additional RAB Setup Information Conditional 7.7.45A */
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_FORW_RELOC_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL},
+            {GTP_EXT_TEID_II, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Data II Optional 7.7.15 */
+            {GTP_EXT_RANAP_CAUSE, GTP_CONDITIONAL},
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},
+            {GTP_EXT_UTRAN_CONT, GTP_OPTIONAL},
+            {GTP_EXT_RAB_SETUP, GTP_CONDITIONAL},
+            {GTP_EXT_ADD_RAB_SETUP_INF, GTP_CONDITIONAL},       /* Additional RAB Setup Information Conditional 7.7.45A */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FORW_RELOC_COMP, {
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MSG_FORW_RELOC_COMP, {
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_RELOC_CANCEL_REQ, {
-                               {GTP_EXT_IMSI, GTP_MANDATORY},
-                               {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                               {0, 0}
-                               }
-     },
+        GTP_MSG_RELOC_CANCEL_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_RELOC_CANCEL_RESP, {
-                                {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                {0, 0}
-                                }
-     },
+        GTP_MSG_RELOC_CANCEL_RESP, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FORW_RELOC_ACK, {
-                             {GTP_EXT_CAUSE, GTP_MANDATORY},
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_MSG_FORW_RELOC_ACK, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FORW_SRNS_CNTXT_ACK, {
-                                  {GTP_EXT_CAUSE, GTP_MANDATORY},
-                                  {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                  {0, 0}
-                                  }
-     },
+        GTP_MSG_FORW_SRNS_CNTXT_ACK, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MSG_FORW_SRNS_CNTXT, {
-                              {GTP_EXT_RAB_CNTXT, GTP_MANDATORY},
-                              {GTP_EXT_SRC_RNC_PDP_CTX_INF, GTP_OPTIONAL},     /* Source RNC PDCP context info Optional 7.7.61 */
-                              {GTP_EXT_PDU_NO, GTP_OPTIONAL},  /* PDU Numbers Optional 7.7.74 */
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
-
-/*     7.5.14 RAN Information Management Messages */
+        GTP_MSG_FORW_SRNS_CNTXT, {
+            {GTP_EXT_RAB_CNTXT, GTP_MANDATORY},
+            {GTP_EXT_SRC_RNC_PDP_CTX_INF, GTP_OPTIONAL},        /* Source RNC PDCP context info Optional 7.7.61 */
+            {GTP_EXT_PDU_NO, GTP_OPTIONAL},     /* PDU Numbers Optional 7.7.74 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
+
+/*      7.5.14 RAN Information Management Messages */
     {
-     GTP_MSG_RAN_INFO_RELAY, {
-                             {GTP_EXT_RAN_TR_CONT, GTP_MANDATORY},     /* RAN Transparent Container Mandatory 7.7.43 */
-                             {GTP_EXT_RIM_RA, GTP_OPTIONAL},   /* RIM Routing Address Optional 7.7.57 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
-/* 7.5A MBMS Messages 
+        GTP_MSG_RAN_INFO_RELAY, {
+            {GTP_EXT_RAN_TR_CONT, GTP_MANDATORY},       /* RAN Transparent Container Mandatory 7.7.43 */
+            {GTP_EXT_RIM_RA, GTP_OPTIONAL},             /* RIM Routing Address Optional 7.7.57 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
+/* 7.5A MBMS Messages
  * 7.5A.1 UE Specific MBMS Messages
  */
     {
-     GTP_MBMS_NOTIFY_REQ, {
-                          {GTP_EXT_IMSI, GTP_MANDATORY},       /* IMSI Mandatory 7.7.2 */
-                          {GTP_EXT_TEID_CP, GTP_MANDATORY},    /* Tunnel Endpoint Identifier Control Plane Mandatory 7.7.14 */
-                          {GTP_EXT_NSAPI, GTP_MANDATORY},      /* NSAPI Mandatory 7.7.17 */
-                          {GTP_EXT_USER_ADDR, GTP_MANDATORY},  /* End User Address Mandatory 7.7.27 */
-                          {GTP_EXT_APN, GTP_MANDATORY},        /* Access Point Name Mandatory 7.7.30 */
-                          {GTP_EXT_GSN_ADDR, GTP_MANDATORY},   /* GGSN Address for Control Plane Mandatory 7.7.32 */
-                          {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL},  /* MBMS Protocol Configuration Options Optional 7.7.58 */
-                          {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},    /* Private Extension Optional 7.7.46 */
-                          {0, 0}
-                          }
-     },
+        GTP_MBMS_NOTIFY_REQ, {
+            {GTP_EXT_IMSI, GTP_MANDATORY},      /* IMSI Mandatory 7.7.2 */
+            {GTP_EXT_TEID_CP, GTP_MANDATORY},   /* Tunnel Endpoint Identifier Control Plane Mandatory 7.7.14 */
+            {GTP_EXT_NSAPI, GTP_MANDATORY},     /* NSAPI Mandatory 7.7.17 */
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
+            {GTP_EXT_APN, GTP_MANDATORY},       /* Access Point Name Mandatory 7.7.30 */
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},  /* GGSN Address for Control Plane Mandatory 7.7.32 */
+            {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_NOTIFY_RES, {
-                          {GTP_EXT_CAUSE, GTP_MANDATORY},      /* Cause Mandatory 7.7.1 */
-                          {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                          {0, 0}
-                          }
-     },
+        GTP_MBMS_NOTIFY_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_NOTIFY_REJ_REQ, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},  /* Cause Mandatory 7.7.1 */
-                              {GTP_EXT_TEID_CP, GTP_MANDATORY},        /* Tunnel Endpoint Identifier Control Plane Mandatory 7.7.14 */
-                              {GTP_EXT_NSAPI, GTP_MANDATORY},  /* NSAPI Mandatory 7.7.17 */
-                              {GTP_EXT_USER_ADDR, GTP_MANDATORY},      /* End User Address Mandatory 7.7.27 */
-                              {GTP_EXT_APN, GTP_MANDATORY},    /* Access Point Name Mandatory 7.7.30 */
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MBMS_NOTIFY_REJ_REQ, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_TEID_CP, GTP_MANDATORY},   /* Tunnel Endpoint Identifier Control Plane Mandatory 7.7.14 */
+            {GTP_EXT_NSAPI, GTP_MANDATORY},     /* NSAPI Mandatory 7.7.17 */
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
+            {GTP_EXT_APN, GTP_MANDATORY},       /* Access Point Name Mandatory 7.7.30 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_NOTIFY_REJ_RES, {
-                              {GTP_EXT_CAUSE, GTP_MANDATORY},  /* Cause Mandatory 7.7.1 */
-                              {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                              {0, 0}
-                              }
-     },
+        GTP_MBMS_NOTIFY_REJ_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_CREATE_MBMS_CNTXT_REQ, {
-                                {GTP_EXT_IMSI, GTP_CONDITIONAL},       /* IMSI Conditional 7.7.2 */
-                                {GTP_EXT_RAI, GTP_MANDATORY},  /* Routeing Area Identity (RAI) Mandatory 7.7.3 */
-                                {GTP_EXT_RECOVER, GTP_OPTIONAL},       /* Recovery Optional 7.7.11 */
-                                {GTP_EXT_SEL_MODE, GTP_CONDITIONAL},   /* Selection mode Conditional 7.7.12 */
-                                {GTP_EXT_TEID_CP, GTP_CONDITIONAL},    /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
-                                {GTP_EXT_TRACE_REF, GTP_OPTIONAL},     /* Trace Reference Optional 7.7.24 */
-                                {GTP_EXT_TRACE_TYPE, GTP_OPTIONAL},    /* Trace Type Optional 7.7.25 */
-                                {GTP_EXT_USER_ADDR, GTP_MANDATORY},    /* End User Address Mandatory 7.7.27 */
-                                {GTP_EXT_APN, GTP_MANDATORY},  /* Access Point Name Mandatory 7.7.30 */
-                                {GTP_EXT_GSN_ADDR, GTP_MANDATORY},     /* SGSN Address for signalling Mandatory GSN Address 7.7.32 */
-                                {GTP_EXT_MSISDN, GTP_CONDITIONAL},     /* MSISDN Conditional 7.7.33 */
-                                {GTP_EXT_TRIGGER_ID, GTP_OPTIONAL},    /* Trigger Id Optional 7.7.41 */
-                                {GTP_EXT_OMC_ID, GTP_OPTIONAL},        /* OMC Identity Optional 7.7.42 */
-                                {GTP_EXT_RAT_TYPE, GTP_OPTIONAL},      /* RAT Type Optional 7.7.50 */
-                                {GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},   /* User Location Information Optional 7.7.51 */
-                                {GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},  /* MS Time Zone Optional 7.7.52 */
-                                {GTP_EXT_IMEISV, GTP_OPTIONAL},        /* IMEI(SV) Optional 7.7.53 */
-                                {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL},    /* MBMS Protocol Configuration Options Optional 7.7.58 */
-                                {GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},   /* Additonal Trace Info Optional 7.7.62 */
-                                {GTP_EXT_ENH_NSAPI, GTP_MANDATORY},    /* Enhanced NSAPI Mandatory 7.7.67 */
-                                {GTP_EXT_ADD_MBMS_TRS_INF, GTP_OPTIONAL},      /* Additional MBMS Trace Info Optional 7.7.68 */
-                                {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                {0, 0}
-                                }
-     },
+        GTP_CREATE_MBMS_CNTXT_REQ, {
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},    /* IMSI Conditional 7.7.2 */
+            {GTP_EXT_RAI, GTP_MANDATORY},       /* Routeing Area Identity (RAI) Mandatory 7.7.3 */
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},    /* Recovery Optional 7.7.11 */
+            {GTP_EXT_SEL_MODE, GTP_CONDITIONAL},        /* Selection mode Conditional 7.7.12 */
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
+            {GTP_EXT_TRACE_REF, GTP_OPTIONAL},  /* Trace Reference Optional 7.7.24 */
+            {GTP_EXT_TRACE_TYPE, GTP_OPTIONAL}, /* Trace Type Optional 7.7.25 */
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
+            {GTP_EXT_APN, GTP_MANDATORY},       /* Access Point Name Mandatory 7.7.30 */
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},  /* SGSN Address for signalling Mandatory GSN Address 7.7.32 */
+            {GTP_EXT_MSISDN, GTP_CONDITIONAL},  /* MSISDN Conditional 7.7.33 */
+            {GTP_EXT_TRIGGER_ID, GTP_OPTIONAL}, /* Trigger Id Optional 7.7.41 */
+            {GTP_EXT_OMC_ID, GTP_OPTIONAL},     /* OMC Identity Optional 7.7.42 */
+            {GTP_EXT_RAT_TYPE, GTP_OPTIONAL},   /* RAT Type Optional 7.7.50 */
+            {GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},        /* User Location Information Optional 7.7.51 */
+            {GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},       /* MS Time Zone Optional 7.7.52 */
+            {GTP_EXT_IMEISV, GTP_OPTIONAL},     /* IMEI(SV) Optional 7.7.53 */
+            {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
+            {GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},        /* Additonal Trace Info Optional 7.7.62 */
+            {GTP_EXT_ENH_NSAPI, GTP_MANDATORY}, /* Enhanced NSAPI Mandatory 7.7.67 */
+            {GTP_EXT_ADD_MBMS_TRS_INF, GTP_OPTIONAL},   /* Additional MBMS Trace Info Optional 7.7.68 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_CREATE_MBMS_CNTXT_RES, {
-                                {GTP_EXT_CAUSE, GTP_MANDATORY},        /* Cause Mandatory 7.7.1 */
-                                {GTP_EXT_RECOVER, GTP_OPTIONAL},       /* Recovery Optional 7.7.11 */
-                                {GTP_EXT_TEID_CP, GTP_CONDITIONAL},    /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
-                                {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},    /* Charging ID Conditional 7.7.26 */
-                                {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},   /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                                {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},   /* Alternative GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                                {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},     /* Charging Gateway Address Optional 7.7.44 */
-                                {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},     /* Alternative Charging Gateway Address Optional 7.7.44 */
-                                {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL},    /* MBMS Protocol Configuration Options Optional 7.7.58 */
-                                {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                                {0, 0}
-                                }
-     },
+        GTP_CREATE_MBMS_CNTXT_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},    /* Recovery Optional 7.7.11 */
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
+            {GTP_EXT_CHRG_ID, GTP_CONDITIONAL}, /* Charging ID Conditional 7.7.26 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},        /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},        /* Alternative GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},  /* Charging Gateway Address Optional 7.7.44 */
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},  /* Alternative Charging Gateway Address Optional 7.7.44 */
+            {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_UPD_MBMS_CNTXT_REQ, {
-                             {GTP_EXT_IMSI, GTP_CONDITIONAL},  /* IMSI Conditional 7.7.2 */
-                             {GTP_EXT_RAI, GTP_MANDATORY},     /* Routeing Area Identity (RAI) Mandatory 7.7.3 */
-                             {GTP_EXT_RECOVER, GTP_OPTIONAL},  /* Recovery Optional 7.7.11 */
-                             {GTP_EXT_TEID_CP, GTP_CONDITIONAL},       /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
-                             {GTP_EXT_TRACE_REF, GTP_OPTIONAL},        /* Trace Reference Optional 7.7.24 */
-                             {GTP_EXT_TRACE_TYPE, GTP_OPTIONAL},       /* Trace Type Optional 7.7.25 */
-                             {GTP_EXT_GSN_ADDR, GTP_MANDATORY},        /* SGSN Address for Control Plane Mandatory GSN Address 7.7.32 */
-                             {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},      /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                             {GTP_EXT_TRIGGER_ID, GTP_OPTIONAL},       /* Trigger Id Optional 7.7.41 */
-                             {GTP_EXT_OMC_ID, GTP_OPTIONAL},   /* OMC Identity Optional 7.7.42 */
-                             {GTP_EXT_RAT_TYPE, GTP_OPTIONAL}, /* RAT Type Optional 7.7.50 */
-                             {GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},      /* User Location Information Optional 7.7.51 */
-                             {GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},     /* MS Time Zone Optional 7.7.52 */
-                             {GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},      /* Additional Trace Info Optional 7.7.62 */
-                             {GTP_EXT_ENH_NSAPI, GTP_MANDATORY},       /* Enhanced NSAPI Mandatory 7.7.67 */
-                             {GTP_EXT_ADD_MBMS_TRS_INF, GTP_OPTIONAL}, /* Additional MBMS Trace Info Optional 7.7.68 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_UPD_MBMS_CNTXT_REQ, {
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},    /* IMSI Conditional 7.7.2 */
+            {GTP_EXT_RAI, GTP_MANDATORY},       /* Routeing Area Identity (RAI) Mandatory 7.7.3 */
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},    /* Recovery Optional 7.7.11 */
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
+            {GTP_EXT_TRACE_REF, GTP_OPTIONAL},  /* Trace Reference Optional 7.7.24 */
+            {GTP_EXT_TRACE_TYPE, GTP_OPTIONAL}, /* Trace Type Optional 7.7.25 */
+            {GTP_EXT_GSN_ADDR, GTP_MANDATORY},  /* SGSN Address for Control Plane Mandatory GSN Address 7.7.32 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},        /* Alternative SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_TRIGGER_ID, GTP_OPTIONAL}, /* Trigger Id Optional 7.7.41 */
+            {GTP_EXT_OMC_ID, GTP_OPTIONAL},     /* OMC Identity Optional 7.7.42 */
+            {GTP_EXT_RAT_TYPE, GTP_OPTIONAL},   /* RAT Type Optional 7.7.50 */
+            {GTP_EXT_USR_LOC_INF, GTP_OPTIONAL},        /* User Location Information Optional 7.7.51 */
+            {GTP_EXT_MS_TIME_ZONE, GTP_OPTIONAL},       /* MS Time Zone Optional 7.7.52 */
+            {GTP_EXT_ADD_TRS_INF, GTP_OPTIONAL},        /* Additional Trace Info Optional 7.7.62 */
+            {GTP_EXT_ENH_NSAPI, GTP_MANDATORY}, /* Enhanced NSAPI Mandatory 7.7.67 */
+            {GTP_EXT_ADD_MBMS_TRS_INF, GTP_OPTIONAL},   /* Additional MBMS Trace Info Optional 7.7.68 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_UPD_MBMS_CNTXT_RES, {
-                             {GTP_EXT_CAUSE, GTP_MANDATORY},   /* Cause Mandatory 7.7.1 */
-                             {GTP_EXT_RECOVER, GTP_OPTIONAL},  /* Recovery Optional 7.7.11 */
-                             {GTP_EXT_TEID_CP, GTP_MANDATORY}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
-                             {GTP_EXT_CHRG_ID, GTP_CONDITIONAL},       /* Charging ID Conditional 7.7.26 */
-                             {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},      /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                             {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},      /* Alternative GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                             {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},        /* Charging Gateway Address Optional 7.7.44 */
-                             {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},        /* Alternative Charging Gateway Address Optional 7.7.44 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
-                             {0, 0}
-                             }
-     },
+        GTP_UPD_MBMS_CNTXT_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},    /* Recovery Optional 7.7.11 */
+            {GTP_EXT_TEID_CP, GTP_MANDATORY},   /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
+            {GTP_EXT_CHRG_ID, GTP_CONDITIONAL}, /* Charging ID Conditional 7.7.26 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},        /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},        /* Alternative GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},  /* Charging Gateway Address Optional 7.7.44 */
+            {GTP_EXT_CHRG_ADDR, GTP_OPTIONAL},  /* Alternative Charging Gateway Address Optional 7.7.44 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_DEL_MBMS_CNTXT_REQ, {
-                             {GTP_EXT_IMSI, GTP_CONDITIONAL},  /* IMSI Conditional 7.7.2 */
-                             {GTP_EXT_TEID_CP, GTP_MANDATORY}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
-                             {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},     /* End User Address Conditional 7.7.27 */
-                             {GTP_EXT_APN, GTP_CONDITIONAL},   /* Access Point Name Conditional 7.7.30 */
-                             {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL},       /* MBMS Protocol Configuration Options Optional 7.7.58 */
-                             {GTP_EXT_ENH_NSAPI, GTP_MANDATORY},       /* Enhanced NSAPI Conditional 7.7.67 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
-                             {0, 0}
-                             }
-     },
+        GTP_DEL_MBMS_CNTXT_REQ, {
+            {GTP_EXT_IMSI, GTP_CONDITIONAL},    /* IMSI Conditional 7.7.2 */
+            {GTP_EXT_TEID_CP, GTP_MANDATORY},   /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
+            {GTP_EXT_USER_ADDR, GTP_CONDITIONAL},       /* End User Address Conditional 7.7.27 */
+            {GTP_EXT_APN, GTP_CONDITIONAL},     /* Access Point Name Conditional 7.7.30 */
+            {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
+            {GTP_EXT_ENH_NSAPI, GTP_MANDATORY}, /* Enhanced NSAPI Conditional 7.7.67 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_DEL_MBMS_CNTXT_RES, {
-                             {GTP_EXT_CAUSE, GTP_MANDATORY},   /* Cause Mandatory 7.7.1 */
-                             {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL},       /* MBMS Protocol Configuration Options Optional 7.7.58 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
-                             {0, 0}
-                             }
-     },
+        GTP_DEL_MBMS_CNTXT_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_MBMS_PROT_CONF_OPT, GTP_OPTIONAL}, /* MBMS Protocol Configuration Options Optional 7.7.58 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_REG_REQ, {
-                       {GTP_EXT_USER_ADDR, GTP_MANDATORY},     /* End User Address Mandatory 7.7.27 */
-                       {GTP_EXT_APN, GTP_MANDATORY},   /* Access Point Name Mandatory 7.7.30 */
-                       {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},       /* Private Extension Optional 7.7.46 */
-                       {0, 0}
-                       }
-     },
+        GTP_MBMS_REG_REQ, {
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
+            {GTP_EXT_APN, GTP_MANDATORY},       /* Access Point Name Mandatory 7.7.30 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_REG_RES, {
-                       {GTP_EXT_CAUSE, GTP_MANDATORY}, /* Cause Mandatory 7.7.1 */
-                       {GTP_EXT_TMGI, GTP_MANDATORY},  /* Temporary Mobile Group Identity (TMGI) Conditional 7.7.56 */
-                       {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},       /* Private Extension Optional 7.7.46 */
-                       {0, 0}
-                       }
-     },
+        GTP_MBMS_REG_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_TMGI, GTP_MANDATORY},      /* Temporary Mobile Group Identity (TMGI) Conditional 7.7.56 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_DE_REG_REQ, {
-                          {GTP_EXT_USER_ADDR, GTP_MANDATORY},  /* End User Address Mandatory 7.7.27 */
-                          {GTP_EXT_APN, GTP_MANDATORY},        /* Access Point Name Mandatory 7.7.30 */
-                          {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},    /* Private Extension Optional 7.7.46 */
-                          {0, 0}
-                          }
-     },
+        GTP_MBMS_DE_REG_REQ, {
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
+            {GTP_EXT_APN, GTP_MANDATORY},       /* Access Point Name Mandatory 7.7.30 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_DE_REG_RES, {
-                          {GTP_EXT_CAUSE, GTP_MANDATORY},      /* Cause Mandatory 7.7.1 */
-                          {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},    /* Private Extension Optional 7.7.46 */
-                          {0, 0}
-                          }
-     },
+        GTP_MBMS_DE_REG_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_SES_START_REQ, {
-                             {GTP_EXT_RECOVER, GTP_OPTIONAL},  /* Recovery Optional 7.7.11 */
-                             {GTP_EXT_TEID_CP, GTP_CONDITIONAL},       /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
-                             {GTP_EXT_USER_ADDR, GTP_MANDATORY},       /* End User Address Mandatory 7.7.27 */
-                             {GTP_EXT_APN, GTP_MANDATORY},     /* Access Point Name Mandatory 7.7.30 */
-                             {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},      /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                             {GTP_EXT_QOS_UMTS, GTP_MANDATORY},        /* Quality of Service Profile Mandatory 7.7.34 */
-                             {GTP_EXT_COMMON_FLGS, GTP_OPTIONAL},      /* Common Flags Mandatory 7.7.48 */
-                             {GTP_EXT_TMGI, GTP_MANDATORY},    /* Temporary Mobile Group Identity (TMGI) Mandatory 7.7.56 */
-                             {GTP_EXT_MBMS_SES_DUR, GTP_MANDATORY},    /* MBMS Session Duration Mandatory 7.7.59 */
-                             {GTP_EXT_MBMS_SA, GTP_MANDATORY}, /* MBMS Service Area Mandatory 7.7.60 */
-                             {GTP_EXT_MBMS_SES_ID, GTP_OPTIONAL},      /* MBMS Session Identifier Optional 7.7.65 */
-                             {GTP_EXT_MBMS_2G_3G_IND, GTP_MANDATORY},  /* MBMS 2G/3G Indicator Mandatory 7.7.66 */
-                             {GTP_EXT_MBMS_SES_ID_REP_NO, GTP_OPTIONAL},       /* MBMS Session Identity Repetition Number Optional 7.7.69 */
-                             {GTP_EXT_MBMS_TIME_TO_DATA_TR, GTP_MANDATORY},    /* MBMS Time To Data Transfer Mandatory 7.7.70 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
-                             {0, 0}
-                             }
-     },
+        GTP_MBMS_SES_START_REQ, {
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},    /* Recovery Optional 7.7.11 */
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
+            {GTP_EXT_APN, GTP_MANDATORY},       /* Access Point Name Mandatory 7.7.30 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},        /* GGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_QOS_UMTS, GTP_MANDATORY},  /* Quality of Service Profile Mandatory 7.7.34 */
+            {GTP_EXT_COMMON_FLGS, GTP_OPTIONAL},        /* Common Flags Mandatory 7.7.48 */
+            {GTP_EXT_TMGI, GTP_MANDATORY},      /* Temporary Mobile Group Identity (TMGI) Mandatory 7.7.56 */
+            {GTP_EXT_MBMS_SES_DUR, GTP_MANDATORY},      /* MBMS Session Duration Mandatory 7.7.59 */
+            {GTP_EXT_MBMS_SA, GTP_MANDATORY},   /* MBMS Service Area Mandatory 7.7.60 */
+            {GTP_EXT_MBMS_SES_ID, GTP_OPTIONAL},        /* MBMS Session Identifier Optional 7.7.65 */
+            {GTP_EXT_MBMS_2G_3G_IND, GTP_MANDATORY},    /* MBMS 2G/3G Indicator Mandatory 7.7.66 */
+            {GTP_EXT_MBMS_SES_ID_REP_NO, GTP_OPTIONAL}, /* MBMS Session Identity Repetition Number Optional 7.7.69 */
+            {GTP_EXT_MBMS_TIME_TO_DATA_TR, GTP_MANDATORY},      /* MBMS Time To Data Transfer Mandatory 7.7.70 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_SES_START_RES, {
-                             {GTP_EXT_CAUSE, GTP_MANDATORY},   /* Cause Mandatory 7.7.1 */
-                             {GTP_EXT_RECOVER, GTP_OPTIONAL},  /* Recovery Optional 7.7.11 */
-                             {GTP_EXT_TEID, GTP_CONDITIONAL},  /* Tunnel Endpoint Identifier Data I Conditional 7.7.13 */
-                             {GTP_EXT_TEID_CP, GTP_CONDITIONAL},       /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
-                             {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},      /* SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
-                             {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},      /* SGSN Address for user traffic Conditional GSN Address 7.7.32 */
-                             {GTP_EXT_PRIV_EXT, GTP_OPTIONAL}, /* Private Extension Optional 7.7.46 */
-                             {0, 0}
-                             }
-     },
+        GTP_MBMS_SES_START_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_RECOVER, GTP_OPTIONAL},    /* Recovery Optional 7.7.11 */
+            {GTP_EXT_TEID, GTP_CONDITIONAL},    /* Tunnel Endpoint Identifier Data I Conditional 7.7.13 */
+            {GTP_EXT_TEID_CP, GTP_CONDITIONAL}, /* Tunnel Endpoint Identifier Control Plane Conditional 7.7.14 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},        /* SGSN Address for Control Plane Conditional GSN Address 7.7.32 */
+            {GTP_EXT_GSN_ADDR, GTP_CONDITIONAL},        /* SGSN Address for user traffic Conditional GSN Address 7.7.32 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_SES_STOP_REQ, {
-                            {GTP_EXT_USER_ADDR, GTP_MANDATORY},        /* End User Address Mandatory 7.7.27 */
-                            {GTP_EXT_APN, GTP_MANDATORY},      /* Access Point Name Mandatory 7.7.30 */
-                            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},  /* Private Extension Optional 7.7.46 */
-                            {0, 0}
-                            }
-     },
+        GTP_MBMS_SES_STOP_REQ, {
+            {GTP_EXT_USER_ADDR, GTP_MANDATORY}, /* End User Address Mandatory 7.7.27 */
+            {GTP_EXT_APN, GTP_MANDATORY},       /* Access Point Name Mandatory 7.7.30 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     GTP_MBMS_SES_STOP_RES, {
-                            {GTP_EXT_CAUSE, GTP_MANDATORY},    /* Cause Mandatory 7.7.1 */
-                            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},  /* Private Extension Optional 7.7.46 */
-                            {0, 0}
-                            }
-     },
+        GTP_MBMS_SES_STOP_RES, {
+            {GTP_EXT_CAUSE, GTP_MANDATORY},     /* Cause Mandatory 7.7.1 */
+            {GTP_EXT_PRIV_EXT, GTP_OPTIONAL},   /* Private Extension Optional 7.7.46 */
+            {0, 0}
+        }
+    },
     {
-     0, {
-        {0, 0}
-        }
-     }
+        0, {
+            {0, 0}
+        }
+    }
 };
 
 /* Data structure attached to a conversation,
-       to keep track of request/response-pairs
+        to keep track of request/response-pairs
  */
 typedef struct gtp_conv_info_t {
     struct gtp_conv_info_t *next;
@@ -2626,25 +2942,25 @@ typedef struct gtp_conv_info_t {
     GHashTable *matched;
 } gtp_conv_info_t;
 
-static gtp_conv_info_t *gtp_info_items;
+static gtp_conv_info_t *gtp_info_items = NULL;
 
 static guint gtp_sn_hash(gconstpointer k)
 {
-    const gtp_msg_hash_t *key = k;
+    const gtp_msg_hash_t *key = (const gtp_msg_hash_t *)k;
 
     return key->seq_nr;
 }
 
 static gint gtp_sn_equal_matched(gconstpointer k1, gconstpointer k2)
 {
-    const gtp_msg_hash_t *key1 = k1;
-    const gtp_msg_hash_t *key2 = k2;
+    const gtp_msg_hash_t *key1 = (const gtp_msg_hash_t *)k1;
+    const gtp_msg_hash_t *key2 = (const gtp_msg_hash_t *)k2;
 
-    if( key1->req_frame && key2->req_frame && (key1->req_frame!=key2->req_frame) ){
+    if ( key1->req_frame && key2->req_frame && (key1->req_frame!=key2->req_frame) ) {
         return 0;
     }
 
-    if( key1->rep_frame && key2->rep_frame && (key1->rep_frame!=key2->rep_frame) ){
+    if ( key1->rep_frame && key2->rep_frame && (key1->rep_frame!=key2->rep_frame) ) {
         return 0;
     }
 
@@ -2653,8 +2969,8 @@ static gint gtp_sn_equal_matched(gconstpointer k1, gconstpointer k2)
 
 static gint gtp_sn_equal_unmatched(gconstpointer k1, gconstpointer k2)
 {
-    const gtp_msg_hash_t *key1 = k1;
-    const gtp_msg_hash_t *key2 = k2;
+    const gtp_msg_hash_t *key1 = (const gtp_msg_hash_t *)k1;
+    const gtp_msg_hash_t *key2 = (const gtp_msg_hash_t *)k2;
 
     return key1->seq_nr == key2->seq_nr;
 }
@@ -2671,93 +2987,93 @@ static gtp_msg_hash_t *gtp_match_response(tvbuff_t * tvb, packet_info * pinfo, p
     case GTP_MSG_CREATE_PDP_REQ:
     case GTP_MSG_UPDATE_PDP_REQ:
     case GTP_MSG_DELETE_PDP_REQ:
-       gcr.is_request=TRUE;
-       gcr.req_frame=pinfo->fd->num;
+        gcr.is_request=TRUE;
+        gcr.req_frame=pinfo->fd->num;
         gcr.rep_frame=0;
-       break;
+        break;
     case GTP_MSG_ECHO_RESP:
     case GTP_MSG_CREATE_PDP_RESP:
     case GTP_MSG_UPDATE_PDP_RESP:
     case GTP_MSG_DELETE_PDP_RESP:
-       gcr.is_request=FALSE;
+        gcr.is_request=FALSE;
         gcr.req_frame=0;
-       gcr.rep_frame=pinfo->fd->num;
-       break;
-       default:;
-       break;
+        gcr.rep_frame=pinfo->fd->num;
+        break;
+        default:;
+        break;
     }
 
-    gcrp = g_hash_table_lookup(gtp_info->matched, &gcr);
+    gcrp = (gtp_msg_hash_t *)g_hash_table_lookup(gtp_info->matched, &gcr);
 
-    if(gcrp){
+    if (gcrp) {
 
         gcrp->is_request=gcr.is_request;
 
     } else {
 
-       /*no match, let's try to make one*/     
-       switch (msgtype) {
+        /*no match, let's try to make one*/
+        switch (msgtype) {
         case GTP_MSG_ECHO_REQ:
-       case GTP_MSG_CREATE_PDP_REQ:
-       case GTP_MSG_UPDATE_PDP_REQ:
-       case GTP_MSG_DELETE_PDP_REQ:
+        case GTP_MSG_CREATE_PDP_REQ:
+        case GTP_MSG_UPDATE_PDP_REQ:
+        case GTP_MSG_DELETE_PDP_REQ:
             gcr.seq_nr=seq_nr;
 
-            gcrp=g_hash_table_lookup(gtp_info->unmatched, &gcr);
-            if(gcrp){
+            gcrp=(gtp_msg_hash_t *)g_hash_table_lookup(gtp_info->unmatched, &gcr);
+            if (gcrp) {
                 g_hash_table_remove(gtp_info->unmatched, gcrp);
             }
             /* if we cant reuse the old one, grab a new chunk */
-            if(!gcrp){
-                gcrp = se_alloc(sizeof(gtp_msg_hash_t));
+            if (!gcrp) {
+                gcrp = se_new(gtp_msg_hash_t);
             }
             gcrp->seq_nr=seq_nr;
-           gcrp->req_frame = pinfo->fd->num;
-           gcrp->req_time = pinfo->fd->abs_ts;
-           gcrp->rep_frame = 0;
-           gcrp->msgtype = msgtype;
-           gcrp->is_request = TRUE;
-           g_hash_table_insert(gtp_info->unmatched, gcrp, gcrp);
+            gcrp->req_frame = pinfo->fd->num;
+            gcrp->req_time = pinfo->fd->abs_ts;
+            gcrp->rep_frame = 0;
+            gcrp->msgtype = msgtype;
+            gcrp->is_request = TRUE;
+            g_hash_table_insert(gtp_info->unmatched, gcrp, gcrp);
             return NULL;
-           break;
+            break;
         case GTP_MSG_ECHO_RESP:
-       case GTP_MSG_CREATE_PDP_RESP:
-       case GTP_MSG_UPDATE_PDP_RESP:
-       case GTP_MSG_DELETE_PDP_RESP:
+        case GTP_MSG_CREATE_PDP_RESP:
+        case GTP_MSG_UPDATE_PDP_RESP:
+        case GTP_MSG_DELETE_PDP_RESP:
             gcr.seq_nr=seq_nr;
-            gcrp=g_hash_table_lookup(gtp_info->unmatched, &gcr);
+            gcrp=(gtp_msg_hash_t *)g_hash_table_lookup(gtp_info->unmatched, &gcr);
 
             if (gcrp) {
-               if(!gcrp->rep_frame){
+                if (!gcrp->rep_frame) {
                     g_hash_table_remove(gtp_info->unmatched, gcrp);
                     gcrp->rep_frame=pinfo->fd->num;
                     gcrp->is_request=FALSE;
-                    g_hash_table_insert(gtp_info->matched, gcrp, gcrp);                        
+                    g_hash_table_insert(gtp_info->matched, gcrp, gcrp);
                 }
             }
             break;
-       default:;
-       break;
+        default:;
+        break;
         }
     }
-    
+
     /* we have found a match */
     if (gcrp) {
-       proto_item *it;
+        proto_item *it;
 
 
-       if (gcrp->is_request) {
-           it = proto_tree_add_uint(tree, hf_gtp_response_in, tvb, 0, 0, gcrp->rep_frame);
-           PROTO_ITEM_SET_GENERATED(it);
-       } else {
-           nstime_t ns;
+        if (gcrp->is_request) {
+            it = proto_tree_add_uint(tree, hf_gtp_response_in, tvb, 0, 0, gcrp->rep_frame);
+            PROTO_ITEM_SET_GENERATED(it);
+        } else {
+            nstime_t ns;
 
-           it = proto_tree_add_uint(tree, hf_gtp_response_to, tvb, 0, 0, gcrp->req_frame);
-           PROTO_ITEM_SET_GENERATED(it);
-           nstime_delta(&ns, &pinfo->fd->abs_ts, &gcrp->req_time);
-           it = proto_tree_add_time(tree, hf_gtp_time, tvb, 0, 0, &ns);
-           PROTO_ITEM_SET_GENERATED(it);
-       }
+            it = proto_tree_add_uint(tree, hf_gtp_response_to, tvb, 0, 0, gcrp->req_frame);
+            PROTO_ITEM_SET_GENERATED(it);
+            nstime_delta(&ns, &pinfo->fd->abs_ts, &gcrp->req_time);
+            it = proto_tree_add_time(tree, hf_gtp_time, tvb, 0, 0, &ns);
+            PROTO_ITEM_SET_GENERATED(it);
+        }
     }
     return gcrp;
 }
@@ -2771,33 +3087,33 @@ static int check_field_presence(guint8 message, guint8 field, int *position)
 
     switch (gtp_version) {
     case 0:
-       mess_items = gprs_mess_items;
-       break;
+        mess_items = gprs_mess_items;
+        break;
     case 1:
-       mess_items = umts_mess_items;
-       break;
+        mess_items = umts_mess_items;
+        break;
     default:
-       return -2;
+        return -2;
     }
 
     while (mess_items[i].code) {
-       if (mess_items[i].code == message) {
-
-           while (mess_items[i].fields[*position].code) {
-               if (mess_items[i].fields[*position].code == field) {
-                   (*position)++;
-                   return 0;
-               } else {
-                   if (mess_items[i].fields[*position].presence == GTP_MANDATORY) {
-                       return mess_items[i].fields[(*position)++].code;
-                   } else {
-                       (*position)++;
-                   }
-               }
-           }
-           return -1;
-       }
-       i++;
+        if (mess_items[i].code == message) {
+
+            while (mess_items[i].fields[*position].code) {
+                if (mess_items[i].fields[*position].code == field) {
+                    (*position)++;
+                    return 0;
+                } else {
+                    if (mess_items[i].fields[*position].presence == GTP_MANDATORY) {
+                        return mess_items[i].fields[(*position)++].code;
+                    } else {
+                        (*position)++;
+                    }
+                }
+            }
+            return -1;
+        }
+        i++;
     }
 
     return -2;
@@ -2805,8 +3121,9 @@ static int check_field_presence(guint8 message, guint8 field, int *position)
 
 /* Decoders of fields in extension headers, each function returns no of bytes from field */
 
-/* GPRS:       9.60 v7.6.0, chapter
- * UMTS:       29.060 v4.0, chapter
+/* GPRS:        9.60 v7.6.0, chapter
+ * UMTS:        29.060 v4.0, chapter
+ * 7.7.1 Cause
  */
 static int decode_gtp_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -2820,56 +3137,42 @@ static int decode_gtp_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
     return 2;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.2
- * UMTS:       29.060 v4.0, chapter 7.7.2
+/* GPRS:        9.60 v7.6.0, chapter 7.9.2
+ * UMTS:        29.060 v4.0, chapter 7.7.2
  */
 static int decode_gtp_imsi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
+    const gchar *imsi_str;
 
-    guint8 imsi_val[8];
-    gchar *imsi_str;
+    /* Octets 2 - 9 IMSI */
+    imsi_str =  tvb_bcd_dig_to_ep_str( tvb, offset+1, 8, NULL, FALSE);
 
-    tvb_memcpy(tvb, imsi_val, offset + 1, 8);
-    imsi_str = imsi_to_str(imsi_val);
-
-    proto_tree_add_string(tree, hf_gtp_imsi, tvb, offset, 9, imsi_str);
+    proto_tree_add_string(tree, hf_gtp_imsi, tvb, offset+1, 8, imsi_str);
 
     return 9;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.3
- * UMTS:       29.060 v4.0, chapter 7.7.3
+/* GPRS:        9.60 v7.6.0, chapter 7.9.3
+ * UMTS:        29.060 v4.0, chapter 7.7.3 Routeing Area Identity (RAI)
  */
 static int decode_gtp_rai(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
     proto_tree *ext_tree_rai;
     proto_item *te;
-    guint8 byte[3];
-    guint16 mnc, mcc;
 
-    te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(GTP_EXT_RAI, gtp_val, "Unknown message"));
+    te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str_ext_const(GTP_EXT_RAI, &gtp_val_ext, "Unknown message"));
     ext_tree_rai = proto_item_add_subtree(te, ett_gtp_rai);
 
-    byte[0] = tvb_get_guint8(tvb, offset + 1);
-    byte[1] = tvb_get_guint8(tvb, offset + 2);
-    byte[2] = tvb_get_guint8(tvb, offset + 3);
-    mcc = (byte[0] & 0x0F) * 100 + ((byte[0] & 0xF0) >> 4) * 10 + (byte[1] & 0x0F);
-    if ((byte[1] & 0xF0) == 0xF0)
-       mnc = (byte[2] & 0x0F) * 10 + ((byte[2] & 0xF0) >> 4);
-    else
-       mnc = (byte[2] & 0x0F) * 100 + ((byte[2] & 0xF0) >> 4) * 10 + ((byte[1] & 0xF0) >> 4);
-
-    proto_tree_add_uint(ext_tree_rai, hf_gtp_rai_mcc, tvb, offset + 1, 2, mcc);
-    proto_tree_add_uint(ext_tree_rai, hf_gtp_rai_mnc, tvb, offset + 2, 2, mnc);
+       dissect_e212_mcc_mnc(tvb, pinfo, ext_tree_rai, offset+1, TRUE);
     proto_tree_add_uint(ext_tree_rai, hf_gtp_rai_lac, tvb, offset + 4, 2, tvb_get_ntohs(tvb, offset + 4));
     proto_tree_add_uint(ext_tree_rai, hf_gtp_rai_rac, tvb, offset + 6, 1, tvb_get_guint8(tvb, offset + 6));
 
     return 7;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.4, page 39
- * UMTS:       29.060 v4.0, chapter 7.7.4, page 47
+/* GPRS:        9.60 v7.6.0, chapter 7.9.4, page 39
+ * UMTS:        29.060 v4.0, chapter 7.7.4 Temporary Logical Link Identity (TLLI)
  */
 static int decode_gtp_tlli(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -2882,8 +3185,8 @@ static int decode_gtp_tlli(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
     return 5;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.5, page 39
- * UMTS:       29.060 v4.0, chapter 7.7.5, page 47
+/* GPRS:        9.60 v7.6.0, chapter 7.9.5, page 39
+ * UMTS:        29.060 v4.0, chapter 7.7.5 Packet TMSI (P-TMSI)
  */
 static int decode_gtp_ptmsi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -2896,7 +3199,8 @@ static int decode_gtp_ptmsi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
     return 5;
 }
 
-/* adjust - how many bytes before offset should be highlighted
+/*
+ * adjust - how many bytes before offset should be highlighted
  */
 static int decode_qos_gprs(tvbuff_t * tvb, int offset, proto_tree * tree, const gchar * qos_str, guint8 adjust)
 {
@@ -2905,38 +3209,38 @@ static int decode_qos_gprs(tvbuff_t * tvb, int offset, proto_tree * tree, const
     proto_tree *ext_tree_qos;
     proto_item *te;
 
-    spare1 = tvb_get_guint8(tvb, offset) & 0xC0;
-    delay = tvb_get_guint8(tvb, offset) & 0x38;
-    reliability = tvb_get_guint8(tvb, offset) & 0x07;
-    peak = tvb_get_guint8(tvb, offset + 1) & 0xF0;
-    spare2 = tvb_get_guint8(tvb, offset + 1) & 0x08;
-    precedence = tvb_get_guint8(tvb, offset + 1) & 0x07;
-    spare3 = tvb_get_guint8(tvb, offset + 2) & 0xE0;
-    mean = tvb_get_guint8(tvb, offset + 2) & 0x1F;
+    spare1 = tvb_get_guint8(tvb, offset) & GTP_EXT_QOS_SPARE1_MASK;
+    delay = tvb_get_guint8(tvb, offset) & GTP_EXT_QOS_DELAY_MASK;
+    reliability = tvb_get_guint8(tvb, offset) & GTP_EXT_QOS_RELIABILITY_MASK;
+    peak = tvb_get_guint8(tvb, offset + 1) & GTP_EXT_QOS_PEAK_MASK;
+    spare2 = tvb_get_guint8(tvb, offset + 1) & GTP_EXT_QOS_SPARE2_MASK;
+    precedence = tvb_get_guint8(tvb, offset + 1) & GTP_EXT_QOS_PRECEDENCE_MASK;
+    spare3 = tvb_get_guint8(tvb, offset + 2) & GTP_EXT_QOS_SPARE3_MASK;
+    mean = tvb_get_guint8(tvb, offset + 2) & GTP_EXT_QOS_MEAN_MASK;
 
     te = proto_tree_add_text(tree, tvb, offset - adjust, 3 + adjust, "%s: delay: %u, reliability: %u, peak: %u, precedence: %u, mean: %u",
-                            qos_str, (delay >> 3) & 0x07, reliability, (peak >> 4) & 0x0F, precedence, mean);
+                             qos_str, (delay >> 3) & 0x07, reliability, (peak >> 4) & 0x0F, precedence, mean);
     ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos);
 
     if (adjust != 0) {
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare1, tvb, offset, 1, spare1);
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_delay, tvb, offset, 1, delay);
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_reliability, tvb, offset, 1, reliability);
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_peak, tvb, offset + 1, 1, peak);
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare2, tvb, offset + 1, 1, spare2);
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_precedence, tvb, offset + 1, 1, precedence);
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare3, tvb, offset + 2, 1, spare3);
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_mean, tvb, offset + 2, 1, mean);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare1, tvb, offset, 1, spare1);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_delay, tvb, offset, 1, delay);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_reliability, tvb, offset, 1, reliability);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_peak, tvb, offset + 1, 1, peak);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare2, tvb, offset + 1, 1, spare2);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_precedence, tvb, offset + 1, 1, precedence);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_spare3, tvb, offset + 2, 1, spare3);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_mean, tvb, offset + 2, 1, mean);
     }
 
     return 3;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.6, page 39
- *             4.08
- *             3.60
- * UMTS:       not present
- * TODO:       check if length is included: ETSI 4.08 vs 9.60
+/* GPRS:        9.60 v7.6.0, chapter 7.9.6, page 39
+ *              4.08
+ *              3.60
+ * UMTS:        not present
+ * TODO:        check if length is included: ETSI 4.08 vs 9.60
  */
 static int decode_gtp_qos_gprs(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -2945,8 +3249,8 @@ static int decode_gtp_qos_gprs(tvbuff_t * tvb, int offset, packet_info * pinfo _
 
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.7, page 39
- * UMTS:       29.060 v4.0, chapter 7.7.6, page 47
+/* GPRS:        9.60 v7.6.0, chapter 7.9.7, page 39
+ * UMTS:        29.060 v4.0, chapter 7.7.6 Reordering Required
  */
 static int decode_gtp_reorder(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -2959,9 +3263,9 @@ static int decode_gtp_reorder(tvbuff_t * tvb, int offset, packet_info * pinfo _U
     return 2;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.8, page 40
- *             4.08 v7.1.2, chapter 10.5.3.1+
- * UMTS:       29.060 v4.0, chapter 7.7.7
+/* GPRS:        9.60 v7.6.0, chapter 7.9.8, page 40
+ *              4.08 v7.1.2, chapter 10.5.3.1+
+ * UMTS:        29.060 v4.0, chapter 7.7.7
  * TODO: Add blurb support by registering items in the protocol registration
  */
 static int decode_gtp_auth_tri(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -2970,8 +3274,8 @@ static int decode_gtp_auth_tri(tvbuff_t * tvb, int offset, packet_info * pinfo _
     proto_tree *ext_tree_auth_tri;
     proto_item *te;
 
-    te = proto_tree_add_text(tree, tvb, offset, 29, "%s", val_to_str(GTP_EXT_AUTH_TRI, gtp_val, "Unknown message"));
-    ext_tree_auth_tri = proto_item_add_subtree(tree, ett_gtp_auth_tri);
+    te = proto_tree_add_text(tree, tvb, offset, 29, "%s", val_to_str_ext_const(GTP_EXT_AUTH_TRI, &gtp_val_ext, "Unknown message"));
+    ext_tree_auth_tri = proto_item_add_subtree(te, ett_gtp_auth_tri);
 
     proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 1, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset + 1, 16));
     proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 17, 4, "SRES: %s", tvb_bytes_to_str(tvb, offset + 17, 4));
@@ -2980,10 +3284,10 @@ static int decode_gtp_auth_tri(tvbuff_t * tvb, int offset, packet_info * pinfo _
     return 1 + 16 + 4 + 8;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.9, page 40
- *             9.02 v7.7.0, page 1090
- * UMTS:       29.060 v4.0, chapter 7.7.8, page 48
- *             29.002 v4.2.1, chapter 17.5, page 268
+/* GPRS:        9.60 v7.6.0, chapter 7.9.9, page 40
+ *              9.02 v7.7.0, page 1090
+ * UMTS:        29.060 v4.0, chapter 7.7.8, page 48
+ *              29.002 v4.2.1, chapter 17.5, page 268
  */
 static int decode_gtp_map_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -2996,8 +3300,8 @@ static int decode_gtp_map_cause(tvbuff_t * tvb, int offset, packet_info * pinfo
     return 2;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.10, page 41
- * UMTS:       29.060 v4.0, chapter 7.7.9, page 48
+/* GPRS:        9.60 v7.6.0, chapter 7.9.10, page 41
+ * UMTS:        29.060 v4.0, chapter 7.7.9, page 48
  */
 static int decode_gtp_ptmsi_sig(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3010,8 +3314,8 @@ static int decode_gtp_ptmsi_sig(tvbuff_t * tvb, int offset, packet_info * pinfo
     return 4;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.11, page 41
- * UMTS:       29.060 v4.0, chapter 7.7.10, page 49
+/* GPRS:        9.60 v7.6.0, chapter 7.9.11, page 41
+ * UMTS:        29.060 v4.0, chapter 7.7.10, page 49
  */
 static int decode_gtp_ms_valid(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3024,8 +3328,8 @@ static int decode_gtp_ms_valid(tvbuff_t * tvb, int offset, packet_info * pinfo _
     return 2;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.12, page 41
- * UMTS:       29.060 v4.0, chapter 7.7.11, page 49
+/* GPRS:        9.60 v7.6.0, chapter 7.9.12, page 41
+ * UMTS:        29.060 v4.0, chapter 7.7.11 Recovery
  */
 static int decode_gtp_recovery(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3038,12 +3342,12 @@ static int decode_gtp_recovery(tvbuff_t * tvb, int offset, packet_info * pinfo _
     return 2;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.13, page 42
- * UMTS:       29.060 v4.0, chapter 7.7.12, page 49
+/* GPRS:        9.60 v7.6.0, chapter 7.9.13, page 42
+ * UMTS:        29.060 v4.0, chapter 7.7.12 Selection Mode
  */
 
 
-static const gchar *dissect_radius_selection_mode(proto_tree * tree, tvbuff_t * tvb)
+static const gchar *dissect_radius_selection_mode(proto_tree * tree, tvbuff_t * tvb, packet_info* pinfo _U_)
 {
     guint8 sel_mode;
 
@@ -3051,18 +3355,18 @@ static const gchar *dissect_radius_selection_mode(proto_tree * tree, tvbuff_t *
     sel_mode = tvb_get_guint8(tvb, 0) - 0x30;
     proto_tree_add_uint(tree, hf_gtp_sel_mode, tvb, 0, 1, sel_mode);
 
-    return val_to_str(sel_mode, sel_mode_type, "Unknown");
+    return val_to_str_const(sel_mode, sel_mode_type, "Unknown");
 }
 
 static int decode_gtp_sel_mode(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
-    proto_tree_add_item(tree, hf_gtp_sel_mode, tvb, offset, 2, FALSE);
+    proto_tree_add_item(tree, hf_gtp_sel_mode, tvb, offset, 2, ENC_BIG_ENDIAN);
     return 2;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.14, page 42
- * UMTS:       29.060 v4.0, chapter 7.7.13, page 50
+/* GPRS:        9.60 v7.6.0, chapter 7.9.14, page 42
+ * UMTS:        29.060 v4.0, chapter 7.7.13, page 50
  */
 static int decode_gtp_16(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3072,24 +3376,24 @@ static int decode_gtp_16(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr
 
     switch (gtp_version) {
     case 0:
-       ext_flow_label = tvb_get_ntohs(tvb, offset + 1);
-       proto_tree_add_uint(tree, hf_gtp_ext_flow_label, tvb, offset, 3, ext_flow_label);
+        ext_flow_label = tvb_get_ntohs(tvb, offset + 1);
+        proto_tree_add_uint(tree, hf_gtp_ext_flow_label, tvb, offset, 3, ext_flow_label);
 
-       return 3;
+        return 3;
     case 1:
-       teid_data = tvb_get_ntohl(tvb, offset + 1);
-       proto_tree_add_uint(tree, hf_gtp_teid_data, tvb, offset, 5, teid_data);
+        teid_data = tvb_get_ntohl(tvb, offset + 1);
+        proto_tree_add_uint(tree, hf_gtp_teid_data, tvb, offset, 5, teid_data);
 
-       return 5;
+        return 5;
     default:
-       proto_tree_add_text(tree, tvb, offset, 1, "Flow label/TEID Data I : GTP version not supported");
+        proto_tree_add_text(tree, tvb, offset, 1, "Flow label/TEID Data I : GTP version not supported");
 
-       return 3;
+        return 3;
     }
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.15, page 42
- * UMTS:       29.060 v4.0, chapter 7.7.14, page 42
+/* GPRS:        9.60 v7.6.0, chapter 7.9.15, page 42
+ * UMTS:        29.060 v4.0, chapter 7.7.14, page 42
  */
 static int decode_gtp_17(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3099,21 +3403,21 @@ static int decode_gtp_17(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr
 
     switch (gtp_version) {
     case 0:
-       flow_sig = tvb_get_ntohs(tvb, offset + 1);
-       proto_tree_add_uint(tree, hf_gtp_flow_sig, tvb, offset, 3, flow_sig);
-       return 3;
+        flow_sig = tvb_get_ntohs(tvb, offset + 1);
+        proto_tree_add_uint(tree, hf_gtp_flow_sig, tvb, offset, 3, flow_sig);
+        return 3;
     case 1:
-       teid_cp = tvb_get_ntohl(tvb, offset + 1);
-       proto_tree_add_uint(tree, hf_gtp_teid_cp, tvb, offset, 5, teid_cp);
-       return 5;
+        teid_cp = tvb_get_ntohl(tvb, offset + 1);
+        proto_tree_add_uint(tree, hf_gtp_teid_cp, tvb, offset, 5, teid_cp);
+        return 5;
     default:
-       proto_tree_add_text(tree, tvb, offset, 1, "Flow label signalling/TEID control plane : GTP version not supported");
-       return 3;
+        proto_tree_add_text(tree, tvb, offset, 1, "Flow label signalling/TEID control plane : GTP version not supported");
+        return 3;
     }
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.16, page 42
- * UMTS:       29.060 v4.0, chapter 7.7.15, page 51
+/* GPRS:        9.60 v7.6.0, chapter 7.9.16, page 42
+ * UMTS:        29.060 v4.0, chapter 7.7.15, page 51
  */
 static int decode_gtp_18(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3125,35 +3429,35 @@ static int decode_gtp_18(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr
 
     switch (gtp_version) {
     case 0:
-       te = proto_tree_add_text(tree, tvb, offset, 4, "%s", val_to_str(GTP_EXT_FLOW_II, gtp_val, "Unknown message"));
-       ext_tree_flow_ii = proto_item_add_subtree(te, ett_gtp_flow_ii);
+        te = proto_tree_add_text(tree, tvb, offset, 4, "%s", val_to_str_ext_const(GTP_EXT_FLOW_II, &gtp_val_ext, "Unknown message"));
+        ext_tree_flow_ii = proto_item_add_subtree(te, ett_gtp_flow_ii);
 
-       proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_nsapi, tvb, offset + 1, 1, tvb_get_guint8(tvb, offset + 1) & 0x0F);
+        proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_nsapi, tvb, offset + 1, 1, tvb_get_guint8(tvb, offset + 1) & 0x0F);
 
-       flow_ii = tvb_get_ntohs(tvb, offset + 2);
-       proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_flow_ii, tvb, offset + 2, 2, flow_ii);
+        flow_ii = tvb_get_ntohs(tvb, offset + 2);
+        proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_flow_ii, tvb, offset + 2, 2, flow_ii);
 
-       return 4;
+        return 4;
     case 1:
-       te = proto_tree_add_text(tree, tvb, offset, 6, "%s", val_to_str(GTP_EXT_TEID_II, gtpv1_val, "Unknown message"));
-       ext_tree_flow_ii = proto_item_add_subtree(te, ett_gtp_flow_ii);
+        te = proto_tree_add_text(tree, tvb, offset, 6, "%s", val_to_str_ext_const(GTP_EXT_TEID_II, &gtpv1_val_ext, "Unknown message"));
+        ext_tree_flow_ii = proto_item_add_subtree(te, ett_gtp_flow_ii);
 
-       proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_nsapi, tvb, offset + 1, 1, tvb_get_guint8(tvb, offset + 1) & 0x0F);
+        proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_nsapi, tvb, offset + 1, 1, tvb_get_guint8(tvb, offset + 1) & 0x0F);
 
 
-       teid_ii = tvb_get_ntohl(tvb, offset + 2);
-       proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_teid_ii, tvb, offset + 2, 4, teid_ii);
+        teid_ii = tvb_get_ntohl(tvb, offset + 2);
+        proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_teid_ii, tvb, offset + 2, 4, teid_ii);
 
-       return 6;
+        return 6;
     default:
-       proto_tree_add_text(tree, tvb, offset, 1, "Flow data II/TEID Data II : GTP Version not supported");
+        proto_tree_add_text(tree, tvb, offset, 1, "Flow data II/TEID Data II : GTP Version not supported");
 
-       return 4;
+        return 4;
     }
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.16A, page 43
- * UMTS:       29.060 v4.0, chapter 7.7.16, page 51
+/* GPRS:        9.60 v7.6.0, chapter 7.9.16A, page 43
+ * UMTS:        29.060 v4.0, chapter 7.7.16, page 51
  * Check if all ms_reason types are included
  */
 static int decode_gtp_19(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -3165,21 +3469,21 @@ static int decode_gtp_19(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr
 
     switch (gtp_version) {
     case 0:
-       proto_tree_add_uint(tree, hf_gtp_ms_reason, tvb, offset, 2, field19);
-       break;
+        proto_tree_add_uint(tree, hf_gtp_ms_reason, tvb, offset, 2, field19);
+        break;
     case 1:
-       proto_tree_add_boolean(tree, hf_gtp_tear_ind, tvb, offset, 2, field19 & 0x01);
-       break;
+        proto_tree_add_boolean(tree, hf_gtp_tear_ind, tvb, offset, 2, field19 & 0x01);
+        break;
     default:
-       proto_tree_add_text(tree, tvb, offset, 1, "Information Element Type = 19 : GTP Version not supported");
-       break;
+        proto_tree_add_text(tree, tvb, offset, 1, "Information Element Type = 19 : GTP Version not supported");
+        break;
     }
 
     return 2;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.17, page 51
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.17, page 51
  */
 static int decode_gtp_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3192,8 +3496,8 @@ static int decode_gtp_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
     return 2;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.18, page 52
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.18, page 52
  */
 static int decode_gtp_ranap_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3203,46 +3507,46 @@ static int decode_gtp_ranap_cause(tvbuff_t * tvb, int offset, packet_info * pinf
     ranap = tvb_get_guint8(tvb, offset + 1);
 
     if (ranap > 0 && ranap <= 64)
-       proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
-                                  ranap, "%s (Radio Network Layer Cause) : %s (%u)",
-                                  val_to_str(GTP_EXT_RANAP_CAUSE, gtp_val, "Unknown"),
-                                  val_to_str(ranap, ranap_cause_type, "Unknown RANAP Cause"), ranap);
+        proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
+                                   ranap, "%s (Radio Network Layer Cause) : %s (%u)",
+                                   val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
+                                   val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
 
     if (ranap > 64 && ranap <= 80)
-       proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
-                                  ranap, "%s (Transport Layer Cause) : %s (%u)",
-                                  val_to_str(GTP_EXT_RANAP_CAUSE, gtp_val, "Unknown"),
-                                  val_to_str(ranap, ranap_cause_type, "Unknown RANAP Cause"), ranap);
+        proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
+                                   ranap, "%s (Transport Layer Cause) : %s (%u)",
+                                   val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
+                                   val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
 
     if (ranap > 80 && ranap <= 96)
-       proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
-                                  ranap, "%s (NAS Cause) : %s (%u)",
-                                  val_to_str(GTP_EXT_RANAP_CAUSE, gtp_val, "Unknown"),
-                                  val_to_str(ranap, ranap_cause_type, "Unknown RANAP Cause"), ranap);
+        proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2,
+                                   ranap, "%s (NAS Cause) : %s (%u)",
+                                   val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
+                                   val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
 
     if (ranap > 96 && ranap <= 112)
-       proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
-                                  "%s (Protocol Cause) : %s (%u)",
-                                  val_to_str(GTP_EXT_RANAP_CAUSE, gtp_val, "Unknown"),
-                                  val_to_str(ranap, ranap_cause_type, "Unknown RANAP Cause"), ranap);
+        proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
+                                   "%s (Protocol Cause) : %s (%u)",
+                                   val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
+                                   val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
 
     if (ranap > 112 && ranap <= 128)
-       proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
-                                  "%s (Miscellaneous Cause) : %s (%u)",
-                                  val_to_str(GTP_EXT_RANAP_CAUSE, gtp_val, "Unknown"),
-                                  val_to_str(ranap, ranap_cause_type, "Unknown RANAP Cause"), ranap);
+        proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
+                                   "%s (Miscellaneous Cause) : %s (%u)",
+                                   val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
+                                   val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
 
     if (ranap > 128 /* && ranap <=255 */ )
-       proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
-                                  "%s (Non-standard Cause) : %s (%u)",
-                                  val_to_str(GTP_EXT_RANAP_CAUSE, gtp_val, "Unknown"),
-                                  val_to_str(ranap, ranap_cause_type, "Unknown RANAP Cause"), ranap);
+        proto_tree_add_uint_format(tree, hf_gtp_ranap_cause, tvb, offset, 2, ranap,
+                                   "%s (Non-standard Cause) : %s (%u)",
+                                   val_to_str_ext_const(GTP_EXT_RANAP_CAUSE, &gtp_val_ext, "Unknown"),
+                                   val_to_str_ext_const(ranap, &ranap_cause_type_ext, "Unknown RANAP Cause"), ranap);
 
     return 2;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.19, page 52
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.19, page 52
  */
 static int decode_gtp_rab_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3251,23 +3555,23 @@ static int decode_gtp_rab_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo
     proto_tree *ext_tree_rab_cntxt;
     proto_item *te;
 
-    te = proto_tree_add_text(tree, tvb, offset, 10, "%s", val_to_str(GTP_EXT_RAB_CNTXT, gtp_val, "Unknown message"));
+    te = proto_tree_add_text(tree, tvb, offset, 10, "%s", val_to_str_ext_const(GTP_EXT_RAB_CNTXT, &gtp_val_ext, "Unknown message"));
     ext_tree_rab_cntxt = proto_item_add_subtree(te, ett_gtp_rab_cntxt);
 
     nsapi = tvb_get_guint8(tvb, offset + 1) & 0x0F;
 
     proto_tree_add_uint(ext_tree_rab_cntxt, hf_gtp_nsapi, tvb, offset + 1, 1, nsapi);
-    proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_gtpu_dn, tvb, offset + 2, 2, FALSE);
-    proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_gtpu_up, tvb, offset + 4, 2, FALSE);
-    proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_pdu_dn, tvb, offset + 6, 2, FALSE);
-    proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_pdu_up, tvb, offset + 8, 2, FALSE);
+    proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_gtpu_dn, tvb, offset + 2, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_gtpu_up, tvb, offset + 4, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_pdu_dn, tvb, offset + 6, 2, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ext_tree_rab_cntxt, hf_gtp_rab_pdu_up, tvb, offset + 8, 2, ENC_BIG_ENDIAN);
 
     return 10;
 }
 
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.20, page 53
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.20, page 53
  */
 static int decode_gtp_rp_sms(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3280,8 +3584,8 @@ static int decode_gtp_rp_sms(tvbuff_t * tvb, int offset, packet_info * pinfo _U_
     return 2;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.21, page 53
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.21, page 53
  */
 static int decode_gtp_rp(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3295,7 +3599,7 @@ static int decode_gtp_rp(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr
     rp = tvb_get_guint8(tvb, offset + 1) & 0x07;
 
     te = proto_tree_add_uint_format(tree, hf_gtp_rp, tvb, offset, 2, rp, "Radio Priority for NSAPI(%u) : %u", nsapi, rp);
-    ext_tree_rp = proto_item_add_subtree(tree, ett_gtp_rp);
+    ext_tree_rp = proto_item_add_subtree(te, ett_gtp_rp);
 
     proto_tree_add_uint(ext_tree_rp, hf_gtp_rp_nsapi, tvb, offset + 1, 1, nsapi);
     proto_tree_add_uint(ext_tree_rp, hf_gtp_rp_spare, tvb, offset + 1, 1, spare);
@@ -3304,8 +3608,8 @@ static int decode_gtp_rp(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr
     return 2;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.22, page 53
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.22, page 53
  */
 static int decode_gtp_pkt_flow_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3318,17 +3622,17 @@ static int decode_gtp_pkt_flow_id(tvbuff_t * tvb, int offset, packet_info * pinf
     pkt_flow_id = tvb_get_guint8(tvb, offset + 2);
 
     te = proto_tree_add_uint_format(tree, hf_gtp_pkt_flow_id, tvb, offset, 3, pkt_flow_id, "Packet Flow ID for NSAPI(%u) : %u", nsapi, pkt_flow_id);
-    ext_tree_pkt_flow_id = proto_item_add_subtree(tree, ett_gtp_pkt_flow_id);
+    ext_tree_pkt_flow_id = proto_item_add_subtree(te, ett_gtp_pkt_flow_id);
 
     proto_tree_add_uint(ext_tree_pkt_flow_id, hf_gtp_nsapi, tvb, offset + 1, 1, nsapi);
     proto_tree_add_uint_format(ext_tree_pkt_flow_id, hf_gtp_pkt_flow_id, tvb,
-                              offset + 2, 1, pkt_flow_id, "%s : %u", val_to_str(GTP_EXT_PKT_FLOW_ID, gtp_val, "Unknown message"), pkt_flow_id);
+                               offset + 2, 1, pkt_flow_id, "%s : %u", val_to_str_ext_const(GTP_EXT_PKT_FLOW_ID, &gtp_val_ext, "Unknown message"), pkt_flow_id);
 
     return 3;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.23, page 53
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.23, page 53
  * TODO: Differenciate these uints?
  */
 static int decode_gtp_chrg_char(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -3341,7 +3645,7 @@ static int decode_gtp_chrg_char(tvbuff_t * tvb, int offset, packet_info * pinfo
     chrg_char = tvb_get_ntohs(tvb, offset + 1);
 
     te = proto_tree_add_uint(tree, hf_gtp_chrg_char, tvb, offset, 3, chrg_char);
-    /*"%s: %x", val_to_str (GTP_EXT_CHRG_CHAR, gtp_val, "Unknown message"), chrg_char); */
+    /*"%s: %x", val_to_str_ext_const (GTP_EXT_CHRG_CHAR, &gtp_val_ext, "Unknown message"), chrg_char); */
     ext_tree_chrg_char = proto_item_add_subtree(te, ett_gtp_chrg_char);
 
     proto_tree_add_uint(ext_tree_chrg_char, hf_gtp_chrg_char_s, tvb, offset + 1, 2, chrg_char);
@@ -3354,8 +3658,8 @@ static int decode_gtp_chrg_char(tvbuff_t * tvb, int offset, packet_info * pinfo
     return 3;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.24, page
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.24, page
  */
 static int decode_gtp_trace_ref(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3369,8 +3673,8 @@ static int decode_gtp_trace_ref(tvbuff_t * tvb, int offset, packet_info * pinfo
     return 3;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.25, page
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.25, page
  */
 static int decode_gtp_trace_type(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3384,8 +3688,8 @@ static int decode_gtp_trace_type(tvbuff_t * tvb, int offset, packet_info * pinfo
     return 3;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.16A
- * UMTS:       29.060 v4.0, chapter 7.7.25A, page
+/* GPRS:        9.60 v7.6.0, chapter 7.9.16A
+ * UMTS:        29.060 v4.0, chapter 7.7.25A, page
  */
 static int decode_gtp_ms_reason(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3394,13 +3698,14 @@ static int decode_gtp_ms_reason(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     reason = tvb_get_guint8(tvb, offset + 1);
 
+    /* Reason for Absence is defined in 3GPP TS 23.040  */
     proto_tree_add_uint(tree, hf_gtp_ms_reason, tvb, offset, 2, reason);
 
     return 2;
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.25B
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.25B
  * Radio Priority LCS
  */
 static int decode_gtp_ra_prio_lcs(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -3411,21 +3716,21 @@ static int decode_gtp_ra_prio_lcs(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str(GTP_EXT_RA_PRIO_LCS, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str_ext_const(GTP_EXT_RA_PRIO_LCS, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_ra_prio_lcs);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    /* TODO add decoding of data */
-    proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
+
+    proto_tree_add_item(ext_tree, hf_gtp_ra_prio_lcs, tvb, offset, 1, ENC_BIG_ENDIAN);
 
     return 3 + length;
 
 }
 
-/* GPRS:       12.15 v7.6.0, chapter 7.3.3, page 45
- * UMTS:       33.015
+/* GPRS:        12.15 v7.6.0, chapter 7.3.3, page 45
+ * UMTS:        33.015
  */
 static int decode_gtp_tr_comm(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3439,8 +3744,8 @@ static int decode_gtp_tr_comm(tvbuff_t * tvb, int offset, packet_info * pinfo _U
     return 2;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.17, page 43
- * UMTS:       29.060 v4.0, chapter 7.7.26, page 55
+/* GPRS:        9.60 v7.6.0, chapter 7.9.17, page 43
+ * UMTS:        29.060 v4.0, chapter 7.7.26, page 55
  */
 static int decode_gtp_chrg_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3453,8 +3758,8 @@ static int decode_gtp_chrg_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U
     return 5;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.18, page 43
- * UMTS:       29.060 v4.0, chapter 7.7.27, page 55
+/* GPRS:        9.60 v7.6.0, chapter 7.9.18, page 43
+ * UMTS:        29.060 v4.0, chapter 7.7.27, page 55
  */
 static int decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -3472,8 +3777,9 @@ static int decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo
     pdp_typ = tvb_get_guint8(tvb, offset + 4);
 
     te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s (%s/%s)",
-                            val_to_str(GTP_EXT_USER_ADDR, gtp_val, "Unknown message"),
-                            val_to_str(pdp_org, pdp_org_type, "Unknown PDP Organization"), val_to_str(pdp_typ, pdp_type, "Unknown PDP Type"));
+                             val_to_str_ext_const(GTP_EXT_USER_ADDR, &gtp_val_ext, "Unknown message"),
+                             val_to_str_const(pdp_org, pdp_org_type, "Unknown PDP Organization"),
+                             val_to_str_const(pdp_typ, pdp_type, "Unknown PDP Type"));
     ext_tree_user = proto_item_add_subtree(te, ett_gtp_user);
 
     proto_tree_add_text(ext_tree_user, tvb, offset + 1, 2, "Length : %u", length);
@@ -3481,25 +3787,25 @@ static int decode_gtp_user_addr(tvbuff_t * tvb, int offset, packet_info * pinfo
     proto_tree_add_uint(ext_tree_user, hf_gtp_user_addr_pdp_type, tvb, offset + 4, 1, pdp_typ);
 
     if (length == 2) {
-       if (pdp_org == 0 && pdp_typ == 1)
-           proto_item_append_text(te, " (Point to Point Protocol)");
-       else if (pdp_typ == 2)
-           proto_item_append_text(te, " (Octet Stream Protocol)");
+        if (pdp_org == 0 && pdp_typ == 1)
+            proto_item_append_text(te, " (Point to Point Protocol)");
+        else if (pdp_typ == 2)
+            proto_item_append_text(te, " (Octet Stream Protocol)");
     } else if (length > 2) {
-       switch (pdp_typ) {
-       case 0x21:
-           addr_ipv4 = tvb_get_ipv4(tvb, offset + 5);
-           proto_tree_add_ipv4(ext_tree_user, hf_gtp_user_ipv4, tvb, offset + 5, 4, addr_ipv4);
-           proto_item_append_text(te, " : %s", ip_to_str((guint8 *) & addr_ipv4));
-           break;
-       case 0x57:
-           tvb_get_ipv6(tvb, offset + 5, &addr_ipv6);
-           proto_tree_add_ipv6(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 5, 16, (guint8 *) & addr_ipv6);
-           proto_item_append_text(te, " : %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
-           break;
-       }
+        switch (pdp_typ) {
+        case 0x21:
+            addr_ipv4 = tvb_get_ipv4(tvb, offset + 5);
+            proto_tree_add_ipv4(ext_tree_user, hf_gtp_user_ipv4, tvb, offset + 5, 4, addr_ipv4);
+            proto_item_append_text(te, " : %s", ip_to_str((guint8 *) & addr_ipv4));
+            break;
+        case 0x57:
+            tvb_get_ipv6(tvb, offset + 5, &addr_ipv6);
+            proto_tree_add_ipv6(ext_tree_user, hf_gtp_user_ipv6, tvb, offset + 5, 16, (guint8 *) & addr_ipv6);
+            proto_item_append_text(te, " : %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
+            break;
+        }
     } else
-       proto_item_append_text(te, " : empty PDP Address");
+        proto_item_append_text(te, " : empty PDP Address");
 
     return 3 + length;
 }
@@ -3512,12 +3818,12 @@ static int decode_triplet(tvbuff_t * tvb, int offset, proto_tree * tree, guint16
     guint16 i;
 
     for (i = 0; i < count; i++) {
-       te_trip = proto_tree_add_text(tree, tvb, offset + i * 28, 28, "Triplet no%x", i);
-       ext_tree_trip = proto_item_add_subtree(te_trip, ett_gtp_trip);
+        te_trip = proto_tree_add_text(tree, tvb, offset + i * 28, 28, "Triplet no%x", i);
+        ext_tree_trip = proto_item_add_subtree(te_trip, ett_gtp_trip);
 
-       proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset + i * 28, 16));
-       proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28 + 16, 4, "SRES: %s", tvb_bytes_to_str(tvb, offset + i * 28 + 16, 4));
-       proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28 + 20, 8, "Kc: %s", tvb_bytes_to_str(tvb, offset + i * 28 + 20, 8));
+        proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset + i * 28, 16));
+        proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28 + 16, 4, "SRES: %s", tvb_bytes_to_str(tvb, offset + i * 28 + 16, 4));
+        proto_tree_add_text(ext_tree_trip, tvb, offset + i * 28 + 20, 8, "Kc: %s", tvb_bytes_to_str(tvb, offset + i * 28 + 20, 8));
     }
 
     return count * 28;
@@ -3537,129 +3843,127 @@ static int decode_quintuplet(tvbuff_t * tvb, int offset, proto_tree * tree, guin
 
     for (i = 0; i < count; i++) {
 
-       te_quint = proto_tree_add_text(tree, tvb, offset, -1, "Quintuplet #%x", i + 1);
-       ext_tree_quint = proto_item_add_subtree(te_quint, ett_gtp_quint);
-
-
-       proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset, 16));
-       q_offset = q_offset + 16;
-       xres_len = tvb_get_guint8(tvb, offset + q_offset);
-       proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 1, "XRES length: %u", xres_len);
-       q_offset++;
-       proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, xres_len, "XRES: %s", tvb_bytes_to_str(tvb, offset + q_offset, xres_len));
-       q_offset = q_offset + xres_len;
-       proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "Quintuplet Ciphering Key: %s", tvb_bytes_to_str(tvb, offset + q_offset, 16));
-       q_offset = q_offset + 16;
-       proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "Quintuplet Integrity Key: %s", tvb_bytes_to_str(tvb, offset + q_offset, 16));
-       q_offset = q_offset + 16;
-       auth_len = tvb_get_guint8(tvb, offset + q_offset);
-       proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 1, "Authentication length: %u", auth_len);
-       q_offset++;
-       proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, auth_len, "AUTH: %s", tvb_bytes_to_str(tvb, offset + q_offset, auth_len));
-
-       q_offset = q_offset + auth_len;
-       proto_item_set_end(te_quint, tvb, offset + q_offset);
+        te_quint = proto_tree_add_text(tree, tvb, offset, -1, "Quintuplet #%x", i + 1);
+        ext_tree_quint = proto_item_add_subtree(te_quint, ett_gtp_quint);
+
+
+        proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset, 16));
+        q_offset = q_offset + 16;
+        xres_len = tvb_get_guint8(tvb, offset + q_offset);
+        proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 1, "XRES length: %u", xres_len);
+        q_offset++;
+        proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, xres_len, "XRES: %s", tvb_bytes_to_str(tvb, offset + q_offset, xres_len));
+        q_offset = q_offset + xres_len;
+        proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "Quintuplet Ciphering Key: %s", tvb_bytes_to_str(tvb, offset + q_offset, 16));
+        q_offset = q_offset + 16;
+        proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 16, "Quintuplet Integrity Key: %s", tvb_bytes_to_str(tvb, offset + q_offset, 16));
+        q_offset = q_offset + 16;
+        auth_len = tvb_get_guint8(tvb, offset + q_offset);
+        proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, 1, "Authentication length: %u", auth_len);
+        q_offset++;
+        proto_tree_add_text(ext_tree_quint, tvb, offset + q_offset, auth_len, "AUTH: %s", tvb_bytes_to_str(tvb, offset + q_offset, auth_len));
+
+        q_offset = q_offset + auth_len;
+        proto_item_set_end(te_quint, tvb, offset + q_offset);
 
     }
 
     return q_offset;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.19 page
- * UMTS:       29.060 v4.0, chapter 7.7.28 page 57
- * TODO:       - check if for quintuplets first 2 bytes are length, according to AuthQuint
- *             - finish displaying last 3 parameters
+/* GPRS:        9.60 v7.6.0, chapter 7.9.19 page
+ * UMTS:        29.060 v4.0, chapter 7.7.28 page 57
+ * TODO:        - check if for quintuplets first 2 bytes are length, according to AuthQuint
+ *              - finish displaying last 3 parameters
  */
-static int decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
+static int decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
 {
 
     guint16 length, quint_len, con_len;
-    guint8 cksn, count, sec_mode, len;
+    guint8 count, sec_mode, len, iei;
     proto_tree *ext_tree_mm;
     proto_item *te;
     proto_item *tf = NULL;
     proto_tree *tf_tree = NULL;
-    tvbuff_t *l3_tvb;
 
-
-    te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(GTP_EXT_MM_CNTXT, gtp_val, "Unknown message"));
+    te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str_ext_const(GTP_EXT_MM_CNTXT, &gtp_val_ext, "Unknown message"));
     ext_tree_mm = proto_item_add_subtree(te, ett_gtp_mm);
 
     /* Octet 2 - 3 */
     length = tvb_get_ntohs(tvb, offset + 1);
     if (length < 1)
-       return 3;
+        return 3;
+
+    /* Octet 4 (cksn)*/
 
-    /* Octet 4 */
-    cksn = tvb_get_guint8(tvb, offset + 3) & 0x07;
     /* Octet 5 */
     sec_mode = (tvb_get_guint8(tvb, offset + 4) >> 6) & 0x03;
     count = (tvb_get_guint8(tvb, offset + 4) >> 3) & 0x07;
 
     proto_tree_add_text(ext_tree_mm, tvb, offset + 1, 2, "Length: %x", length);
     if (gtp_version == 0)
-       sec_mode = 1;
+        sec_mode = 1;
 
 
     switch (sec_mode) {
-    case 0:                    /* Used cipher value, UMTS keys and Quintuplets */
-       proto_tree_add_item(ext_tree_mm, hf_gtp_cksn_ksi, tvb, offset + 3, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 16, "Ciphering key CK: %s", tvb_bytes_to_str(tvb, offset + 5, 16));
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 21, 16, "Integrity key IK: %s", tvb_bytes_to_str(tvb, offset + 21, 16));
-       quint_len = tvb_get_ntohs(tvb, offset + 37);
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 37, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len);
-
-       offset = offset + decode_quintuplet(tvb, offset + 39, ext_tree_mm, count) + 39;
-
-
-       break;
-    case 1:                    /* GSM key and triplets */
-       proto_tree_add_item(ext_tree_mm, hf_gtp_cksn, tvb, offset + 3, 1, FALSE);
-       if (gtp_version != 0)
-           proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, FALSE);
-
-       proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 8, "Ciphering key Kc: %s", tvb_bytes_to_str(tvb, offset + 5, 8));
-
-       offset = offset + decode_triplet(tvb, offset + 13, ext_tree_mm, count) + 13;
-
-       break;
-    case 2:                    /* UMTS key and quintuplets */
-       proto_tree_add_item(ext_tree_mm, hf_gtp_ksi, tvb, offset + 3, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 16, "Ciphering key CK: %s", tvb_bytes_to_str(tvb, offset + 5, 16));
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 21, 16, "Integrity key IK: %s", tvb_bytes_to_str(tvb, offset + 21, 16));
-       quint_len = tvb_get_ntohs(tvb, offset + 37);
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 37, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len);
-
-       offset = offset + decode_quintuplet(tvb, offset + 39, ext_tree_mm, count) + 39;
-
-       break;
-    case 3:                    /* GSM key and quintuplets */
-       proto_tree_add_item(ext_tree_mm, hf_gtp_cksn, tvb, offset + 3, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, FALSE);
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 8, "Ciphering key Kc: %s", tvb_bytes_to_str(tvb, offset + 5, 8));
-       quint_len = tvb_get_ntohs(tvb, offset + 13);
-       proto_tree_add_text(ext_tree_mm, tvb, offset + 13, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len);
-
-       offset = offset + decode_quintuplet(tvb, offset + 15, ext_tree_mm, count) + 15;
-
-       break;
+    case 0:                     /* Used cipher value, UMTS keys and Quintuplets */
+        proto_tree_add_item(ext_tree_mm, hf_gtp_cksn_ksi, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 16, "Ciphering key CK: %s", tvb_bytes_to_str(tvb, offset + 5, 16));
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 21, 16, "Integrity key IK: %s", tvb_bytes_to_str(tvb, offset + 21, 16));
+        quint_len = tvb_get_ntohs(tvb, offset + 37);
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 37, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len);
+
+        offset = offset + decode_quintuplet(tvb, offset + 39, ext_tree_mm, count) + 39;
+
+
+        break;
+    case 1:                     /* GSM key and triplets */
+        proto_tree_add_item(ext_tree_mm, hf_gtp_cksn, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
+        if (gtp_version != 0)
+            proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+
+        proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 8, "Ciphering key Kc: %s", tvb_bytes_to_str(tvb, offset + 5, 8));
+
+        offset = offset + decode_triplet(tvb, offset + 13, ext_tree_mm, count) + 13;
+
+        break;
+    case 2:                     /* UMTS key and quintuplets */
+        proto_tree_add_item(ext_tree_mm, hf_gtp_ksi, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 16, "Ciphering key CK: %s", tvb_bytes_to_str(tvb, offset + 5, 16));
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 21, 16, "Integrity key IK: %s", tvb_bytes_to_str(tvb, offset + 21, 16));
+        quint_len = tvb_get_ntohs(tvb, offset + 37);
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 37, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len);
+
+        offset = offset + decode_quintuplet(tvb, offset + 39, ext_tree_mm, count) + 39;
+
+        break;
+    case 3:                     /* GSM key and quintuplets */
+        proto_tree_add_item(ext_tree_mm, hf_gtp_cksn, tvb, offset + 3, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_security_mode, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_no_of_vectors, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_mm, hf_gtp_cipher_algorithm, tvb, offset + 4, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 5, 8, "Ciphering key Kc: %s", tvb_bytes_to_str(tvb, offset + 5, 8));
+        quint_len = tvb_get_ntohs(tvb, offset + 13);
+        proto_tree_add_text(ext_tree_mm, tvb, offset + 13, 2, "Quintuplets length: 0x%x (%u)", quint_len, quint_len);
+
+        offset = offset + decode_quintuplet(tvb, offset + 15, ext_tree_mm, count) + 15;
+
+        break;
     default:
-       break;
+        break;
     }
 
 /*
  * 3GPP TS 24.008 10.5.5.6 ( see packet-gsm_a.c )
  */
-    de_gmm_drx_param(tvb, ext_tree_mm, offset, 2, NULL, 0);
+    de_gmm_drx_param(tvb, ext_tree_mm, pinfo, offset, 2, NULL, 0);
     offset = offset + 2;
 
     len = tvb_get_guint8(tvb, offset);
@@ -3673,12 +3977,26 @@ static int decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _
 /*
  * GPP TS 24.008 10.5.5.12 ( see packet-gsm_a.c )
  */
-    de_gmm_ms_net_cap(tvb, tf_tree, offset, len, NULL, 0);
+    de_gmm_ms_net_cap(tvb, tf_tree, pinfo, offset, len, NULL, 0);
     offset = offset + len;
 
-/* Container contains one or several optional information elements as described in the clause 'Overview',
- * from the clause 'General message format and information elements coding' in 3GPP TS 24.008.
- * The IMEISV shall, if available, be included in the Container.
+/* 3GPP TS 29.060 version 9.4.0 Release 9
+ *  The two octets Container Length holds the length of the Container, excluding the Container Length octets.
+ * Container contains one or several optional information elements as described in the clause "Overview", from the clause
+ * "General message format and information elements coding" in 3GPP TS 24.008 [5]. For the definition of the IEI see
+ * table 47a, "IEIs for information elements used in the container". The IMEISV shall, if available, be included in the
+ * Container. The IMEISV is included in the Mobile identity IE. If Container is not included, its Length field value shall
+ * be set to 0. If the MS is emergency attached and the MS is UICCless or the IMSI is unauthenticated, the International
+ * Mobile Equipment Identity (IMEI) shall be used as the MS identity.
+ *
+ * Table 47A: IEIs for information elements used in the container
+ * IEI            Information element
+ * 0x23           Mobile identity
+ *
+ * NOTE: In 3GPP TS 24.008 [5] the IEI definition is
+ * message dependent. The table is added to
+ * have a unique definition in the present
+ * document for the used IEI in the MMcontext.
  */
 
     con_len = tvb_get_ntohs(tvb, offset);
@@ -3686,10 +4004,19 @@ static int decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _
     offset = offset + 2;
 
     if (con_len > 0) {
-
-       l3_tvb = tvb_new_subset(tvb, offset, con_len, con_len);
-       if (!dissector_try_port(bssap_pdu_type_table, BSSAP_PDU_TYPE_DTAP, l3_tvb, pinfo, ext_tree_mm))
-           call_dissector(data_handle, l3_tvb, pinfo, ext_tree_mm);
+        proto_tree_add_text(ext_tree_mm, tvb, offset, con_len, "Container");
+
+        iei = tvb_get_guint8(tvb,offset);
+        if (iei == 0x23){
+            proto_tree_add_text(ext_tree_mm, tvb, offset, 1, "Mobile identity IEI %u",iei);
+            offset++;
+            len = tvb_get_guint8(tvb,offset);
+            proto_tree_add_text(ext_tree_mm, tvb, offset, 1, "Length %u",len);
+            offset++;
+            de_mid(tvb, ext_tree_mm, pinfo, offset, len, NULL, 0);
+        }else{
+            proto_tree_add_text(ext_tree_mm, tvb, offset, 1, "Unknown IEI %u - Later spec than TS 29.060 9.4.0 used?",iei);
+        }
     }
 
     return 3 + length;
@@ -3701,13 +4028,13 @@ static int decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _
 static guint8 hex2dec(guint8 x)
 {
     if ((x >= 'a') && (x <= 'f'))
-       x = x - 'a' + 10;
+        x = x - 'a' + 10;
     else if ((x >= 'A') && (x <= 'F'))
-       x = x - 'A' + 10;
+        x = x - 'A' + 10;
     else if ((x >= '0') && (x <= '9'))
-       x = x - '0';
+        x = x - '0';
     else
-       x = 0;
+        x = 0;
     return x;
 }
 
@@ -3717,9 +4044,9 @@ static guint8 hex2dec(guint8 x)
 static guint8 wrapped_tvb_get_guint8(tvbuff_t * tvb, int offset, int type)
 {
     if (type == 2)
-       return (hex2dec(tvb_get_guint8(tvb, offset)) << 4 | hex2dec(tvb_get_guint8(tvb, offset + 1)));
+        return (hex2dec(tvb_get_guint8(tvb, offset)) << 4 | hex2dec(tvb_get_guint8(tvb, offset + 1)));
     else
-       return tvb_get_guint8(tvb, offset);
+        return tvb_get_guint8(tvb, offset);
 }
 
  /* WARNING : actually length is coded on 2 octets for QoS profile but on 1 octet for PDP Context!
@@ -3766,56 +4093,56 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
 
     switch (type) {
     case 1:
-       length = tvb_get_guint8(tvb, offset);
-       te = proto_tree_add_text(tree, tvb, offset, length + 1, "%s", qos_str);
-       ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos);
-       proto_tree_add_text(ext_tree_qos, tvb, offset, 1, "Length: %u", length);
-       offset++;
-       retval = length + 1;
-       break;
+        length = tvb_get_guint8(tvb, offset);
+        te = proto_tree_add_text(tree, tvb, offset, length + 1, "%s", qos_str);
+        ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos);
+        proto_tree_add_text(ext_tree_qos, tvb, offset, 1, "Length: %u", length);
+        offset++;
+        retval = length + 1;
+        break;
     case 2:
-       length = tvb_get_ntohs(tvb, offset + 1);
-       te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", qos_str);
-       ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos);
-       proto_tree_add_text(ext_tree_qos, tvb, offset + 1, 2, "Length: %u", length);
-       offset += 3;            /* +1 because of first 0x86 byte for UMTS QoS */
-       retval = length + 3;
-       break;
+        length = tvb_get_ntohs(tvb, offset + 1);
+        te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", qos_str);
+        ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos);
+        proto_tree_add_text(ext_tree_qos, tvb, offset + 1, 2, "Length: %u", length);
+        offset += 3;            /* +1 because of first 0x86 byte for UMTS QoS */
+        retval = length + 3;
+        break;
     case 3:
-       /* For QoS inside RADIUS Client messages from GGSN */
-       utf8_type = 2;
+        /* For QoS inside RADIUS Client messages from GGSN */
+        utf8_type = 2;
 
-       /* The field in the RADIUS message is the length of the tvb we were given */
-       length = tvb_length(tvb);
-       te = proto_tree_add_text(tree, tvb, offset, length, "%s", qos_str);
+        /* The field in the RADIUS message is the length of the tvb we were given */
+        length = tvb_length(tvb);
+        te = proto_tree_add_text(tree, tvb, offset, length, "%s", qos_str);
 
-       ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos);
+        ext_tree_qos = proto_item_add_subtree(te, ett_gtp_qos);
 
-       proto_tree_add_item(ext_tree_qos, hf_gtp_qos_version, tvb, offset, 2, FALSE);
+        proto_tree_add_item(ext_tree_qos, hf_gtp_qos_version, tvb, offset, 2, ENC_ASCII|ENC_NA);
 
-       /* Hyphen handling */
-       hyphen = tvb_get_guint8(tvb, offset + 2);
-       if (hyphen == ((guint8) '-')) {
-           /* Hyphen is present, put in protocol tree */
-           proto_tree_add_text(ext_tree_qos, tvb, offset + 2, 1, "Hyphen separator: -");
-           offset++;           /* "Get rid" of hyphen */
-       }
+        /* Hyphen handling */
+        hyphen = tvb_get_guint8(tvb, offset + 2);
+        if (hyphen == ((guint8) '-')) {
+            /* Hyphen is present, put in protocol tree */
+            proto_tree_add_text(ext_tree_qos, tvb, offset + 2, 1, "Hyphen separator: -");
+            offset++;           /* "Get rid" of hyphen */
+        }
 
-       /* Now, we modify offset here and in order to use type later
-        * effectively.*/
-       offset++;
+        /* Now, we modify offset here and in order to use type later
+         * effectively.*/
+        offset++;
 
-       length -= offset;
-       length /= 2;
+        length -= offset;
+        length /= 2;
 
-       retval = length + 2;    /* Actually, will be ignored. */
-       break;
+        retval = length + 2;    /* Actually, will be ignored. */
+        break;
     default:
-       /* XXX - what should we do with the length here? */
-       length = 0;
-       retval = 0;
-       ext_tree_qos = NULL;
-       break;
+        /* XXX - what should we do with the length here? */
+        length = 0;
+        retval = 0;
+        ext_tree_qos = NULL;
+        break;
     }
 
     /* In RADIUS messages there is no allocation-retention priority
@@ -3831,18 +4158,18 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
      * two bytes for needed shift, and the wrapped function will unencode
      * two values from the input.
      * */
-    spare1 = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & 0xC0;
-    delay = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & 0x38;
-    reliability = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & 0x07;
-    peak = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & 0xF0;
-    spare2 = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & 0x08;
-    precedence = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & 0x07;
-    spare3 = wrapped_tvb_get_guint8(tvb, offset + (3 - 1) * utf8_type + 1, utf8_type) & 0xE0;
-    mean = wrapped_tvb_get_guint8(tvb, offset + (3 - 1) * utf8_type + 1, utf8_type) & 0x1F;
+    spare1 = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SPARE1_MASK;
+    delay = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_DELAY_MASK;
+    reliability = wrapped_tvb_get_guint8(tvb, offset + (1 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_RELIABILITY_MASK;
+    peak = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_PEAK_MASK;
+    spare2 = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SPARE2_MASK;
+    precedence = wrapped_tvb_get_guint8(tvb, offset + (2 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_PRECEDENCE_MASK;
+    spare3 = wrapped_tvb_get_guint8(tvb, offset + (3 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SPARE3_MASK;
+    mean = wrapped_tvb_get_guint8(tvb, offset + (3 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_MEAN_MASK;
 
     /* In RADIUS messages there is no allocation-retention priority */
     if (type != 3)
-       proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_al_ret_priority, tvb, offset, 1, al_ret_priority);
+        proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_al_ret_priority, tvb, offset, 1, al_ret_priority);
 
     /* All additions must take care of the fact that QoS fields in RADIUS
      * messages are UTF-8 encoded, so we have to use the same trick as above.
@@ -3871,19 +4198,19 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
     if (length > 4) {
 
         /* See above for the need of wrapping
-         * 
+         *
          */
         /* Octet 6 */
-        traf_class = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & 0xE0;
-        del_order = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & 0x18;
-        del_err_sdu = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & 0x07;
+        traf_class = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_TRAF_CLASS_MASK;
+        del_order = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_DEL_ORDER_MASK;
+        del_err_sdu = wrapped_tvb_get_guint8(tvb, offset + (4 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_DEL_ERR_SDU_MASK;
         max_sdu_size = wrapped_tvb_get_guint8(tvb, offset + (5 - 1) * utf8_type + 1, utf8_type);
         max_ul = wrapped_tvb_get_guint8(tvb, offset + (6 - 1) * utf8_type + 1, utf8_type);
         max_dl = wrapped_tvb_get_guint8(tvb, offset + (7 - 1) * utf8_type + 1, utf8_type);
-        res_ber = wrapped_tvb_get_guint8(tvb, offset + (8 - 1) * utf8_type + 1, utf8_type) & 0xF0;
-        sdu_err_ratio = wrapped_tvb_get_guint8(tvb, offset + (8 - 1) * utf8_type + 1, utf8_type) & 0x0F;
-        trans_delay = wrapped_tvb_get_guint8(tvb, offset + (9 - 1) * utf8_type + 1, utf8_type) & 0xFC;
-        traf_handl_prio = wrapped_tvb_get_guint8(tvb, offset + (9 - 1) * utf8_type + 1, utf8_type) & 0x03;
+        res_ber = wrapped_tvb_get_guint8(tvb, offset + (8 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_RES_BER_MASK;
+        sdu_err_ratio = wrapped_tvb_get_guint8(tvb, offset + (8 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_SDU_ERR_RATIO_MASK;
+        trans_delay = wrapped_tvb_get_guint8(tvb, offset + (9 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_TRANS_DELAY_MASK;
+        traf_handl_prio = wrapped_tvb_get_guint8(tvb, offset + (9 - 1) * utf8_type + 1, utf8_type) & GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK;
         guar_ul = wrapped_tvb_get_guint8(tvb, offset + (10 - 1) * utf8_type + 1, utf8_type);
         /* Octet 13 */
         guar_dl = wrapped_tvb_get_guint8(tvb, offset + (11 - 1) * utf8_type + 1, utf8_type);
@@ -3896,20 +4223,21 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
         guar_ul_ext =0;
 
         if (length > 13) {
-            src_stat_desc = wrapped_tvb_get_guint8(tvb, offset + (12 - 1) * utf8_type + 1, utf8_type)& 0xf;
-            sig_ind = wrapped_tvb_get_guint8(tvb, offset + (12 - 1) * utf8_type + 1, utf8_type)& 0x01;
+            src_stat_desc = wrapped_tvb_get_guint8(tvb, offset + (12 - 1) * utf8_type + 1, utf8_type)& GTP_EXT_QOS_SRC_STAT_DESC_MASK;
+            sig_ind = wrapped_tvb_get_guint8(tvb, offset + (12 - 1) * utf8_type + 1, utf8_type)& GTP_EXT_QOS_SIG_IND_MASK;
         }
         if (length > 14) {
             max_dl_ext = wrapped_tvb_get_guint8(tvb, offset + (13 - 1) * utf8_type + 1, utf8_type);
             guar_dl_ext = wrapped_tvb_get_guint8(tvb, offset + (14 - 1) * utf8_type + 1, utf8_type);
         }
-        if (length > 17) {
+        if (length > 16) {
             max_ul_ext = wrapped_tvb_get_guint8(tvb, offset + (15 - 1) * utf8_type + 1, utf8_type);
             guar_ul_ext = wrapped_tvb_get_guint8(tvb, offset + (16 - 1) * utf8_type + 1, utf8_type);
         }
 
-        /* See above comments for the changes
-         * */
+        /* 
+         * See above comments for the changes
+         */
         proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_traf_class, tvb, offset + (4 - 1) * utf8_type + 1, utf8_type, traf_class);
         proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_del_order, tvb, offset + (4 - 1) * utf8_type + 1, utf8_type, del_order);
         proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_del_err_sdu, tvb, offset + (4 - 1) * utf8_type + 1, utf8_type, del_err_sdu);
@@ -3918,40 +4246,40 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
         if (max_sdu_size > 0 && max_sdu_size <= 150) {
             mss = max_sdu_size * 10;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_sdu_size, tvb, offset + (5 - 1) * utf8_type + 1, utf8_type, mss,
-                                       "Maximum SDU size : %u octets", mss);
+                                       "Maximum SDU size: %u octets", mss);
         }
 
         if (max_ul == 0 || max_ul == 255)
             proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (6 - 1) * utf8_type + 1, utf8_type, max_ul);
         if (max_ul > 0 && max_ul <= 63)
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (6 - 1) * utf8_type + 1, utf8_type, max_ul,
-                                      "Maximum bit rate for uplink : %u kbps", max_ul);
+                                       "Maximum bit rate for uplink: %u kbps", max_ul);
         if (max_ul > 63 && max_ul <= 127) {
             mu = 64 + (max_ul - 64) * 8;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (6 - 1) * utf8_type + 1, utf8_type, mu,
-                                      "Maximum bit rate for uplink : %u kbps", mu);
+                                       "Maximum bit rate for uplink: %u kbps", mu);
         }
 
         if (max_ul > 127 && max_ul <= 254) {
             mu = 576 + (max_ul - 128) * 64;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (6 - 1) * utf8_type + 1, utf8_type, mu,
-                                      "Maximum bit rate for uplink : %u kbps", mu);
+                                       "Maximum bit rate for uplink: %u kbps", mu);
         }
 
         if (max_dl == 0 || max_dl == 255)
             proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (7 - 1) * utf8_type + 1, utf8_type, max_dl);
         if (max_dl > 0 && max_dl <= 63)
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (7 - 1) * utf8_type + 1, utf8_type, max_dl,
-                                      "Maximum bit rate for downlink : %u kbps", max_dl);
+                                       "Maximum bit rate for downlink: %u kbps", max_dl);
         if (max_dl > 63 && max_dl <= 127) {
             md = 64 + (max_dl - 64) * 8;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (7 - 1) * utf8_type + 1, utf8_type, md,
-                                      "Maximum bit rate for downlink : %u kbps", md);
+                                       "Maximum bit rate for downlink: %u kbps", md);
         }
         if (max_dl > 127 && max_dl <= 254) {
             md = 576 + (max_dl - 128) * 64;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (7 - 1) * utf8_type + 1, utf8_type, md,
-                                      "Maximum bit rate for downlink : %u kbps", md);
+                                       "Maximum bit rate for downlink: %u kbps", md);
         }
 
         proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_res_ber, tvb, offset + (8 - 1) * utf8_type + 1, utf8_type, res_ber);
@@ -3963,16 +4291,16 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
             proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (10 - 1) * utf8_type + 1, utf8_type, guar_ul);
         if (guar_ul > 0 && guar_ul <= 63)
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (10 - 1) * utf8_type + 1, utf8_type, guar_ul,
-                                      "Guaranteed bit rate for uplink : %u kbps", guar_ul);
+                                       "Guaranteed bit rate for uplink: %u kbps", guar_ul);
         if (guar_ul > 63 && guar_ul <= 127) {
             gu = 64 + (guar_ul - 64) * 8;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (10 - 1) * utf8_type + 1, utf8_type, gu,
-                                      "Guaranteed bit rate for uplink : %u kbps", gu);
+                                       "Guaranteed bit rate for uplink: %u kbps", gu);
         }
         if (guar_ul > 127 && guar_ul <= 254) {
             gu = 576 + (guar_ul - 128) * 64;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (10 - 1) * utf8_type + 1, utf8_type, gu,
-                                      "Guaranteed bit rate for uplink : %u kbps", gu);
+                                       "Guaranteed bit rate for uplink: %u kbps", gu);
         }
 
         /* Octet 13 */
@@ -3980,18 +4308,18 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
             proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (11 - 1) * utf8_type + 1, utf8_type, guar_dl);
         if (guar_dl > 0 && guar_dl <= 63)
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (11 - 1) * utf8_type + 1, utf8_type, guar_dl,
-                                      "Guaranteed bit rate for downlink : %u kbps", guar_dl);
+                                       "Guaranteed bit rate for downlink: %u kbps", guar_dl);
         if (guar_dl > 63 && guar_dl <= 127) {
             gd = 64 + (guar_dl - 64) * 8;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (11 - 1) * utf8_type + 1, utf8_type, gd,
-                                      "Guaranteed bit rate for downlink : %u kbps", gd);
+                                       "Guaranteed bit rate for downlink: %u kbps", gd);
         }
         if (guar_dl > 127 && guar_dl <= 254) {
             gd = 576 + (guar_dl - 128) * 64;
             proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (11 - 1) * utf8_type + 1, utf8_type, gd,
-                                      "Guaranteed bit rate for downlink : %u kbps", gd);
+                                       "Guaranteed bit rate for downlink: %u kbps", gd);
         }
-               
+
         if(length > 13){
             proto_tree_add_uint(ext_tree_qos, hf_gtp_qos_src_stat_desc, tvb, offset + (12 - 1) * utf8_type + 1, utf8_type, src_stat_desc);
             proto_tree_add_boolean(ext_tree_qos, hf_gtp_qos_sig_ind, tvb, offset + (12 - 1) * utf8_type + 1, utf8_type, sig_ind);
@@ -4001,17 +4329,17 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
             if (max_dl_ext > 0 && max_dl_ext <= 0x4a) {
                 md = 8600 + max_dl_ext * 100;
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (13 - 1) * utf8_type + 1, utf8_type, md,
-                                           "Ext Maximum bit rate for downlink : %u kbps", md);
+                                           "Ext Maximum bit rate for downlink: %u kbps", md);
             }
             if (max_dl_ext > 0x4a && max_dl_ext <= 0xba) {
                 md = 16 + (max_dl_ext-0x4a);
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (13 - 1) * utf8_type + 1, utf8_type, md,
-                                           "Ext Maximum bit rate for downlink : %u Mbps", md);
+                                           "Ext Maximum bit rate for downlink: %u Mbps", md);
             }
             if (max_dl_ext > 0xba && max_dl_ext <= 0xfa) {
                 md = 128 + (max_dl_ext-0xba)*2;
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_dl, tvb, offset + (13 - 1) * utf8_type + 1, utf8_type, md,
-                                           "Ext Maximum bit rate for downlink : %u Mbps", md);
+                                           "Ext Maximum bit rate for downlink: %u Mbps", md);
             }
             /* Octet 16 */
             if(guar_dl_ext == 0)
@@ -4019,17 +4347,17 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
             if (guar_dl_ext > 0 && guar_dl_ext <= 0x4a) {
                 gd = 8600 + guar_dl_ext * 100;
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (14 - 1) * utf8_type + 1, utf8_type, gd,
-                                           "Ext Guaranteed bit rate for downlink : %u kbps", gd);
+                                           "Ext Guaranteed bit rate for downlink: %u kbps", gd);
             }
             if (guar_dl_ext > 0x4a && max_dl_ext <= 0xba) {
                 gd = 16 + (guar_dl_ext-0x4a);
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (14 - 1) * utf8_type + 1, utf8_type, gd,
-                                           "Ext Guaranteed bit rate for downlink : %u Mbps", gd);
+                                           "Ext Guaranteed bit rate for downlink: %u Mbps", gd);
             }
             if (guar_dl_ext > 0xba && max_dl_ext <= 0xfa) {
                 gd = 128 + (guar_dl_ext-0xba)*2;
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_dl, tvb, offset + (14 - 1) * utf8_type + 1, utf8_type, gd,
-                                           "Ext Guaranteed bit rate for downlink : %u Mbps", gd);
+                                           "Ext Guaranteed bit rate for downlink: %u Mbps", gd);
             }
 
         }
@@ -4041,35 +4369,35 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
             if (max_ul_ext > 0 && max_ul_ext <= 0x4a) {
                 md = 8600 + max_ul_ext * 100;
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
-                                           "Ext Maximum bit rate for uplink : %u kbps", md);
+                                           "Ext Maximum bit rate for uplink: %u kbps", md);
             }
             if (max_ul_ext > 0x4a && max_ul_ext <= 0xba) {
                 md = 16 + (max_ul_ext-0x4a);
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
-                                           "Ext Maximum bit rate for uplink : %u Mbps", md);
+                                           "Ext Maximum bit rate for uplink: %u Mbps", md);
             }
             if (max_ul_ext > 0xba && max_ul_ext <= 0xfa) {
                 md = 128 + (max_ul_ext-0xba)*2;
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_max_ul, tvb, offset + (15 - 1) * utf8_type + 1, utf8_type, md,
-                                           "Ext Maximum bit rate for uplink : %u Mbps", md);
+                                           "Ext Maximum bit rate for uplink: %u Mbps", md);
             }
             /* Octet 18 */
-            if(guar_ul_ext == 0)
-                proto_tree_add_text(ext_tree_qos, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, "Use the value indicated by the Guaranteed bit rate for uplink in octet 13");
+            if (guar_ul_ext == 0)
+                proto_tree_add_text(ext_tree_qos, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, "Use the value indicated by the Guaranteed bit rate for uplink in octet 12");
             if (guar_ul_ext > 0 && guar_ul_ext <= 0x4a) {
                 gd = 8600 + guar_ul_ext * 100;
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
-                                           "Ext Guaranteed bit rate for uplink : %u kbps", gd);
+                                           "Ext Guaranteed bit rate for uplink: %u kbps", gd);
             }
             if (guar_ul_ext > 0x4a && max_ul_ext <= 0xba) {
                 gd = 16 + (guar_ul_ext-0x4a);
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
-                                           "Ext Guaranteed bit rate for uplink : %u Mbps", gd);
+                                           "Ext Guaranteed bit rate for uplink: %u Mbps", gd);
             }
             if (guar_ul_ext > 0xba && max_ul_ext <= 0xfa) {
                 gd = 128 + (guar_ul_ext-0xba)*2;
                 proto_tree_add_uint_format(ext_tree_qos, hf_gtp_qos_guar_ul, tvb, offset + (16 - 1) * utf8_type + 1, utf8_type, gd,
-                                           "Ext Guaranteed bit rate for uplink : %u Mbps", gd);
+                                           "Ext Guaranteed bit rate for uplink: %u Mbps", gd);
             }
         }
 
@@ -4078,7 +4406,15 @@ static int decode_qos_umts(tvbuff_t * tvb, int offset, proto_tree * tree, const
     return retval;
 }
 
-static const gchar *dissect_radius_qos_umts(proto_tree * tree, tvbuff_t * tvb)
+/* Diameter 3GPP AVP Code: 5 3GPP-GPRS Negotiated QoS profile */
+static int
+dissect_diameter_3gpp_qosprofile(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+
+    decode_qos_umts(tvb, 0, tree, "UMTS GTP QoS Profile", 3);
+    return tvb_length(tvb);
+}
+
+static const gchar *dissect_radius_qos_umts(proto_tree * tree, tvbuff_t * tvb, packet_info* pinfo _U_)
 {
     decode_qos_umts(tvb, 0, tree, "UMTS GTP QoS Profile", 3);
     return tvb_get_ephemeral_string(tvb, 0, tvb_length(tvb));
@@ -4091,32 +4427,33 @@ static void decode_apn(tvbuff_t * tvb, int offset, guint16 length, proto_tree *
     int name_len, tmp;
 
     if (length > 0) {
-       name_len = tvb_get_guint8(tvb, offset);
-
-       if (name_len < 0x20) {
-           apn = tvb_get_ephemeral_string(tvb, offset + 1, length - 1);
-           for (;;) {
-               if (name_len >= length - 1)
-                   break;
-               tmp = name_len;
-               name_len = name_len + apn[tmp] + 1;
-               apn[tmp] = '.';
-           }
-       } else
-           apn = tvb_get_ephemeral_string(tvb, offset, length);
-
-       proto_tree_add_string(tree, hf_gtp_apn, tvb, offset, length, apn);
+        name_len = tvb_get_guint8(tvb, offset);
+
+        if (name_len < 0x20) {
+            apn = tvb_get_ephemeral_string(tvb, offset + 1, length - 1);
+            for (;;) {
+                if (name_len >= length - 1)
+                    break;
+                tmp = name_len;
+                name_len = name_len + apn[tmp] + 1;
+                apn[tmp] = '.';
+            }
+        } else
+            apn = tvb_get_ephemeral_string(tvb, offset, length);
+
+        proto_tree_add_string(tree, hf_gtp_apn, tvb, offset, length, apn);
     }
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.20
- * UMTS:       29.060 v4.0, chapter 7.7.29
- * TODO:       unify addr functions
+/*
+ * GPRS:        9.60 v7.6.0, chapter 7.9.20
+ * UMTS:        29.060 v4.0, chapter 7.7.29 PDP Context
+ * TODO:        unify addr functions
  */
 static int decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
-    guint8 ggsn_addr_len, apn_len, trans_id, vaa, order, nsapi, sapi, pdu_send_no, pdu_rec_no, pdp_cntxt_id, pdp_type_org, pdp_type_num, pdp_addr_len;
+    guint8 ggsn_addr_len, apn_len, trans_id, vaa, asi, order, nsapi, sapi, pdu_send_no, pdu_rec_no, pdp_cntxt_id, pdp_type_org, pdp_type_num, pdp_addr_len;
     guint16 length, sn_down, sn_up, up_flow;
     guint32 addr_ipv4;
     struct e_in6_addr addr_ipv6;
@@ -4125,34 +4462,36 @@ static int decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     length = tvb_get_ntohs(tvb, offset + 1);
 
-    te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str(GTP_EXT_PDP_CNTXT, gtp_val, "Unknown message"));
+    te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str_ext_const(GTP_EXT_PDP_CNTXT, &gtp_val_ext, "Unknown message"));
     ext_tree_pdp = proto_item_add_subtree(te, ett_gtp_pdp);
 
     vaa = (tvb_get_guint8(tvb, offset + 3) >> 6) & 0x01;
+    asi = (tvb_get_guint8(tvb, offset + 3) >> 5) & 0x01;
     order = (tvb_get_guint8(tvb, offset + 3) >> 4) & 0x01;
     nsapi = tvb_get_guint8(tvb, offset + 3) & 0x0F;
     sapi = tvb_get_guint8(tvb, offset + 4) & 0x0F;
 
     proto_tree_add_text(ext_tree_pdp, tvb, offset + 3, 1, "VPLMN address allowed: %s", yesno[vaa]);
+    proto_tree_add_text(ext_tree_pdp, tvb, offset + 3, 1, "Activity Status Indicator: %s", yesno[asi]);
     proto_tree_add_text(ext_tree_pdp, tvb, offset + 3, 1, "Reordering required: %s", yesno[order]);
     proto_tree_add_text(ext_tree_pdp, tvb, offset + 3, 1, "NSAPI: %u", nsapi);
     proto_tree_add_text(ext_tree_pdp, tvb, offset + 4, 1, "SAPI: %u", sapi);
 
     switch (gtp_version) {
     case 0:
-       decode_qos_gprs(tvb, offset + 5, ext_tree_pdp, "QoS subscribed", 0);
-       decode_qos_gprs(tvb, offset + 8, ext_tree_pdp, "QoS requested", 0);
-       decode_qos_gprs(tvb, offset + 11, ext_tree_pdp, "QoS negotiated", 0);
-       offset = offset + 14;
-       break;
+        decode_qos_gprs(tvb, offset + 5, ext_tree_pdp, "QoS subscribed", 0);
+        decode_qos_gprs(tvb, offset + 8, ext_tree_pdp, "QoS requested", 0);
+        decode_qos_gprs(tvb, offset + 11, ext_tree_pdp, "QoS negotiated", 0);
+        offset = offset + 14;
+        break;
     case 1:
-       offset = offset + 5;
-       offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS subscribed", 1);
-       offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS requested", 1);
-       offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS negotiated", 1);
-       break;
+        offset = offset + 5;
+        offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS subscribed", 1);
+        offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS requested", 1);
+        offset = offset + decode_qos_umts(tvb, offset, ext_tree_pdp, "QoS negotiated", 1);
+        break;
     default:
-       break;
+        break;
     }
 
     sn_down = tvb_get_ntohs(tvb, offset);
@@ -4167,42 +4506,42 @@ static int decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     switch (gtp_version) {
     case 0:
-       up_flow = tvb_get_ntohs(tvb, offset + 6);
-       proto_tree_add_text(ext_tree_pdp, tvb, offset + 6, 2, "Uplink flow label signalling: %u", up_flow);
-       offset = offset + 8;
-       break;
+        up_flow = tvb_get_ntohs(tvb, offset + 6);
+        proto_tree_add_text(ext_tree_pdp, tvb, offset + 6, 2, "Uplink flow label signalling: %u", up_flow);
+        offset = offset + 8;
+        break;
     case 1:
-       pdp_cntxt_id = tvb_get_guint8(tvb, offset + 14);
-       proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_cp, tvb, offset + 6, 4, FALSE);
-       proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_data, tvb, offset + 10, 4, FALSE);
-       proto_tree_add_text(ext_tree_pdp, tvb, offset + 14, 1, "PDP context identifier: %u", pdp_cntxt_id);
-       offset = offset + 15;
-       break;
+        pdp_cntxt_id = tvb_get_guint8(tvb, offset + 14);
+        proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_cp, tvb, offset + 6, 4, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ext_tree_pdp, hf_gtp_ulink_teid_data, tvb, offset + 10, 4, ENC_BIG_ENDIAN);
+        proto_tree_add_text(ext_tree_pdp, tvb, offset + 14, 1, "PDP context identifier: %u", pdp_cntxt_id);
+        offset = offset + 15;
+        break;
     default:
-       break;
+        break;
     }
 
     pdp_type_org = tvb_get_guint8(tvb, offset) & 0x0F;
     pdp_type_num = tvb_get_guint8(tvb, offset + 1);
     pdp_addr_len = tvb_get_guint8(tvb, offset + 2);
 
-    proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "PDP organization: %s", val_to_str(pdp_type_org, pdp_type, "Unknown PDP org"));
-    proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 1, "PDP type: %s", val_to_str(pdp_type_num, pdp_type, "Unknown PDP type"));
+    proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "PDP organization: %s", val_to_str_const(pdp_type_org, pdp_type, "Unknown PDP org"));
+    proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 1, "PDP type: %s", val_to_str_const(pdp_type_num, pdp_type, "Unknown PDP type"));
     proto_tree_add_text(ext_tree_pdp, tvb, offset + 2, 1, "PDP address length: %u", pdp_addr_len);
 
     if (pdp_addr_len > 0) {
-       switch (pdp_type_num) {
-       case 0x21:
-           addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
-           proto_tree_add_text(ext_tree_pdp, tvb, offset + 3, 4, "PDP address: %s", ip_to_str((guint8 *) & addr_ipv4));
-           break;
-       case 0x57:
-           tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
-           proto_tree_add_text(ext_tree_pdp, tvb, offset + 3, 16, "PDP address: %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
-           break;
-       default:
-           break;
-       }
+        switch (pdp_type_num) {
+        case 0x21:
+            addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
+            proto_tree_add_text(ext_tree_pdp, tvb, offset + 3, 4, "PDP address: %s", ip_to_str((guint8 *) & addr_ipv4));
+            break;
+        case 0x57:
+            tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
+            proto_tree_add_text(ext_tree_pdp, tvb, offset + 3, 16, "PDP address: %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
+            break;
+        default:
+            break;
+        }
     }
 
     offset = offset + 3 + pdp_addr_len;
@@ -4212,37 +4551,37 @@ static int decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     switch (ggsn_addr_len) {
     case 4:
-       addr_ipv4 = tvb_get_ipv4(tvb, offset + 1);
-       proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 4, "GGSN Address for control plane: %s", ip_to_str((guint8 *) & addr_ipv4));
-       break;
+        addr_ipv4 = tvb_get_ipv4(tvb, offset + 1);
+        proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 4, "GGSN Address for control plane: %s", ip_to_str((guint8 *) & addr_ipv4));
+        break;
     case 16:
-       tvb_get_ipv6(tvb, offset + 1, &addr_ipv6);
-       proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 16, "GGSN Address for User Traffic: %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
-       break;
+        tvb_get_ipv6(tvb, offset + 1, &addr_ipv6);
+        proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 16, "GGSN Address for User Traffic: %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
+        break;
     default:
-       break;
+        break;
     }
 
     offset = offset + 1 + ggsn_addr_len;
 
     if (gtp_version == 1) {
 
-       ggsn_addr_len = tvb_get_guint8(tvb, offset);
-       proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "GGSN 2 address length: %u", ggsn_addr_len);
-
-       switch (ggsn_addr_len) {
-       case 4:
-           addr_ipv4 = tvb_get_ipv4(tvb, offset + 1);
-           proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 4, "GGSN 2 address: %s", ip_to_str((guint8 *) & addr_ipv4));
-           break;
-       case 16:
-           tvb_get_ipv6(tvb, offset + 1, &addr_ipv6);
-           proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 16, "GGSN 2 address: %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
-           break;
-       default:
-           break;
-       }
-       offset = offset + 1 + ggsn_addr_len;
+        ggsn_addr_len = tvb_get_guint8(tvb, offset);
+        proto_tree_add_text(ext_tree_pdp, tvb, offset, 1, "GGSN 2 address length: %u", ggsn_addr_len);
+
+        switch (ggsn_addr_len) {
+        case 4:
+            addr_ipv4 = tvb_get_ipv4(tvb, offset + 1);
+            proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 4, "GGSN 2 address: %s", ip_to_str((guint8 *) & addr_ipv4));
+            break;
+        case 16:
+            tvb_get_ipv6(tvb, offset + 1, &addr_ipv6);
+            proto_tree_add_text(ext_tree_pdp, tvb, offset + 1, 16, "GGSN 2 address: %s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
+            break;
+        default:
+            break;
+        }
+        offset = offset + 1 + ggsn_addr_len;
 
     }
 
@@ -4265,8 +4604,8 @@ static int decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo
     return 3 + length;
 }
 
-/* GPRS:       9.60, v7.6.0, chapter 7.9.21
- * UMTS:       29.060, v4.0, chapter 7.7.30
+/* GPRS:        9.60, v7.6.0, chapter 7.9.21
+ * UMTS:        29.060, v4.0, chapter 7.7.30
  */
 static int decode_gtp_apn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4277,7 +4616,7 @@ static int decode_gtp_apn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, p
 
     length = tvb_get_ntohs(tvb, offset + 1);
 
-    te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str(GTP_EXT_APN, gtp_val, "Unknown field"));
+    te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str_ext_const(GTP_EXT_APN, &gtp_val_ext, "Unknown field"));
     ext_tree_apn = proto_item_add_subtree(te, ett_gtp_apn);
 
     proto_tree_add_text(ext_tree_apn, tvb, offset + 1, 2, "APN length : %u", length);
@@ -4286,82 +4625,42 @@ static int decode_gtp_apn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, p
     return 3 + length;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.22
- *             4.08 v. 7.1.2, chapter 10.5.6.3 (p.580)
- * UMTS:       29.060 v4.0, chapter 7.7.31
- *             24.008, v4.2, chapter 10.5.6.3
+/* GPRS:        9.60 v7.6.0, chapter 7.9.22
+ *              4.08 v. 7.1.2, chapter 10.5.6.3 (p.580)
+ * UMTS:        29.060 v4.0, chapter 7.7.31 Protocol Configuration Options
+ *              24.008, v4.2, chapter 10.5.6.3
  */
 int decode_gtp_proto_conf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
 {
 
-    guint16 length, proto_offset;
-    guint16 proto_id;
-    guint8 conf, proto_len, cnt = 1;
+    guint16 length;
     tvbuff_t *next_tvb;
     proto_tree *ext_tree_proto;
     proto_item *te;
-    gboolean save_writable;
 
     length = tvb_get_ntohs(tvb, offset + 1);
 
-    te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str(GTP_EXT_PROTO_CONF, gtp_val, "Unknown message"));
+    te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str_ext_const(GTP_EXT_PROTO_CONF, &gtp_val_ext, "Unknown message"));
     ext_tree_proto = proto_item_add_subtree(te, ett_gtp_proto);
 
     proto_tree_add_text(ext_tree_proto, tvb, offset + 1, 2, "Length: %u", length);
 
     if (length < 1)
-       return 3;
-
-    conf = tvb_get_guint8(tvb, offset + 3) & 0x07;
-    proto_tree_add_text(ext_tree_proto, tvb, offset + 3, 1, "Configuration protocol (00000xxx): %u", conf);
-
-    proto_offset = 1;          /* ... 1st byte is conf */
-    offset += 4;
-
-    for (;;) {
-       if (proto_offset >= length)
-           break;
-       proto_id = tvb_get_ntohs(tvb, offset);
-       proto_len = tvb_get_guint8(tvb, offset + 2);
-       proto_offset += proto_len + 3;  /* 3 = proto id + length byte */
-
-       if (proto_len > 0) {
-
-           proto_tree_add_text(ext_tree_proto, tvb, offset, 2, "Protocol %u ID: %s (0x%04x)",
-                               cnt, val_to_str(proto_id, ppp_vals, "Unknown"), proto_id);
-           proto_tree_add_text(ext_tree_proto, tvb, offset + 2, 1, "Protocol %u length: %u", cnt, proto_len);
-
-           /*
-            * Don't allow the dissector for the configuration
-            * protocol in question to update the columns - this
-            * is GTP, not PPP.
-            */
-           save_writable = col_get_writable(pinfo->cinfo);
-           col_set_writable(pinfo->cinfo, FALSE);
-
-           /*
-            * XXX - should we have our own dissector table,
-            * solely for configuration protocols, so that bogus
-            * values don't cause us to dissect the protocol
-            * data as, for example, IP?
-            */
-           next_tvb = tvb_new_subset(tvb, offset + 3, proto_len, proto_len);
-           if (!dissector_try_port(ppp_subdissector_table, proto_id, next_tvb, pinfo, ext_tree_proto)) {
-               call_dissector(data_handle, next_tvb, pinfo, ext_tree_proto);
-           }
-
-           col_set_writable(pinfo->cinfo, save_writable);
-       }
+        return 3;
 
-       offset += proto_len + 3;
-       cnt++;
-    }
+       /* The Protocol Configuration Options contains external network protocol options that may be necessary to transfer
+        * between the GGSN and the MS. The content and the coding of the Protocol Configuration are defined in octet 3-z of the
+        * Protocol Configuration Options in3GPP TS 24.008 [5].
+        */
+       next_tvb = tvb_new_subset(tvb, offset + 3, length, length);
+       pinfo->link_dir = P2P_DIR_UL;
+       de_sm_pco(next_tvb, ext_tree_proto, pinfo, 0, length, NULL, 0);
 
     return 3 + length;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.23
- * UMTS:       29.060 v4.0, chapter 7.7.32
+/* GPRS:        9.60 v7.6.0, chapter 7.9.23
+ * UMTS:        29.060 v4.0, chapter 7.7.32
  */
 static int decode_gtp_gsn_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4380,71 +4679,69 @@ static int decode_gtp_gsn_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _
 
     switch (length) {
     case 4:
-       proto_tree_add_text(ext_tree_gsn_addr, tvb, offset + 1, 2, "GSN address length : %u", length);
-       addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
-       proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
-       proto_tree_add_ipv4(ext_tree_gsn_addr, hf_gtp_gsn_ipv4, tvb, offset + 3, 4, addr_ipv4);
-       break;
+        proto_tree_add_text(ext_tree_gsn_addr, tvb, offset + 1, 2, "GSN address length : %u", length);
+        addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
+        proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
+        proto_tree_add_ipv4(ext_tree_gsn_addr, hf_gtp_gsn_ipv4, tvb, offset + 3, 4, addr_ipv4);
+        break;
     case 5:
-       proto_tree_add_text(ext_tree_gsn_addr, tvb, offset + 1, 2, "GSN address Information Element length : %u", length);
-       addr_type = tvb_get_guint8(tvb, offset + 3) & 0xC0;
-       proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_type, tvb, offset + 3, 1, addr_type);
-       addr_len = tvb_get_guint8(tvb, offset + 3) & 0x3F;
-       proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_len, tvb, offset + 3, 1, addr_len);
-       addr_ipv4 = tvb_get_ipv4(tvb, offset + 4);
-       proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
-       proto_tree_add_ipv4(ext_tree_gsn_addr, hf_gtp_gsn_ipv4, tvb, offset + 4, 4, addr_ipv4);
-       break;
+        proto_tree_add_text(ext_tree_gsn_addr, tvb, offset + 1, 2, "GSN address Information Element length : %u", length);
+        addr_type = tvb_get_guint8(tvb, offset + 3) & 0xC0;
+        proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_type, tvb, offset + 3, 1, addr_type);
+        addr_len = tvb_get_guint8(tvb, offset + 3) & 0x3F;
+        proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_len, tvb, offset + 3, 1, addr_len);
+        addr_ipv4 = tvb_get_ipv4(tvb, offset + 4);
+        proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
+        proto_tree_add_ipv4(ext_tree_gsn_addr, hf_gtp_gsn_ipv4, tvb, offset + 4, 4, addr_ipv4);
+        break;
     case 16:
-       proto_tree_add_text(ext_tree_gsn_addr, tvb, offset + 1, 2, "GSN address length : %u", length);
-       tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
-       proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
-       proto_tree_add_ipv6(ext_tree_gsn_addr, hf_gtp_gsn_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
-       break;
+        proto_tree_add_text(ext_tree_gsn_addr, tvb, offset + 1, 2, "GSN address length : %u", length);
+        tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
+        proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
+        proto_tree_add_ipv6(ext_tree_gsn_addr, hf_gtp_gsn_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
+        break;
     case 17:
-       proto_tree_add_text(ext_tree_gsn_addr, tvb, offset + 1, 2, "GSN address Information Element length : %u", length);
-       addr_type = tvb_get_guint8(tvb, offset + 3) & 0xC0;
-       proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_type, tvb, offset + 3, 1, addr_type);
-       addr_len = tvb_get_guint8(tvb, offset + 3) & 0x3F;
-       proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_len, tvb, offset + 3, 1, addr_len);
-       tvb_get_ipv6(tvb, offset + 4, &addr_ipv6);
-       proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
-       proto_tree_add_ipv6(ext_tree_gsn_addr, hf_gtp_gsn_ipv6, tvb, offset + 4, 16, (guint8 *) & addr_ipv6);
-       break;
+        proto_tree_add_text(ext_tree_gsn_addr, tvb, offset + 1, 2, "GSN address Information Element length : %u", length);
+        addr_type = tvb_get_guint8(tvb, offset + 3) & 0xC0;
+        proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_type, tvb, offset + 3, 1, addr_type);
+        addr_len = tvb_get_guint8(tvb, offset + 3) & 0x3F;
+        proto_tree_add_uint(ext_tree_gsn_addr, hf_gtp_gsn_addr_len, tvb, offset + 3, 1, addr_len);
+        tvb_get_ipv6(tvb, offset + 4, &addr_ipv6);
+        proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
+        proto_tree_add_ipv6(ext_tree_gsn_addr, hf_gtp_gsn_ipv6, tvb, offset + 4, 16, (guint8 *) & addr_ipv6);
+        break;
     default:
-       proto_item_append_text(te, "unknown type or wrong length");
-       break;
+        proto_item_append_text(te, "unknown type or wrong length");
+        break;
     }
 
     return 3 + length;
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.24
- * UMTS:       29.060 v4.0, chapter 7.7.33
+/* GPRS:        9.60 v7.6.0, chapter 7.9.24
+ * UMTS:        29.060 v4.0, chapter 7.7.33
  */
 static int decode_gtp_msisdn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
-    const guint8 *msisdn_val;
     gchar *msisdn_str;
     guint16 length;
 
     length = tvb_get_ntohs(tvb, offset + 1);
 
     if (length < 1)
-       return 3;
+        return 3;
 
-    msisdn_val = tvb_get_ptr(tvb, offset + 3, length);
-    msisdn_str = msisdn_to_str(msisdn_val, length);
+    msisdn_str = msisdn_to_str(tvb, offset + 3, length);
 
     proto_tree_add_string(tree, hf_gtp_msisdn, tvb, offset, 3 + length, msisdn_str);
 
     return 3 + length;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.34
- *             24.008 v4.2, chapter 10.5.6.5
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.34
+ *              24.008 v4.2, chapter 10.5.6.5
  */
 static int decode_gtp_qos_umts(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4452,8 +4749,8 @@ static int decode_gtp_qos_umts(tvbuff_t * tvb, int offset, packet_info * pinfo _
     return decode_qos_umts(tvb, offset, tree, "Quality of Service", 2);
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.35
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.35
  */
 static int decode_gtp_auth_qui(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4470,7 +4767,7 @@ static int decode_gtp_auth_qui(tvbuff_t * tvb, int offset, packet_info * pinfo _
     ext_tree = proto_item_add_subtree(te_quint, ett_gtp_quint);
     offset++;
 
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
 
     proto_tree_add_text(ext_tree, tvb, offset, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset, 16));
@@ -4489,21 +4786,19 @@ static int decode_gtp_auth_qui(tvbuff_t * tvb, int offset, packet_info * pinfo _
     offset++;
     proto_tree_add_text(ext_tree, tvb, offset, auth_len, "AUTH: %s", tvb_bytes_to_str(tvb, offset, auth_len));
 
-    offset = offset + auth_len;
-
     return (3 + length);
 
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.36
- *             24.008 v4.2, chapter 10.5.6.12
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.36
+ *              24.008 v4.2, chapter 10.5.6.12
  */
 static int decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
     guint16 length, port1, port2, tos;
-    guint8 tft_flags, tft_code, no_packet_filters, i, pf_id, pf_eval, pf_len, pf_content_id, proto, spare;
+    guint8 tft_flags, tft_code, no_packet_filters, i, pf_id, pf_eval, pf_len, pf_content_id, proto;
     guint pf_offset;
     guint32 mask_ipv4, addr_ipv4, ipsec_id, label;
     struct e_in6_addr addr_ipv6, mask_ipv6;
@@ -4517,7 +4812,6 @@ static int decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, p
 
     tft_flags = tvb_get_guint8(tvb, offset + 3);
     tft_code = (tft_flags >> 5) & 0x07;
-    spare = (tft_flags >> 4) & 0x01;
     no_packet_filters = tft_flags & 0x0F;
 
     proto_tree_add_text(ext_tree_tft, tvb, offset + 1, 2, "TFT length: %u", length);
@@ -4532,114 +4826,114 @@ static int decode_gtp_tft(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, p
 
     for (i = 0; i < no_packet_filters; i++) {
 
-       pf_id = tvb_get_guint8(tvb, offset);
-
-       tee = proto_tree_add_text(ext_tree_tft, tvb, offset, 1, "Packet filter id: %u", pf_id);
-       ext_tree_tft_pf = proto_item_add_subtree(tee, ett_gtp_tft_pf);
-       offset++;
-
-       if (tft_code != 2) {
-
-           pf_eval = tvb_get_guint8(tvb, offset);
-           pf_len = tvb_get_guint8(tvb, offset + 1);
-
-           proto_tree_add_uint(ext_tree_tft_pf, hf_gtp_tft_eval, tvb, offset, 1, pf_eval);
-           proto_tree_add_text(ext_tree_tft_pf, tvb, offset + 1, 1, "Content length: %u", pf_len);
-
-           offset = offset + 2;
-           pf_offset = 0;
-
-           while (pf_offset < pf_len) {
-
-               pf_content_id = tvb_get_guint8(tvb, offset + pf_offset);
-
-               switch (pf_content_id) {
-                   /* address IPv4 and mask = 8 bytes */
-               case 0x10:
-                   addr_ipv4 = tvb_get_ipv4(tvb, offset + pf_offset + 1);
-                   mask_ipv4 = tvb_get_ipv4(tvb, offset + pf_offset + 5);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 9, "ID 0x10: IPv4/mask: %s/%s", ip_to_str((guint8 *) & addr_ipv4),
-                                       ip_to_str((guint8 *) & mask_ipv4));
-                   pf_offset = pf_offset + 9;
-                   break;
-                   /* address IPv6 and mask = 32 bytes */
-               case 0x20:
-                   tvb_get_ipv6(tvb, offset + pf_offset + 1, &addr_ipv6);
-                   tvb_get_ipv6(tvb, offset + pf_offset + 17, &mask_ipv6);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 33, "ID 0x20: IPv6/mask: %s/%s",
-                                       ip6_to_str((struct e_in6_addr *) &addr_ipv6), ip6_to_str((struct e_in6_addr *) &mask_ipv6));
-                   pf_offset = pf_offset + 33;
-                   break;
-                   /* protocol identifier/next header type = 1 byte */
-               case 0x30:
-                   proto = tvb_get_guint8(tvb, offset + pf_offset + 1);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 2, "ID 0x30: IPv4 protocol identifier/IPv6 next header: %u (%x)",
-                                       proto, proto);
-                   pf_offset = pf_offset + 2;
-                   break;
-                   /* single destination port type = 2 bytes */
-               case 0x40:
-                   port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 3, "ID 0x40: destination port: %u", port1);
-                   pf_offset = pf_offset + 3;
-                   break;
-                   /* destination port range type = 4 bytes */
-               case 0x41:
-                   port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
-                   port2 = tvb_get_ntohs(tvb, offset + pf_offset + 3);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 5, "ID 0x41: destination port range: %u - %u", port1, port2);
-                   pf_offset = pf_offset + 5;
-                   break;
-                   /* single source port type = 2 bytes */
-               case 0x50:
-                   port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 3, "ID 0x50: source port: %u", port1);
-                   pf_offset = pf_offset + 3;
-                   break;
-                   /* source port range type = 4 bytes */
-               case 0x51:
-                   port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
-                   port2 = tvb_get_ntohs(tvb, offset + pf_offset + 3);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 5, "ID 0x51: source port range: %u - %u", port1, port2);
-                   pf_offset = pf_offset + 5;
-                   break;
-                   /* security parameter index type = 4 bytes */
-               case 0x60:
-                   ipsec_id = tvb_get_ntohl(tvb, offset + pf_offset + 1);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 5, "ID 0x60: security parameter index: %x", ipsec_id);
-                   pf_offset = pf_offset + 5;
-                   break;
-                   /* type of service/traffic class type = 2 bytes */
-               case 0x70:
-                   tos = tvb_get_ntohs(tvb, offset + pf_offset + 1);
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 2, "ID 0x70: Type of Service/Traffic Class: %u (%x)", tos, tos);
-                   pf_offset = pf_offset + 3;
-                   break;
-                   /* flow label type = 3 bytes */
-               case 0x80:
-                   label = tvb_get_ntoh24(tvb, offset + pf_offset + 1) & 0x0FFFFF;
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 4, "ID 0x80: Flow Label: %u (%x)", label, label);
-                   pf_offset = pf_offset + 4;
-                   break;
-
-               default:
-                   proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 1, "Unknown value: %x ", pf_content_id);
-                   pf_offset++;        /* to avoid infinite loop */
-                   break;
-               }
-           }
+        pf_id = tvb_get_guint8(tvb, offset);
+
+        tee = proto_tree_add_text(ext_tree_tft, tvb, offset, 1, "Packet filter id: %u", pf_id);
+        ext_tree_tft_pf = proto_item_add_subtree(tee, ett_gtp_tft_pf);
+        offset++;
+
+        if (tft_code != 2) {
+
+            pf_eval = tvb_get_guint8(tvb, offset);
+            pf_len = tvb_get_guint8(tvb, offset + 1);
+
+            proto_tree_add_uint(ext_tree_tft_pf, hf_gtp_tft_eval, tvb, offset, 1, pf_eval);
+            proto_tree_add_text(ext_tree_tft_pf, tvb, offset + 1, 1, "Content length: %u", pf_len);
+
+            offset = offset + 2;
+            pf_offset = 0;
+
+            while (pf_offset < pf_len) {
+
+                pf_content_id = tvb_get_guint8(tvb, offset + pf_offset);
+
+                switch (pf_content_id) {
+                    /* address IPv4 and mask = 8 bytes */
+                case 0x10:
+                    addr_ipv4 = tvb_get_ipv4(tvb, offset + pf_offset + 1);
+                    mask_ipv4 = tvb_get_ipv4(tvb, offset + pf_offset + 5);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 9, "ID 0x10: IPv4/mask: %s/%s", ip_to_str((guint8 *) & addr_ipv4),
+                                        ip_to_str((guint8 *) & mask_ipv4));
+                    pf_offset = pf_offset + 9;
+                    break;
+                    /* address IPv6 and mask = 32 bytes */
+                case 0x20:
+                    tvb_get_ipv6(tvb, offset + pf_offset + 1, &addr_ipv6);
+                    tvb_get_ipv6(tvb, offset + pf_offset + 17, &mask_ipv6);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 33, "ID 0x20: IPv6/mask: %s/%s",
+                                        ip6_to_str((struct e_in6_addr *) &addr_ipv6), ip6_to_str((struct e_in6_addr *) &mask_ipv6));
+                    pf_offset = pf_offset + 33;
+                    break;
+                    /* protocol identifier/next header type = 1 byte */
+                case 0x30:
+                    proto = tvb_get_guint8(tvb, offset + pf_offset + 1);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 2, "ID 0x30: IPv4 protocol identifier/IPv6 next header: %u (%x)",
+                                        proto, proto);
+                    pf_offset = pf_offset + 2;
+                    break;
+                    /* single destination port type = 2 bytes */
+                case 0x40:
+                    port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 3, "ID 0x40: destination port: %u", port1);
+                    pf_offset = pf_offset + 3;
+                    break;
+                    /* destination port range type = 4 bytes */
+                case 0x41:
+                    port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
+                    port2 = tvb_get_ntohs(tvb, offset + pf_offset + 3);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 5, "ID 0x41: destination port range: %u - %u", port1, port2);
+                    pf_offset = pf_offset + 5;
+                    break;
+                    /* single source port type = 2 bytes */
+                case 0x50:
+                    port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 3, "ID 0x50: source port: %u", port1);
+                    pf_offset = pf_offset + 3;
+                    break;
+                    /* source port range type = 4 bytes */
+                case 0x51:
+                    port1 = tvb_get_ntohs(tvb, offset + pf_offset + 1);
+                    port2 = tvb_get_ntohs(tvb, offset + pf_offset + 3);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 5, "ID 0x51: source port range: %u - %u", port1, port2);
+                    pf_offset = pf_offset + 5;
+                    break;
+                    /* security parameter index type = 4 bytes */
+                case 0x60:
+                    ipsec_id = tvb_get_ntohl(tvb, offset + pf_offset + 1);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 5, "ID 0x60: security parameter index: %x", ipsec_id);
+                    pf_offset = pf_offset + 5;
+                    break;
+                    /* type of service/traffic class type = 2 bytes */
+                case 0x70:
+                    tos = tvb_get_ntohs(tvb, offset + pf_offset + 1);
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 2, "ID 0x70: Type of Service/Traffic Class: %u (%x)", tos, tos);
+                    pf_offset = pf_offset + 3;
+                    break;
+                    /* flow label type = 3 bytes */
+                case 0x80:
+                    label = tvb_get_ntoh24(tvb, offset + pf_offset + 1) & 0x0FFFFF;
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 4, "ID 0x80: Flow Label: %u (%x)", label, label);
+                    pf_offset = pf_offset + 4;
+                    break;
+
+                default:
+                    proto_tree_add_text(ext_tree_tft_pf, tvb, offset + pf_offset, 1, "Unknown value: %x ", pf_content_id);
+                    pf_offset++;        /* to avoid infinite loop */
+                    break;
+                }
+            }
 
-           offset = offset + pf_offset;
-       }
+            offset = offset + pf_offset;
+        }
     }
 
     return 3 + length;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.37
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.37
  * Type = 138 (Decimal)
- *             25.413(RANAP) TargetID 
+ *              25.413(RANAP) TargetID
  */
 static int decode_gtp_target_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4656,8 +4950,13 @@ static int decode_gtp_target_id(tvbuff_t * tvb, int offset, packet_info * pinfo
     target_id_item = proto_tree_add_text(tree, tvb, offset, 3 + length, "Target Identification");
     ext_tree = proto_item_add_subtree(target_id_item, ett_gtp_target_id);
     offset = offset + 1;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
+    /* The Target Identification information element contains the identification of a target RNC. Octets 4-n shall be encoded
+     * as the "Target RNC-ID" part of the "Target ID" parameter in 3GPP TS 25.413 [7]. Therefore, the "Choice Target ID"
+     * that indicates "Target RNC-ID" (numerical value of 0x20) shall not be included in the "Target RNC-ID" value in octets
+     * 4-n.
+     */
     next_tvb = tvb_new_subset(tvb, offset, length, length);
     dissect_ranap_TargetRNC_ID(next_tvb, 0, &asn1_ctx, ext_tree, hf_gtp_targetRNC_ID);
 
@@ -4665,8 +4964,8 @@ static int decode_gtp_target_id(tvbuff_t * tvb, int offset, packet_info * pinfo
 }
 
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.38
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.38
  */
 static int decode_gtp_utran_cont(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4681,19 +4980,19 @@ static int decode_gtp_utran_cont(tvbuff_t * tvb, int offset, packet_info * pinfo
     utran_cont_item = proto_tree_add_text(tree, tvb, offset, 3 + length, "UTRAN transparent field");
     ext_tree = proto_item_add_subtree(utran_cont_item, ett_gtp_utran_cont);
     offset = offset + 1;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     next_tvb = tvb_new_subset(tvb, offset, length, length);
     if (data_handle)
-       call_dissector(data_handle, next_tvb, pinfo, ext_tree);
+        call_dissector(data_handle, next_tvb, pinfo, ext_tree);
 
     return 3 + length;
 
 }
 
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.39
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.39
  */
 static int decode_gtp_rab_setup(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4716,30 +5015,30 @@ static int decode_gtp_rab_setup(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     if (length > 1) {
 
-       teid = tvb_get_ntohl(tvb, offset + 4);
-
-       proto_tree_add_uint(ext_tree_rab_setup, hf_gtp_teid_data, tvb, offset + 4, 4, teid);
-
-       switch (length) {
-       case 12:
-           addr_ipv4 = tvb_get_ipv4(tvb, offset + 8);
-           proto_tree_add_ipv4(ext_tree_rab_setup, hf_gtp_rnc_ipv4, tvb, offset + 8, 4, addr_ipv4);
-           break;
-       case 24:
-           tvb_get_ipv6(tvb, offset + 8, &addr_ipv6);
-           proto_tree_add_ipv6(ext_tree_rab_setup, hf_gtp_rnc_ipv6, tvb, offset + 8, 16, (guint8 *) & addr_ipv6);
-           break;
-       default:
-           break;
-       }
+        teid = tvb_get_ntohl(tvb, offset + 4);
+
+        proto_tree_add_uint(ext_tree_rab_setup, hf_gtp_teid_data, tvb, offset + 4, 4, teid);
+
+        switch (length) {
+        case 12:
+            addr_ipv4 = tvb_get_ipv4(tvb, offset + 8);
+            proto_tree_add_ipv4(ext_tree_rab_setup, hf_gtp_rnc_ipv4, tvb, offset + 8, 4, addr_ipv4);
+            break;
+        case 24:
+            tvb_get_ipv6(tvb, offset + 8, &addr_ipv6);
+            proto_tree_add_ipv6(ext_tree_rab_setup, hf_gtp_rnc_ipv6, tvb, offset + 8, 16, (guint8 *) & addr_ipv6);
+            break;
+        default:
+            break;
+        }
     }
 
     return 3 + length;
 }
 
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.40
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.40
  */
 static int decode_gtp_hdr_list(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4751,24 +5050,24 @@ static int decode_gtp_hdr_list(tvbuff_t * tvb, int offset, packet_info * pinfo _
 
     length = tvb_get_guint8(tvb, offset + 1);
 
-    te = proto_tree_add_text(tree, tvb, offset, 2 + length, "%s", val_to_str(GTP_EXT_HDR_LIST, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 2 + length, "%s", val_to_str_ext_const(GTP_EXT_HDR_LIST, &gtp_val_ext, "Unknown"));
     ext_tree_hdr_list = proto_item_add_subtree(te, ett_gtp_hdr_list);
 
     proto_tree_add_text(ext_tree_hdr_list, tvb, offset + 1, 1, "Number of Extension Header Types in list (i.e., length) : %u", length);
 
     for (i = 0; i < length; i++) {
-       hdr = tvb_get_guint8(tvb, offset + 2 + i);
+        hdr = tvb_get_guint8(tvb, offset + 2 + i);
 
-       proto_tree_add_text(ext_tree_hdr_list, tvb, offset + 2 + i, 1, "No. %u --> Extension Header Type value : %s (%u)", i + 1,
-                           val_to_str(hdr, gtp_val, "Unknown Extension Header Type"), hdr);
+        proto_tree_add_text(ext_tree_hdr_list, tvb, offset + 2 + i, 1, "No. %u --> Extension Header Type value : %s (%u)", i + 1,
+                            val_to_str_ext_const(hdr, &gtp_val_ext, "Unknown Extension Header Type"), hdr);
     }
 
     return 2 + length;
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.41
- * TODO:       find TriggerID description
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.41
+ * TODO:        find TriggerID description
  */
 static int decode_gtp_trigger_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4777,15 +5076,15 @@ static int decode_gtp_trigger_id(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     length = tvb_get_ntohs(tvb, offset + 1);
 
-    proto_tree_add_text(tree, tvb, offset, 3 + length, "%s length : %u", val_to_str(GTP_EXT_TRIGGER_ID, gtp_val, "Unknown"), length);
+    proto_tree_add_text(tree, tvb, offset, 3 + length, "%s length : %u", val_to_str_ext_const(GTP_EXT_TRIGGER_ID, &gtp_val_ext, "Unknown"), length);
 
     return 3 + length;
 
 }
 
-/* GPRS:       not present
- * UMTS:       29.060 v4.0, chapter 7.7.42
- * TODO:       find OMC-ID description
+/* GPRS:        not present
+ * UMTS:        29.060 v4.0, chapter 7.7.42
+ * TODO:        find OMC-ID description
  */
 static int decode_gtp_omc_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4794,14 +5093,14 @@ static int decode_gtp_omc_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_
 
     length = tvb_get_ntohs(tvb, offset + 1);
 
-    proto_tree_add_text(tree, tvb, offset, 3 + length, "%s length : %u", val_to_str(GTP_EXT_OMC_ID, gtp_val, "Unknown"), length);
+    proto_tree_add_text(tree, tvb, offset, 3 + length, "%s length : %u", val_to_str_ext_const(GTP_EXT_OMC_ID, &gtp_val_ext, "Unknown"), length);
 
     return 3 + length;
 
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.25
- * UMTS:       29.060 v6.11.0, chapter 7.7.44 Charging Gateway Address
+/* GPRS:        9.60 v7.6.0, chapter 7.9.25
+ * UMTS:        29.060 v6.11.0, chapter 7.7.44 Charging Gateway Address
  */
 static int decode_gtp_chrg_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4814,32 +5113,35 @@ static int decode_gtp_chrg_addr(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     length = tvb_get_ntohs(tvb, offset + 1);
 
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str(GTP_EXT_CHRG_ADDR, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str_ext_const(GTP_EXT_CHRG_ADDR, &gtp_val_ext, "Unknown"));
     ext_tree_chrg_addr = proto_item_add_subtree(te, ett_gtp_chrg_addr);
 
-    proto_tree_add_text(ext_tree_chrg_addr, tvb, offset + 1, 2, "%s length : %u", val_to_str(GTP_EXT_CHRG_ADDR, gtp_val, "Unknown"), length);
+    proto_tree_add_text(ext_tree_chrg_addr, tvb, offset + 1, 2, "%s length : %u", val_to_str_ext_const(GTP_EXT_CHRG_ADDR, &gtp_val_ext, "Unknown"), length);
 
     switch (length) {
     case 4:
-       addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
-       proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
-       proto_tree_add_ipv4(ext_tree_chrg_addr, hf_gtp_chrg_ipv4, tvb, offset + 3, 4, addr_ipv4);
-       break;
+        addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
+        proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
+        proto_tree_add_ipv4(ext_tree_chrg_addr, hf_gtp_chrg_ipv4, tvb, offset + 3, 4, addr_ipv4);
+        break;
     case 16:
-       tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
-       proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
-       proto_tree_add_ipv6(ext_tree_chrg_addr, hf_gtp_chrg_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
-       break;
+        tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
+        proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
+        proto_tree_add_ipv6(ext_tree_chrg_addr, hf_gtp_chrg_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
+        break;
     default:
-       proto_item_append_text(te, "unknown type or wrong length");
-       break;
+        proto_item_append_text(te, "unknown type or wrong length");
+        break;
     }
 
     return 3 + length;
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.44 RAN Transparent Container
+/* GPRS:        ?
+ * UMTS:        29.060 V9.4.0, chapter 7.7.43 RAN Transparent Container
+ * The information in the value part of the RAN Transparent Container IE contains all information elements (starting with
+ * and including the BSSGP "PDU Type") in either of the RAN INFORMATION, RAN INFORMATION REQUEST,
+ * RAN INFORMATION ACK or RAN INFORMATION ERROR messages respectively as specified in 3GPP TS 48.018
  */
 static int decode_gtp_ran_tr_cont(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4847,23 +5149,28 @@ static int decode_gtp_ran_tr_cont(tvbuff_t * tvb, int offset, packet_info * pinf
     guint16 length;
     proto_tree *ext_tree;
     proto_item *te;
+    tvbuff_t    *next_tvb;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str(GTP_EXT_RAN_TR_CONT, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str_ext_const(GTP_EXT_RAN_TR_CONT, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_ran_tr_cont);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    /* TODO add decoding of data */
-    proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
+
+    next_tvb = tvb_new_subset(tvb, offset, length, length);
+    if (bssgp_handle){
+        col_set_fence(pinfo->cinfo, COL_INFO);
+        call_dissector(bssgp_handle, next_tvb, pinfo, ext_tree);
+    }
 
     return 3 + length;
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.45 PDP Context Prioritization
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.45 PDP Context Prioritization
  */
 static int decode_gtp_pdp_cont_prio(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4873,11 +5180,11 @@ static int decode_gtp_pdp_cont_prio(tvbuff_t * tvb, int offset, packet_info * pi
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str(GTP_EXT_PDP_CONT_PRIO, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str_ext_const(GTP_EXT_PDP_CONT_PRIO, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_pdp_cont_prio);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -4886,8 +5193,8 @@ static int decode_gtp_pdp_cont_prio(tvbuff_t * tvb, int offset, packet_info * pi
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.45A Additional RAB Setup Information
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.45A Additional RAB Setup Information
  */
 static int decode_gtp_add_rab_setup_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4897,11 +5204,11 @@ static int decode_gtp_add_rab_setup_inf(tvbuff_t * tvb, int offset, packet_info
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str(GTP_EXT_ADD_RAB_SETUP_INF, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str_ext_const(GTP_EXT_ADD_RAB_SETUP_INF, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_rab_setup_inf);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -4922,11 +5229,11 @@ static int decode_gtp_ssgn_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str(GTP_EXT_SSGN_NO, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str_ext_const(GTP_EXT_SSGN_NO, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_ssgn_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -4935,8 +5242,8 @@ static int decode_gtp_ssgn_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U
 
 }
 
-/* GPRS:       ?
- * UMTS:       3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.48 Common Flags
+/* GPRS:        ?
+ * UMTS:        3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.48 Common Flags
  */
 static int decode_gtp_common_flgs(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4946,33 +5253,33 @@ static int decode_gtp_common_flgs(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str(GTP_EXT_COMMON_FLGS, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str_ext_const(GTP_EXT_COMMON_FLGS, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_common_flgs);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* Upgrade QoS Supported */
-    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_upgrd_qos_sup, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_upgrd_qos_sup, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* NRSN bit field */
-    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_nrsn, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_nrsn, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* No QoS negotiation */
-    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_no_qos_neg, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_no_qos_neg, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* MBMS Counting Information bi */
-    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_cnt_inf, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_cnt_inf, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* RAN Procedures Ready */
-    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_ran_pcd_rdy, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_ran_pcd_rdy, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* MBMS Service Type */
-    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_srv_type, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_mbs_srv_type, tvb, offset, 1, ENC_BIG_ENDIAN);
     /* Prohibit Payload Compression */
-    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_ppc, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_cmn_flg_ppc, tvb, offset, 1, ENC_BIG_ENDIAN);
 
     return 3 + length;
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.49
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.49
  */
 static int decode_gtp_apn_res(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -4982,28 +5289,28 @@ static int decode_gtp_apn_res(tvbuff_t * tvb, int offset, packet_info * pinfo _U
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str(GTP_EXT_APN_RES, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s : ", val_to_str_ext_const(GTP_EXT_APN_RES, &gtp_val_ext, "Unknown"));
     ext_tree_apn_res = proto_item_add_subtree(te, ett_gtp_ext_tree_apn_res);
 
     offset++;
-    proto_tree_add_item(ext_tree_apn_res, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree_apn_res, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
 
     /* Restriction Type value */
     if (length != 1) {
-       proto_item *expert_item;
-       expert_item = proto_tree_add_text(tree, tvb, 0, length, "Wrong length indicated. Expected 1, got %u", length);
-       expert_add_info_format(pinfo, expert_item, PI_MALFORMED, PI_ERROR, "Wrong length indicated. Expected 1, got %u", length);
-       PROTO_ITEM_SET_GENERATED(expert_item);
-       return 3 + length;
+        proto_item *expert_item;
+        expert_item = proto_tree_add_text(tree, tvb, 0, length, "Wrong length indicated. Expected 1, got %u", length);
+        expert_add_info_format(pinfo, expert_item, PI_MALFORMED, PI_ERROR, "Wrong length indicated. Expected 1, got %u", length);
+        PROTO_ITEM_SET_GENERATED(expert_item);
+        return 3 + length;
     }
 
-    proto_tree_add_item(ext_tree_apn_res, hf_gtp_ext_apn_res, tvb, offset, length, FALSE);
+    proto_tree_add_item(ext_tree_apn_res, hf_gtp_ext_apn_res, tvb, offset, length, ENC_BIG_ENDIAN);
     return 3 + length;
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.50
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.50 RAT Type
  * RAT Type
  * Type = 151 (Decimal)
  */
@@ -5016,34 +5323,35 @@ static int decode_gtp_rat_type(tvbuff_t * tvb, int offset, packet_info * pinfo _
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_RAT_TYPE, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_RAT_TYPE, &gtp_val_ext, "Unknown"));
     ext_tree_rat_type = proto_item_add_subtree(te, ett_gtp_ext_rat_type);
 
     offset++;
-    proto_tree_add_item(ext_tree_rat_type, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree_rat_type, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
 
     /* RAT Type value */
     if (length != 1) {
-       proto_item *expert_item;
-       expert_item = proto_tree_add_text(tree, tvb, 0, length, "Wrong length indicated. Expected 1, got %u", length);
-       expert_add_info_format(pinfo, expert_item, PI_MALFORMED, PI_ERROR, "Wrong length indicated. Expected 1, got %u", length);
-       PROTO_ITEM_SET_GENERATED(expert_item);
-       return 3 + length;
+        proto_item *expert_item;
+        expert_item = proto_tree_add_text(tree, tvb, 0, length, "Wrong length indicated. Expected 1, got %u", length);
+        expert_add_info_format(pinfo, expert_item, PI_MALFORMED, PI_ERROR, "Wrong length indicated. Expected 1, got %u", length);
+        PROTO_ITEM_SET_GENERATED(expert_item);
+        return 3 + length;
     }
 
-   proto_tree_add_item(ext_tree_rat_type, hf_gtp_ext_rat_type, tvb, offset, length, FALSE);
+   proto_tree_add_item(ext_tree_rat_type, hf_gtp_ext_rat_type, tvb, offset, length, ENC_BIG_ENDIAN);
+   proto_item_append_text(te, ": %s", val_to_str_const(tvb_get_guint8(tvb,offset), gtp_ext_rat_type_vals, "Unknown"));
 
-    return 3 + length;
+   return 3 + length;
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.51 
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.51
  * User Location Information
  * Type = 152 (Decimal)
  */
 
-static const gchar *dissect_radius_user_loc(proto_tree * tree, tvbuff_t * tvb)
+static const gchar *dissect_radius_user_loc(proto_tree * tree, tvbuff_t * tvb, packet_info* pinfo)
 {
 
     int offset = 0;
@@ -5051,54 +5359,86 @@ static const gchar *dissect_radius_user_loc(proto_tree * tree, tvbuff_t * tvb)
     guint16 length = tvb_length(tvb);
 
     /* Geographic Location Type */
-    proto_tree_add_item(tree, hf_gtp_ext_geo_loc_type, tvb, offset, 1, FALSE);
+    proto_tree_add_item(tree, hf_gtp_ext_geo_loc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
     geo_loc_type = tvb_get_guint8(tvb, offset);
     offset++;
 
     if (geo_loc_type == 0)
-       /* Use gsm_a's function to dissect Geographic Location by faking disc ( last 0) */
-       be_cell_id_aux(tvb, tree, offset, length - 1, NULL, 0, 0);
+        /* Use gsm_a's function to dissect Geographic Location by faking disc ( last 0) */
+        be_cell_id_aux(tvb, tree, pinfo, offset, length - 1, NULL, 0, 0);
     if (geo_loc_type == 1) {
-       /* Use gsm_a's function to dissect Geographic Location by faking disc ( last 4) */
-       be_cell_id_aux(tvb, tree, offset, length - 1, NULL, 0, 4);
-       offset = offset + 5;
-       proto_tree_add_item(tree, hf_gtp_ext_sac, tvb, offset, 2, FALSE);
+        /* Use gsm_a's function to dissect Geographic Location by faking disc ( last 4) */
+        be_cell_id_aux(tvb, tree, pinfo, offset, length - 1, NULL, 0, 4);
+        offset = offset + 5;
+        proto_tree_add_item(tree, hf_gtp_ext_sac, tvb, offset, 2, ENC_BIG_ENDIAN);
     }
 
 
     return tvb_bytes_to_str(tvb, 0, length);
 }
 
-static int decode_gtp_usr_loc_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
+/*
+ * 7.7.51 User Location Information
+ */
+
+static int decode_gtp_usr_loc_inf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
 {
 
     guint16 length;
-    proto_tree *ext_tree;
-    proto_item *te;
+    proto_tree *ext_tree, *rai_tree;
+    proto_item *te, *fi;
     guint8 geo_loc_type;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_USR_LOC_INF, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_USR_LOC_INF, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_usr_loc_inf);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     /* Geographic Location Type */
-    proto_tree_add_item(ext_tree, hf_gtp_ext_geo_loc_type, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_geo_loc_type, tvb, offset, 1, ENC_BIG_ENDIAN);
     geo_loc_type = tvb_get_guint8(tvb, offset);
     offset++;
 
-    if (geo_loc_type == 0)
-       /* Use gsm_a's function to dissect Geographic Location by faking disc ( last 0) */
-       be_cell_id_aux(tvb, ext_tree, offset, length - 1, NULL, 0, 0);
-    if (geo_loc_type == 1) {
-       /* Use gsm_a's function to dissect Geographic Location by faking disc ( last 4) */
-       be_cell_id_aux(tvb, ext_tree, offset, length - 1, NULL, 0, 4);
-       offset = offset + 5;
-       proto_tree_add_item(ext_tree, hf_gtp_ext_sac, tvb, offset, 2, FALSE);
-    }
+       switch(geo_loc_type){
+               case 0:
+                       /* Geographic Location field included and it holds the Cell Global
+                        * Identification (CGI) of where the user currently is registered.
+                        * CGI is defined in sub-clause 4.3.1 of 3GPP TS 23.003 [2].
+                        */
+            /* Use gsm_a's function to dissect Geographic Location by faking disc ( last 0) */
+            be_cell_id_aux(tvb, ext_tree, pinfo, offset, length - 1, NULL, 0, 0);
+                       break;
+               case 1:
+                       /* Geographic Location field included and it holds the Service
+                        * Area Identity (SAI) of where the user currently is registered.
+                        * SAI is defined in sub-clause 9.2.3.9 of 3GPP TS 25.413 [7].
+                        */
+            /* Use gsm_a's function to dissect Geographic Location by faking disc ( last 4) */
+            be_cell_id_aux(tvb, ext_tree, pinfo, offset, length - 1, NULL, 0, 4);
+            offset = offset + 5;
+            proto_tree_add_item(ext_tree, hf_gtp_ext_sac, tvb, offset, 2, ENC_BIG_ENDIAN);
+                       break;
+               case 2:
+                       /* Geographic Location field included and it holds the Routing
+                        * Area Identification (RAI) of where the user currently is
+                        * registered. RAI is defined in sub-clause 4.2 of 3GPP TS 23.003
+                        * [2].
+                        */
+            fi = proto_tree_add_text(ext_tree, tvb, offset + 1, 7, "Routeing Area Identity (RAI)");
+            rai_tree = proto_item_add_subtree(fi, ett_gtp_uli_rai);
+
+                       dissect_e212_mcc_mnc(tvb, pinfo, rai_tree, offset, TRUE);
+            offset+=3;
+            proto_tree_add_item(rai_tree, hf_gtp_rai_lac, tvb, offset, 2, ENC_BIG_ENDIAN);
+            proto_tree_add_item(rai_tree, hf_gtp_rai_rac, tvb, offset, 2, ENC_BIG_ENDIAN);
+                       break;
+               default:
+                       proto_tree_add_text(tree, tvb, offset, length - 1, "Unknown Location type data");
+                       break;
+       }
 
     return 3 + length;
 
@@ -5112,12 +5452,12 @@ static const value_string daylight_saving_time_vals[] = {
     {0, NULL}
 };
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.52 
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.52
  * MS Time Zone
  * Type = 153 (Decimal)
- * The ' MS Time Zone' IE is used to indicate the offset between universal time and local time 
- * in steps of 15 minutes of where the MS currently resides. The 'Time Zone' field uses the same 
+ * The ' MS Time Zone' IE is used to indicate the offset between universal time and local time
+ * in steps of 15 minutes of where the MS currently resides. The 'Time Zone' field uses the same
  * format as the 'Time Zone' IE in 3GPP TS 24.008 (10.5.3.8)
  * its value shall be set as defined in 3GPP TS 22.042
  */
@@ -5131,18 +5471,18 @@ static int decode_gtp_ms_time_zone(tvbuff_t * tvb, int offset, packet_info * pin
     char sign;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s: ", val_to_str(GTP_EXT_MS_TIME_ZONE, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s: ", val_to_str_ext_const(GTP_EXT_MS_TIME_ZONE, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_ms_time_zone);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
 
     /* 3GPP TS 23.040 version 6.6.0 Release 6
      * 9.2.3.11 TP-Service-Centre-Time-Stamp (TP-SCTS)
      * :
-     * The Time Zone indicates the difference, expressed in quarters of an hour, 
-     * between the local time and GMT. In the first of the two semi-octets, 
+     * The Time Zone indicates the difference, expressed in quarters of an hour,
+     * between the local time and GMT. In the first of the two semi-octets,
      * the first bit (bit 3 of the seventh octet of the TP-Service-Centre-Time-Stamp field)
      * represents the algebraic sign of this difference (0: positive, 1: negative).
      */
@@ -5156,14 +5496,14 @@ static int decode_gtp_ms_time_zone(tvbuff_t * tvb, int offset, packet_info * pin
     offset++;
 
     data = tvb_get_guint8(tvb, offset) & 0x3;
-    proto_tree_add_text(ext_tree, tvb, offset, 1, "%s", val_to_str(data, daylight_saving_time_vals, "Unknown"));
+    proto_tree_add_text(ext_tree, tvb, offset, 1, "%s", val_to_str_const(data, daylight_saving_time_vals, "Unknown"));
 
     return 3 + length;
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.53
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.53
  * International Mobile Equipment Identity (and Software Version) (IMEI(SV))
  * Type = 154 (Decimal)
  */
@@ -5174,17 +5514,17 @@ static int decode_gtp_imeisv(tvbuff_t * tvb, int offset, packet_info * pinfo _U_
     proto_tree *ext_imeisv;
     proto_item *te;
     tvbuff_t *next_tvb;
-    char *digit_str;
+    const char *digit_str;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_IMEISV, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_IMEISV, &gtp_val_ext, "Unknown"));
     ext_imeisv = proto_item_add_subtree(te, ett_gtp_ext_imeisv);
 
     offset++;
-    proto_tree_add_item(ext_imeisv, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_imeisv, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
 
-    /* IMEI(SV) 
+    /* IMEI(SV)
      * The structure of the IMEI and IMEISV are defined in sub-clause 6.2 of 3GPP TS 23.003 [2].
      * The 'IMEI(SV)' field shall contain the IMEISV if it is available. If only the IMEI is available,
      * then the IMEI shall be placed in the IMEI(SV) field and the last semi-octet of octet 11 shall be
@@ -5193,13 +5533,13 @@ static int decode_gtp_imeisv(tvbuff_t * tvb, int offset, packet_info * pinfo _U_
     next_tvb = tvb_new_subset(tvb, offset, length, length);
     digit_str = unpack_digits(next_tvb, 0);
     proto_tree_add_string(ext_imeisv, hf_gtp_ext_imeisv, next_tvb, 0, -1, digit_str);
-       proto_item_append_text(te, ": %s", digit_str);
+    proto_item_append_text(te, ": %s", digit_str);
 
     return 3 + length;
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.54 
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.54
  * CAMEL Charging Information Container
  * Type = 155 (Decimal)
  */
@@ -5211,11 +5551,11 @@ static int decode_gtp_camel_chg_inf_con(tvbuff_t * tvb, int offset, packet_info
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_CAMEL_CHG_INF_CON, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_CAMEL_CHG_INF_CON, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_camel_chg_inf_con);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5224,8 +5564,8 @@ static int decode_gtp_camel_chg_inf_con(tvbuff_t * tvb, int offset, packet_info
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.55 
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.55
  * MBMS UE Context
  */
 static int decode_gtp_mbms_ue_ctx(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5236,11 +5576,11 @@ static int decode_gtp_mbms_ue_ctx(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MBMS_UE_CTX, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MBMS_UE_CTX, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_GTP_EXT_MBMS_UE_CTX);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5249,15 +5589,15 @@ static int decode_gtp_mbms_ue_ctx(tvbuff_t * tvb, int offset, packet_info * pinf
 
 }
 
-/* GPRS:       ?
- * UMTS:       3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.56
+/* GPRS:        ?
+ * UMTS:        3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.56
  * Temporary Mobile Group Identity (TMGI)
  * The Temporary Mobile Group Identity (TMGI) information element contains
  * a TMGI allocated by the BM-SC. It is coded as in the value part defined
  * in 3GPP T S 24.008 [5] (i.e. the IEI and octet length indicator are not included).
  */
 
-static int decode_gtp_tmgi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
+static int decode_gtp_tmgi(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree)
 {
 
     guint16 length;
@@ -5266,24 +5606,24 @@ static int decode_gtp_tmgi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
     tvbuff_t *next_tvb;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_TMGI, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_TMGI, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_tmgi);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
 
-    ti = proto_tree_add_item(ext_tree, hf_gtp_tmgi, tvb, offset, length, FALSE);
+    ti = proto_tree_add_item(ext_tree, hf_gtp_tmgi, tvb, offset, length, ENC_NA);
 
     tmgi_tree = proto_item_add_subtree(ti, ett_gtp_tmgi);
     next_tvb = tvb_new_subset(tvb, offset, length, length);
-    de_mid(next_tvb, tmgi_tree, 0, length, NULL, 0);
+    de_mid(next_tvb, tmgi_tree, pinfo, 0, length, NULL, 0);
     return 3 + length;
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.57
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.57
  * RIM Routing Address
  */
 static int decode_gtp_rim_ra(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5294,24 +5634,24 @@ static int decode_gtp_rim_ra(tvbuff_t * tvb, int offset, packet_info * pinfo _U_
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_RIM_RA, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_RIM_RA, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_rim_ra);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    /* TODO add decoding of data */
-    proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
-    /*  
+    /* To dissect the Address the Routing Address discriminator must be known */
+    /*
      * Octets 4-n are coded according to 3GPP TS 48.018 [20] 11.3.77 RIM Routing Information IE octets 4-n.
      */
+       proto_tree_add_item(ext_tree, hf_gtp_rim_routing_addr, tvb, offset, length, ENC_BIG_ENDIAN);
 
     return 3 + length;
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.58
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.58
  * MBMS Protocol Configuration Options
  */
 static int decode_gtp_mbms_prot_conf_opt(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5322,11 +5662,11 @@ static int decode_gtp_mbms_prot_conf_opt(tvbuff_t * tvb, int offset, packet_info
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MBMS_PROT_CONF_OPT, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MBMS_PROT_CONF_OPT, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_mbms_prot_conf_opt);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5335,8 +5675,8 @@ static int decode_gtp_mbms_prot_conf_opt(tvbuff_t * tvb, int offset, packet_info
 
 }
 
-/* GPRS:       ?
- * UMTS:       3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.59
+/* GPRS:        ?
+ * UMTS:        3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.59
  * MBMS Session Duration
  */
 /* Used for Diameter */
@@ -5345,8 +5685,8 @@ static int dissect_gtp_mbms_ses_dur(tvbuff_t * tvb _U_, packet_info * pinfo _U_,
 
     int offset = 0;
 
-    proto_tree_add_item(tree, hf_gtp_mbms_ses_dur_days, tvb, offset, 1, FALSE);
-    proto_tree_add_item(tree, hf_gtp_mbms_ses_dur_s, tvb, offset, 3, FALSE);
+    proto_tree_add_item(tree, hf_gtp_mbms_ses_dur_days, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(tree, hf_gtp_mbms_ses_dur_s, tvb, offset, 3, ENC_BIG_ENDIAN);
 
     return 3;
 
@@ -5360,11 +5700,11 @@ static int decode_gtp_mbms_ses_dur(tvbuff_t * tvb, int offset, packet_info * pin
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MBMS_SES_DUR, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MBMS_SES_DUR, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_bms_ses_dur);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* The MBMS Session Duration is defined in 3GPP TS 23.246 [26].
      * The MBMS Session Duration information element indicates the estimated
@@ -5380,39 +5720,30 @@ static int decode_gtp_mbms_ses_dur(tvbuff_t * tvb, int offset, packet_info * pin
      * for which the maximum allowed value is 18 days. For the whole session duration the seconds
      * and days are added together and the maximum session duration is 19 days.
      */
-    proto_tree_add_item(ext_tree, hf_gtp_mbms_ses_dur_days, tvb, offset, 1, FALSE);
-    proto_tree_add_item(ext_tree, hf_gtp_mbms_ses_dur_s, tvb, offset, 3, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_mbms_ses_dur_days, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ext_tree, hf_gtp_mbms_ses_dur_s, tvb, offset, 3, ENC_BIG_ENDIAN);
 
     return 3 + length;
 
 }
 
-/* GPRS:       ?
- * UMTS:       3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.60
+/* GPRS:        ?
+ * UMTS:        3GPP TS 29.060 version 7.8.0 Release 7, chapter 7.7.60
  * MBMS Service Area
  */
-static int decode_gtp_mbms_sa(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
-{
+static int
+dissect_gtp_3gpp_mbms_service_area(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
 
-    guint16 length;
-    proto_tree *ext_tree;
-    proto_item *te, *item;
+    int offset = 0;
     guint8 no_of_mbms_sa_codes;
     int i;
 
-    length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MBMS_SA, gtp_val, "Unknown"));
-    ext_tree = proto_item_add_subtree(te, ett_gtp_ext_mbms_sa);
-
-    offset++;
-    item = proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
-    offset = offset + 2;
     /* The MBMS Service Area is defined in 3GPP TS 23.246 [26].
      * The MBMS Service Area information element indicates the area over
      * which the Multimedia Broadcast/Multicast Service is to be distributed.
      * The payload shall be encoded as per the MBMS-Service-Area AVP defined
      * in 3GPP TS 29.061 [27], excluding the AVP Header fields (as defined in
-     * IETF RFC 3588 [36], section 4.1). 
+     * IETF RFC 3588 [36], section 4.1).
      */
     /* Number N of MBMS service area codes coded as:
      * 1 binary value is '00000000'
@@ -5420,27 +5751,44 @@ static int decode_gtp_mbms_sa(tvbuff_t * tvb, int offset, packet_info * pinfo _U
      * 256 binary value is '11111111'
      */
     no_of_mbms_sa_codes = tvb_get_guint8(tvb, offset) + 1;
-    if (length != ((no_of_mbms_sa_codes << 1) + 1)) {
-       expert_add_info_format(pinfo, item, PI_RESPONSE_CODE, PI_WARN,
-                              "Wrong length: %u. The length of an MBMS service area code is 2 octets", length);
-    }
-    proto_tree_add_uint(ext_tree, hf_gtp_no_of_mbms_sa_codes, tvb, offset, 1, no_of_mbms_sa_codes);
+    proto_tree_add_uint(tree, hf_gtp_no_of_mbms_sa_codes, tvb, offset, 1, no_of_mbms_sa_codes);
     offset++;
-    /* A consecutive list of N MBMS service area codes 
+    /* A consecutive list of N MBMS service area codes
      * The MBMS Service Area Identity and its semantics are defined in 3GPP TS 23.003
      * The length of an MBMS service area code is 2 octets.
      */
     for (i = 0; i < no_of_mbms_sa_codes; i++) {
-       proto_tree_add_item(ext_tree, hf_gtp_mbms_sa_code, tvb, offset, 2, FALSE);
-       offset = offset + 2;
+        proto_tree_add_item(tree, hf_gtp_mbms_sa_code, tvb, offset, 2, ENC_BIG_ENDIAN);
+        offset = offset + 2;
     }
 
+    return offset;
+}
+
+static int decode_gtp_mbms_sa(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
+{
+
+    tvbuff_t *next_tvb;
+    guint16 length;
+    proto_tree *ext_tree;
+    proto_item *te;
+
+    length = tvb_get_ntohs(tvb, offset + 1);
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MBMS_SA, &gtp_val_ext, "Unknown"));
+    ext_tree = proto_item_add_subtree(te, ett_gtp_ext_mbms_sa);
+
+    offset++;
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset = offset + 2;
+    next_tvb = tvb_new_subset(tvb, offset, length-3, length-3);
+    dissect_gtp_3gpp_mbms_service_area(next_tvb, pinfo,ext_tree);
+
     return 3 + length;
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.61
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.61
  * Source RNC PDCP context info
  */
 static int decode_gtp_src_rnc_pdp_ctx_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5451,11 +5799,11 @@ static int decode_gtp_src_rnc_pdp_ctx_inf(tvbuff_t * tvb, int offset, packet_inf
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_SRC_RNC_PDP_CTX_INF, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_SRC_RNC_PDP_CTX_INF, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_src_rnc_pdp_ctx_inf);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5464,8 +5812,8 @@ static int decode_gtp_src_rnc_pdp_ctx_inf(tvbuff_t * tvb, int offset, packet_inf
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.62 
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.62
  * Additional Trace Info
  */
 static int decode_gtp_add_trs_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5476,11 +5824,11 @@ static int decode_gtp_add_trs_inf(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_ADD_TRS_INF, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_ADD_TRS_INF, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_add_trs_inf);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5489,8 +5837,8 @@ static int decode_gtp_add_trs_inf(tvbuff_t * tvb, int offset, packet_info * pinf
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.63 
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.63
  * Hop Counter
  */
 static int decode_gtp_hop_count(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5501,11 +5849,11 @@ static int decode_gtp_hop_count(tvbuff_t * tvb, int offset, packet_info * pinfo
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_HOP_COUNT, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_HOP_COUNT, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_hop_count);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5514,8 +5862,8 @@ static int decode_gtp_hop_count(tvbuff_t * tvb, int offset, packet_info * pinfo
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.64 
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.64
  * Selected PLMN ID
  */
 static int decode_gtp_sel_plmn_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5526,11 +5874,11 @@ static int decode_gtp_sel_plmn_id(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_SEL_PLMN_ID, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_SEL_PLMN_ID, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_sel_plmn_id);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5539,8 +5887,8 @@ static int decode_gtp_sel_plmn_id(tvbuff_t * tvb, int offset, packet_info * pinf
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.65
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.65
  * MBMS Session Identifier
  */
 static int decode_gtp_mbms_ses_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5551,11 +5899,11 @@ static int decode_gtp_mbms_ses_id(tvbuff_t * tvb, int offset, packet_info * pinf
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MBMS_SES_ID, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MBMS_SES_ID, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_mbms_ses_id);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5564,8 +5912,8 @@ static int decode_gtp_mbms_ses_id(tvbuff_t * tvb, int offset, packet_info * pinf
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.66
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.66
  * MBMS 2G/3G Indicator
  */
 static const value_string gtp_mbs_2g_3g_ind_vals[] = {
@@ -5583,21 +5931,21 @@ static int decode_gtp_mbms_2g_3g_ind(tvbuff_t * tvb, int offset, packet_info * p
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MBMS_2G_3G_IND, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MBMS_2G_3G_IND, &gtp_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_mbms_2g_3g_ind);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* MBMS 2G/3G Indicator */
-    proto_tree_add_item(ext_tree, hf_gtp_mbs_2g_3g_ind, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_mbs_2g_3g_ind, tvb, offset, 1, ENC_BIG_ENDIAN);
 
     return 3 + length;
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.67
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.67
  * Enhanced NSAPI
  */
 static int decode_gtp_enh_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5608,11 +5956,11 @@ static int decode_gtp_enh_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_ENH_NSAPI, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_ENH_NSAPI, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_enh_nsapi);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5621,8 +5969,8 @@ static int decode_gtp_enh_nsapi(tvbuff_t * tvb, int offset, packet_info * pinfo
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.68
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.68
  * Additional MBMS Trace Info
  */
 static int decode_gtp_add_mbms_trs_inf(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5633,11 +5981,11 @@ static int decode_gtp_add_mbms_trs_inf(tvbuff_t * tvb, int offset, packet_info *
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_ADD_MBMS_TRS_INF, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_ADD_MBMS_TRS_INF, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_ad_mbms_trs_inf);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5646,8 +5994,8 @@ static int decode_gtp_add_mbms_trs_inf(tvbuff_t * tvb, int offset, packet_info *
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.69
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.69
  * MBMS Session Identity Repetition Number
  */
 static int decode_gtp_mbms_ses_id_rep_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -5658,11 +6006,11 @@ static int decode_gtp_mbms_ses_id_rep_no(tvbuff_t * tvb, int offset, packet_info
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MBMS_SES_ID_REP_NO, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MBMS_SES_ID_REP_NO, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_mbms_ses_id_rep_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5671,8 +6019,8 @@ static int decode_gtp_mbms_ses_id_rep_no(tvbuff_t * tvb, int offset, packet_info
 
 }
 
-/* GPRS:       ?
- * UMTS:       3GPP TS 29.060 version 7.8.0 Release 7
+/* GPRS:        ?
+ * UMTS:        3GPP TS 29.060 version 7.8.0 Release 7
  * MBMS Time To Data Transfer
  */
 /* Used for Diameter */
@@ -5698,18 +6046,18 @@ static int decode_gtp_mbms_time_to_data_tr(tvbuff_t * tvb, int offset, packet_in
     guint8 time_2_dta_tr;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MBMS_TIME_TO_DATA_TR, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MBMS_TIME_TO_DATA_TR, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_mbms_time_to_data_tr);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    /* TODO add decoding of data 
+    /* TODO add decoding of data
      * The MBMS Time To Data Transfer is defined in 3GPP TS 23.246 [26].
-     * The MBMS Time To Data Transfer information element contains a 
-     * MBMS Time To Data Transfer allocated by the BM-SC. 
-     * The payload shall be encoded as per the MBMS-Time-To-Data-Transfer AVP 
-     * defined in 3GPP TS 29.061 [27], excluding the AVP Header fields 
+     * The MBMS Time To Data Transfer information element contains a
+     * MBMS Time To Data Transfer allocated by the BM-SC.
+     * The payload shall be encoded as per the MBMS-Time-To-Data-Transfer AVP
+     * defined in 3GPP TS 29.061 [27], excluding the AVP Header fields
      * (as defined in IETF RFC 3588 [36], section 4.1).
      */
     /* The coding is specified as per the Time to MBMS Data Transfer Value Part Coding
@@ -5729,11 +6077,11 @@ static int decode_gtp_mbms_time_to_data_tr(tvbuff_t * tvb, int offset, packet_in
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.71
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.71
  * PS Handover Request Context
  */
-static int 
+static int
 decode_gtp_ps_ho_req_ctx(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
@@ -5742,11 +6090,11 @@ decode_gtp_ps_ho_req_ctx(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_PS_HO_REQ_CTX, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_PS_HO_REQ_CTX, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_ps_ho_req_ctx);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5755,11 +6103,11 @@ decode_gtp_ps_ho_req_ctx(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.72
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.72
  * BSS Container
  */
-static int 
+static int
 decode_gtp_bss_cont(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
@@ -5768,11 +6116,11 @@ decode_gtp_bss_cont(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_t
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_BSS_CONT, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_BSS_CONT, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_bss_cont);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5784,11 +6132,11 @@ decode_gtp_bss_cont(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_t
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.73
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.73
  * Cell Identification
  */
-static int 
+static int
 decode_gtp_cell_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
@@ -5797,11 +6145,11 @@ decode_gtp_cell_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tr
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_CELL_ID, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_CELL_ID, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_cell_id);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5817,11 +6165,11 @@ decode_gtp_cell_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tr
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.74
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.74
  * PDU Numbers
  */
-static int 
+static int
 decode_gtp_pdu_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
@@ -5830,11 +6178,11 @@ decode_gtp_pdu_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tre
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_PDU_NO, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_PDU_NO, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_pdu_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5843,11 +6191,11 @@ decode_gtp_pdu_no(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tre
 
 }
 
-/* GPRS:       ?
- * UMTS:       29.060 v6.11.0, chapter 7.7.75
+/* GPRS:        ?
+ * UMTS:        29.060 v6.11.0, chapter 7.7.75
  * BSSGP Cause
  */
-static int 
+static int
 decode_gtp_bssgp_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
@@ -5856,26 +6204,26 @@ decode_gtp_bssgp_cause(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, prot
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_BSSGP_CAUSE, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_BSSGP_CAUSE, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_bssgp_cause);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
 
-    /*      
+    /*
      * The BSSGP Cause information element contains the cause as defined in 3GPP TS 48.018
      */
-    proto_tree_add_item(ext_tree, hf_gtp_bssgp_cause, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_bssgp_cause, tvb, offset, 2, ENC_BIG_ENDIAN);
 
     return 3 + length;
 
 }
 
 /*
- * Required MBMS bearer capabilities   7.7.76
+ * Required MBMS bearer capabilities    7.7.76
  */
-static int 
+static int
 decode_gtp_mbms_bearer_cap(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
     guint16 length;
@@ -5883,24 +6231,34 @@ decode_gtp_mbms_bearer_cap(tvbuff_t * tvb, int offset, packet_info * pinfo _U_,
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_BSSGP_CAUSE, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_BSSGP_CAUSE, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_bssgp_cause);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
+#if 0 /* Fix Dead Store Warning */
     offset = offset + 2;
-    /* The payload shall be encoded as per the 
+#endif
+    /* The payload shall be encoded as per the
      * Required-MBMS-Bearer-Capabilities AVP defined in 3GPP TS 29.061 [27],
      * excluding the AVP Header fields (as defined in IETF RFC 3588 [36], section 4.1).
      */
     /* TODO Add decoding (call Diameter dissector???) */
-       return 3 + length;
+        return 3 + length;
 }
 
 /*
- * RIM Routing Address Discriminator   7.7.77
+ * RIM Routing Address Discriminator    7.7.77
  */
-static int 
+
+static const value_string gtp_bssgp_ra_discriminator_vals[] = {
+    { 0, "A Cell Identifier is used to identify a GERAN cell" },
+    { 1, "A Global RNC-ID is used to identify a UTRAN RNC" },
+    { 2, "An eNB identifier is used to identify an E-UTRAN eNodeB or HeNB" },
+    { 0, NULL },
+};
+
+static int
 decode_gtp_rim_ra_disc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
@@ -5909,22 +6267,25 @@ decode_gtp_rim_ra_disc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, prot
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_RIM_ROUTING_ADDR_DISC, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_RIM_ROUTING_ADDR_DISC, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_pdu_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    /* TODO add decoding of data */
-    proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
+    /* Octet 4 bits 4 - 1 is coded according to 3GPP TS 48.018 [20]
+     * RIM Routing Information IE octet 3 bits 4 - 1.
+     * Bits 8 - 5 are coded "0000".
+     */
+    proto_tree_add_item(ext_tree, hf_gtp_bssgp_ra_discriminator, tvb, offset, 1, ENC_BIG_ENDIAN);
 
     return 3 + length;
 
 }
 /*
- * List of set-up PFCs 7.7.78
+ * List of set-up PFCs  7.7.78
  */
-static int 
+static int
 decode_gtp_lst_set_up_pfc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
@@ -5933,11 +6294,11 @@ decode_gtp_lst_set_up_pfc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, p
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_LIST_OF_SETUP_PFCS, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_LIST_OF_SETUP_PFCS, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_pdu_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -5946,7 +6307,7 @@ decode_gtp_lst_set_up_pfc(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, p
 
 }
 /*
- * PS Handover XID Parameters  7.7.79
+ * PS Handover XID Parameters   7.7.79
  */
 static int decode_gtp_ps_handover_xid(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -5959,11 +6320,11 @@ static int decode_gtp_ps_handover_xid(tvbuff_t * tvb, int offset, packet_info *
     guint8 xid_par_len;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_PS_HANDOVER_XIP_PAR, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_PS_HANDOVER_XIP_PAR, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_ps_handover_xid);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
 
     sapi = tvb_get_guint8(tvb, offset) & 0x0F;
@@ -5975,17 +6336,17 @@ static int decode_gtp_ps_handover_xid(tvbuff_t * tvb, int offset, packet_info *
     offset++;
 
     if (sndcpxid_handle) {
-       next_tvb = tvb_new_subset_remaining(tvb, offset);
-       call_dissector(sndcpxid_handle, next_tvb, pinfo, tree);
+        next_tvb = tvb_new_subset_remaining(tvb, offset);
+        call_dissector(sndcpxid_handle, next_tvb, pinfo, tree);
     } else
-       proto_tree_add_text(tree, tvb, offset, 0, "Data");
+        proto_tree_add_text(tree, tvb, offset, 0, "Data");
 
     return 4 + length;
 
 }
 
 /*
- * MS Info Change Reporting Action     7.7.80
+ * MS Info Change Reporting Action      7.7.80
  */
 static int decode_gtp_ms_inf_chg_rep_act(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -5995,11 +6356,11 @@ static int decode_gtp_ms_inf_chg_rep_act(tvbuff_t * tvb, int offset, packet_info
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_MS_INF_CHG_REP_ACT, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_MS_INF_CHG_REP_ACT, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_pdu_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -6008,7 +6369,7 @@ static int decode_gtp_ms_inf_chg_rep_act(tvbuff_t * tvb, int offset, packet_info
 
 }
 /*
- * Direct Tunnel Flags 7.7.81
+ * Direct Tunnel Flags  7.7.81
  */
 static int decode_gtp_direct_tnl_flg(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -6018,24 +6379,25 @@ static int decode_gtp_direct_tnl_flg(tvbuff_t * tvb, int offset, packet_info * p
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_DIRECT_TUNNEL_FLGS, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_DIRECT_TUNNEL_FLGS, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_pdu_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
-    proto_tree_add_item(ext_tree, hf_gtp_ext_ei, tvb, offset, 1, FALSE);
-    proto_tree_add_item(ext_tree, hf_gtp_ext_gcsi, tvb, offset, 1, FALSE);
-    proto_tree_add_item(ext_tree, hf_gtp_ext_dti, tvb, offset, 1, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_ei, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_gcsi, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_dti, tvb, offset, 1, ENC_BIG_ENDIAN);
+#if 0 /* Fix Dead Store Warning */
     offset++;
-
+#endif
     return 3 + length;
 
 }
 /*
- * Correlation-ID      7.7.82
+ * Correlation-ID       7.7.82
  */
 static int decode_gtp_corrl_id(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -6045,11 +6407,11 @@ static int decode_gtp_corrl_id(tvbuff_t * tvb, int offset, packet_info * pinfo _
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_CORRELATION_ID, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_CORRELATION_ID, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_pdu_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     /* TODO add decoding of data */
     proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
@@ -6058,8 +6420,15 @@ static int decode_gtp_corrl_id(tvbuff_t * tvb, int offset, packet_info * pinfo _
 
 }
 /*
- * Bearer Control Mode 7.7.83
+ * Bearer Control Mode  7.7.83
+ * version 10.0.0
  */
+static const value_string gtp_pdp_bcm_type_vals[] = {
+    {0, "MS_only"},
+    {1, "MS/NW"},
+    {0, NULL}
+};
+
 static int decode_gtp_bearer_cntrl_mod(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
@@ -6068,20 +6437,79 @@ static int decode_gtp_bearer_cntrl_mod(tvbuff_t * tvb, int offset, packet_info *
     proto_item *te;
 
     length = tvb_get_ntohs(tvb, offset + 1);
-    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str(GTP_EXT_BEARER_CONTROL_MODE, gtp_val, "Unknown"));
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_BEARER_CONTROL_MODE, &gtpv1_val_ext, "Unknown"));
+    ext_tree = proto_item_add_subtree(te, ett_gtp_bcm);
+
+    offset++;
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
+    offset = offset + 2;
+
+    proto_tree_add_item(ext_tree, hf_gtp_bcm, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+    return 3 + length;
+
+}
+
+/*
+ * 7.7.84 MBMS Flow Identifier
+ * 7.7.85 MBMS IP Multicast Distribution
+ * 7.7.86 MBMS Distribution Acknowledgement
+ * 7.7.87 Reliable INTER RAT HANDOVER INFO
+ * 7.7.88 RFSP Index
+ * 7.7.89 PDP Type
+ * 7.7.90 Fully Qualified Domain Name (FQDN)
+ */
+/*
+ * 7.7.91 Evolved Allocation/Retention Priority I
+ */
+static int decode_gtp_evolved_allc_rtn_p1(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
+{
+
+    guint16 length;
+    proto_tree *ext_tree;
+    proto_item *te;
+
+    length = tvb_get_ntohs(tvb, offset + 1);
+    te = proto_tree_add_text(tree, tvb, offset, 3 + length, "%s", val_to_str_ext_const(GTP_EXT_EVO_ALLO_RETE_P1, &gtpv1_val_ext, "Unknown"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext_pdu_no);
 
     offset++;
-    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
-    /* TODO add decoding of data */
-    proto_tree_add_text(ext_tree, tvb, offset, length, "Data not decoded yet");
+
+    proto_tree_add_item(ext_tree, hf_gtp_earp_pvi, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ext_tree, hf_gtp_earp_pl, tvb, offset, 1, ENC_BIG_ENDIAN);
+    proto_tree_add_item(ext_tree, hf_gtp_earp_pci, tvb, offset, 1, ENC_BIG_ENDIAN);
 
     return 3 + length;
 
+
 }
-/* GPRS:       12.15
- * UMTS:       33.015
+
+/*
+ * 7.7.92 Evolved Allocation/Retention Priority II
+ * 7.7.93 Extended Common Flags
+ * 7.7.94 User CSG Information (UCI)
+ * 7.7.95 CSG Information Reporting Action
+ * 7.7.96 CSG ID
+ * 7.7.97 CSG Membership Indication (CMI)
+ * 7.7.98 APN Aggregate Maximum Bit Rate (APN-AMBR)
+ * 7.7.99 UE Network Capability
+ * 7.7.100 UE-AMBR
+ * 7.7.101 APN-AMBR with NSAPI
+ * 7.7.102 GGSN Back-Off Time
+ * 7.7.103 Signalling Priority Indication
+ * 7.7.104 Signalling Priority Indication with NSAPI
+ * 7.7.105 Higher bitrates than 16 Mbps flag
+ * 7.7.106 Max MBR/APN-AMBR
+ * 7.7.107 Additional MM context for SRVCC
+ * 7.7.108 Additional flags for SRVCC
+ * 7.7.109 STN-SR
+ * 7.7.110 C-MSISDN
+ * 7.7.111 Extended RANAP Cause
+ */
+/* GPRS:        12.15
+ * UMTS:        33.015
  */
 static int decode_gtp_rel_pack(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -6099,17 +6527,17 @@ static int decode_gtp_rel_pack(tvbuff_t * tvb, int offset, packet_info * pinfo _
 
     while (n < length) {
 
-       number = tvb_get_ntohs(tvb, offset + 3 + n);
-       proto_tree_add_text(ext_tree_rel_pack, tvb, offset + 3 + n, 2, "%u", number);
-       n = n + 2;
+        number = tvb_get_ntohs(tvb, offset + 3 + n);
+        proto_tree_add_text(ext_tree_rel_pack, tvb, offset + 3 + n, 2, "%u", number);
+        n = n + 2;
 
     }
 
     return 3 + length;
 }
 
-/* GPRS:       12.15
- * UMTS:       33.015
+/* GPRS:        12.15
+ * UMTS:        33.015
  */
 static int decode_gtp_can_pack(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -6127,48 +6555,119 @@ static int decode_gtp_can_pack(tvbuff_t * tvb, int offset, packet_info * pinfo _
 
     while (n < length) {
 
-       number = tvb_get_ntohs(tvb, offset + 3 + n);
-       proto_tree_add_text(ext_tree_can_pack, tvb, offset + 3 + n, 2, "%u", number);
-       n = n + 2;
+        number = tvb_get_ntohs(tvb, offset + 3 + n);
+        proto_tree_add_text(ext_tree_can_pack, tvb, offset + 3 + n, 2, "%u", number);
+        n = n + 2;
     }
 
     return 3 + length;
 }
 
-/* CDRs dissector */
+/* CDRs dissector
+ * 3GPP TS 32.295 version 9.0.0 Release 9
+ */
+
+
+static const value_string gtp_cdr_fmt_vals[] = {
+    {1, "Basic Encoding Rules (BER)"},
+    {2, "Unaligned basic Packed Encoding Rules (PER)"},
+    {3, "Aligned basic Packed Encoding Rules (PER)"},
+    {0, NULL}
+};
 static int decode_gtp_data_req(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
 
-    guint16 length, format_ver;
-    guint8 no, format;
-    proto_tree *ext_tree;
-    proto_item *te;
+    guint16 length, cdr_length;
+    guint8 no, format, app_id, rel_id, ver_id, i;
+    proto_tree *ext_tree, *ver_tree, *cdr_dr_tree;
+    proto_item *te, *fmt_item, *ver_item;
     tvbuff_t *next_tvb;
 
-    te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(GTP_EXT_DATA_REQ, gtp_val, "Unknown message"));
+    te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str_ext_const(GTP_EXT_DATA_REQ, &gtp_val_ext, "Unknown message"));
     ext_tree = proto_item_add_subtree(te, ett_gtp_ext);
+    offset++;
 
-    length = tvb_get_ntohs(tvb, offset + 1);
-    no = tvb_get_guint8(tvb, offset + 3);
-    format = tvb_get_guint8(tvb, offset + 4);
-    format_ver = tvb_get_ntohs(tvb, offset + 5);
+    length = tvb_get_ntohs(tvb, offset);
+    proto_tree_add_text(ext_tree, tvb, offset, 2, "Length: %u", length);
+    offset+=2;
+
+    /* Octet 4 Number of Data Records */
+    no = tvb_get_guint8(tvb, offset);
+    proto_tree_add_text(ext_tree, tvb, offset, 1, "Number of data records: %u", no);
+    offset++;
+
+    /* Octet 5 Data Record Format */
+    format = tvb_get_guint8(tvb, offset);
+    fmt_item = proto_tree_add_text(ext_tree, tvb, offset, 1, "Data record format: %u", format);
+    offset++;
+    /* The value range is 1-255 in decimal. The value '0' should not be used.
+     * Only the values 1-10 and 51-255 can be used for standards purposes.
+     * Values in the range of 11-50 are to be configured only by operators, and are not subject to standardization.
+     */
+    if(format<4){
+        proto_item_append_text(fmt_item, " %s", val_to_str_const(format, gtp_cdr_fmt_vals, "Unknown"));
+        /* Octet 6 -7  Data Record Format Version
+         *    8 7 6 5             4 3 2 1
+         * 6 Application Identifier Release Identifier
+         * 7 Version Identifier
+         */
+        app_id = tvb_get_guint8(tvb,offset);
+        rel_id = app_id & 0x0f;
+        app_id = app_id >>4;
+        ver_id =tvb_get_guint8(tvb,offset+1);
+        /* The second octet (#7 in Data Record Packet IE) identifies the version of the TS used to encode the CDR,
+         * i.e. its value corresponds to the second digit of the version number of the document [51]
+         * (as shown on the cover sheet), plus '1'.
+         * E.g. for version 3.4.0, the Version Identifier would be "5".
+         * In circumstances where the second digit is an alphabetical character, (e.g. 3.b.0), the corresponding ASCII value shall
+         * be taken, e.g. the Version Identifier would be "66" (ASCII(b)).
+         */
+        if(ver_id<0x65)
+            ver_id = ver_id -1;
+        /* XXX We don't handle ASCCI version */
+
+        ver_item = proto_tree_add_text(ext_tree, tvb, offset, 2, "Data record format version: AppId %u Rel %u.%u.0", app_id,rel_id,ver_id);
+        ver_tree = proto_item_add_subtree(ver_item, ett_gtp_cdr_ver);
+        proto_tree_add_item(ver_tree, hf_gtp_cdr_app, tvb, offset, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(ver_tree, hf_gtp_cdr_rel, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset++;
+        proto_tree_add_item(ver_tree, hf_gtp_cdr_ver, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset++;
+        for(i = 0; i < no; ++i) {
+            cdr_length = tvb_get_ntohs(tvb, offset);
+            te = proto_tree_add_text(ext_tree, tvb, offset, cdr_length+2, "Data record %d", i + 1);
+            cdr_dr_tree = proto_item_add_subtree(te, ett_gtp_cdr_dr);
+            proto_tree_add_text(cdr_dr_tree, tvb, offset, 2, "Length: %u", cdr_length);
+            offset+=2;
+            proto_tree_add_text(cdr_dr_tree, tvb, offset, cdr_length, "Content");
+            next_tvb = tvb_new_subset_remaining(tvb, offset);
+
+            /* XXX this is for release 6, may not work for higer releases */
+            if(format==1){
+                dissect_gprscdr_GPRSCallEventRecord_PDU(next_tvb, pinfo, cdr_dr_tree);
+            }else{
+                /* Do we have a dissector regestering for this data format? */
+                dissector_try_uint(gtp_cdr_fmt_dissector_table, format, next_tvb, pinfo, cdr_dr_tree);
+            }
 
-    proto_tree_add_text(ext_tree, tvb, offset + 1, 2, "Length: %u", length);
-    proto_tree_add_text(ext_tree, tvb, offset + 3, 1, "Number of data records: %u", no);
-    proto_tree_add_text(ext_tree, tvb, offset + 4, 1, "Data record format: %u", format);
-    proto_tree_add_text(ext_tree, tvb, offset + 5, 2, "Data record format version: %u", format_ver);
+            offset = offset + cdr_length;
+        }
+
+    }else{
+        /* Proprietary CDR format */
+        proto_item_append_text(fmt_item, " Proprietary or un documented format");
+    }
 
     if (gtpcdr_handle) {
-       next_tvb = tvb_new_subset_remaining(tvb, offset);
-       call_dissector(gtpcdr_handle, next_tvb, pinfo, tree);
-    } else
-       proto_tree_add_text(tree, tvb, offset, 0, "Data");
+        next_tvb = tvb_new_subset_remaining(tvb, offset);
+        call_dissector(gtpcdr_handle, next_tvb, pinfo, tree);
+    }
 
     return 3 + length;
 }
 
-/* GPRS:       12.15
- * UMTS:       33.015
+/* GPRS:        12.15
+ * UMTS:        33.015
  */
 static int decode_gtp_data_resp(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -6186,9 +6685,9 @@ static int decode_gtp_data_resp(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     while (n < length) {
 
-       number = tvb_get_ntohs(tvb, offset + 3 + n);
-       proto_tree_add_text(ext_tree_data_resp, tvb, offset + 3 + n, 2, "%u", number);
-       n = n + 2;
+        number = tvb_get_ntohs(tvb, offset + 3 + n);
+        proto_tree_add_text(ext_tree_data_resp, tvb, offset + 3 + n, 2, "%u", number);
+        n = n + 2;
 
     }
 
@@ -6196,8 +6695,8 @@ static int decode_gtp_data_resp(tvbuff_t * tvb, int offset, packet_info * pinfo
 
 }
 
-/* GPRS:       12.15
- * UMTS:       33.015
+/* GPRS:        12.15
+ * UMTS:        33.015
  */
 static int decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
 {
@@ -6217,27 +6716,27 @@ static int decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo
 
     switch (length) {
     case 4:
-       addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
-       proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
-       proto_tree_add_ipv4(ext_tree_node_addr, hf_gtp_node_ipv4, tvb, offset + 3, 4, addr_ipv4);
-       break;
+        addr_ipv4 = tvb_get_ipv4(tvb, offset + 3);
+        proto_item_append_text(te, "%s", ip_to_str((guint8 *) & addr_ipv4));
+        proto_tree_add_ipv4(ext_tree_node_addr, hf_gtp_node_ipv4, tvb, offset + 3, 4, addr_ipv4);
+        break;
     case 16:
-       tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
-       proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
-       proto_tree_add_ipv6(ext_tree_node_addr, hf_gtp_node_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
-       break;
+        tvb_get_ipv6(tvb, offset + 3, &addr_ipv6);
+        proto_item_append_text(te, "%s", ip6_to_str((struct e_in6_addr *) &addr_ipv6));
+        proto_tree_add_ipv6(ext_tree_node_addr, hf_gtp_node_ipv6, tvb, offset + 3, 16, (guint8 *) & addr_ipv6);
+        break;
     default:
-       proto_item_append_text(te, "unknown type or wrong length");
-       break;
+        proto_item_append_text(te, "unknown type or wrong length");
+        break;
     }
 
     return 3 + length;
 
 }
 
-/* GPRS:       9.60 v7.6.0, chapter 7.9.26
- * UMTS:       29.060 v4.0, chapter 7.7.46 Private Extension
- * 
+/* GPRS:        9.60 v7.6.0, chapter 7.9.26
+ * UMTS:        29.060 v4.0, chapter 7.7.46 Private Extension
+ *
  */
 
 static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, proto_tree * tree)
@@ -6246,25 +6745,29 @@ static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo _
     guint16 length, ext_id;
     proto_tree *ext_tree_priv_ext;
     proto_item *te;
+    tvbuff_t *next_tvb;
 
-    te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(GTP_EXT_PRIV_EXT, gtp_val, "Unknown message"));
+    te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str_ext_const(GTP_EXT_PRIV_EXT, &gtp_val_ext, "Unknown message"));
     ext_tree_priv_ext = proto_item_add_subtree(te, ett_gtp_ext);
 
     offset++;
     length = tvb_get_ntohs(tvb, offset);
-    proto_tree_add_item(ext_tree_priv_ext, hf_gtp_ext_length, tvb, offset, 2, FALSE);
+    proto_tree_add_item(ext_tree_priv_ext, hf_gtp_ext_length, tvb, offset, 2, ENC_BIG_ENDIAN);
     offset = offset + 2;
     if (length >= 2) {
-       ext_id = tvb_get_ntohs(tvb, offset);
-       proto_tree_add_uint(ext_tree_priv_ext, hf_gtp_ext_id, tvb, offset, 2, ext_id);
-       offset = offset + 2;
+        ext_id = tvb_get_ntohs(tvb, offset);
+        proto_tree_add_uint(ext_tree_priv_ext, hf_gtp_ext_id, tvb, offset, 2, ext_id);
+        offset = offset + 2;
 
-       /*
-        * XXX - is this always a text string?  Or should it be
-        * displayed as hex data?
-        */
-       if (length > 2)
-           proto_tree_add_item(ext_tree_priv_ext, hf_gtp_ext_val, tvb, offset, length - 2, FALSE);
+        /*
+         * XXX - is this always a text string?  Or should it be
+         * displayed as hex data?
+         */
+       if (length > 2){
+            proto_tree_add_item(ext_tree_priv_ext, hf_gtp_ext_val, tvb, offset, length - 2, ENC_NA);
+            next_tvb = tvb_new_subset_remaining(tvb, offset);
+            dissector_try_uint(gtp_priv_ext_dissector_table, ext_id, next_tvb, pinfo, ext_tree_priv_ext);
+       }
     }
 
     return 3 + length;
@@ -6278,321 +6781,392 @@ static int decode_gtp_unknown(tvbuff_t * tvb, int offset, packet_info * pinfo _U
     return tvb_length_remaining(tvb, offset);
 }
 
-static void dissect_gtp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
+static void dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 {
-    struct _gtp_hdr gtp_hdr;
-    proto_tree *gtp_tree, *flags_tree;
-    proto_item *ti, *tf;
-    int i, offset, length, gtp_prime, checked_field, mandatory;
-    int seq_no=0, flow_label=0;
-    guint8 pdu_no, next_hdr = 0, ext_hdr_val, version;
-    const guint8 *tid_val;
-    gchar *tid_str;
-    guint32 teid = 0;
-    tvbuff_t *next_tvb;
-    guint8 sub_proto, acfield_len = 0, control_field;
-    gtp_msg_hash_t *gcrp=NULL;
-    conversation_t *conversation=NULL;
-    gtp_conv_info_t *gtp_info=(gtp_conv_info_t *)pinfo->private_data;
-    void* pd_save;
-
-       /* 
-        * If this is GTPv2-C call the gtpv2 dissector if present 
-        * Should this be moved to after the conversation stuff to retain that functionality for GTPv2 ???
-        */
-       version = tvb_get_guint8(tvb,0)>>5;
-       if(version==2){
-               /* GTPv2-C 3GPP TS 29.274 */
-               if(gtpv2_handle){
-                       call_dissector(gtpv2_handle, tvb, pinfo, tree);
-                       return;
-               }
-       }
-
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP");
-    col_clear(pinfo->cinfo, COL_INFO);
+       struct _gtp_hdr gtp_hdr;
+       proto_tree *gtp_tree, *flags_tree, *ext_tree;
+       proto_item *ti, *tf, *item;
+       int i, offset, length, gtp_prime, checked_field, mandatory;
+       int seq_no=0, flow_label=0;
+       guint8 pdu_no, next_hdr = 0, ext_hdr_val, noOfExtHdrs = 0, ext_hdr_length;
+       gchar *tid_str;
+       guint32 teid = 0;
+       tvbuff_t *next_tvb;
+       guint8 sub_proto, acfield_len = 0, control_field;
+       gtp_msg_hash_t *gcrp=NULL;
+       conversation_t *conversation=NULL;
+       gtp_conv_info_t *gtp_info;
+       void* pd_save;
+
+
+       col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP");
+       col_clear(pinfo->cinfo, COL_INFO);
 
-    /*
-     * Do we have a conversation for this connection?
-     */
-    conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                     pinfo->ptype, pinfo->srcport,
-                                     pinfo->destport, 0);
-    if (conversation == NULL) {
-        /* We don't yet have a conversation, so create one. */
-        conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
-                                        pinfo->ptype, pinfo->srcport,
-                                        pinfo->destport, 0);
-    }
-    /*
-     * Do we already know this conversation?
-     */
-    gtp_info = conversation_get_proto_data(conversation, proto_gtp);
-    if (gtp_info == NULL) {
-        /* No.  Attach that information to the conversation, and add
-         * it to the list of information structures.
-         */
-        gtp_info = g_malloc(sizeof(gtp_conv_info_t));
-        /*Request/response matching tables*/
-        gtp_info->matched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_matched);
-        gtp_info->unmatched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_unmatched);
+       /*
+       * Do we have a conversation for this connection?
+       */
+       conversation = find_or_create_conversation(pinfo);
 
-        conversation_add_proto_data(conversation, proto_gtp, gtp_info);
+       /*
+       * Do we already know this conversation?
+       */
+       gtp_info = conversation_get_proto_data(conversation, proto_gtp);
+       if (gtp_info == NULL) {
+               /* No.  Attach that information to the conversation, and add
+               * it to the list of information structures.
+               */
+               gtp_info = g_malloc(sizeof(gtp_conv_info_t));
+               /*Request/response matching tables*/
+               gtp_info->matched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_matched);
+               gtp_info->unmatched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_unmatched);
+
+               conversation_add_proto_data(conversation, proto_gtp, gtp_info);
+
+               gtp_info->next = gtp_info_items;
+               gtp_info_items = gtp_info;
+       }
+       pd_save = pinfo->private_data;
+       pinfo->private_data = gtp_info;
 
-        gtp_info->next = gtp_info_items;
-        gtp_info_items = gtp_info;
-    }
-    pd_save = pinfo->private_data;
-    pinfo->private_data = gtp_info;
-       
-    tvb_memcpy(tvb, (guint8 *) & gtp_hdr, 0, 4);
+       tvb_memcpy(tvb, (guint8 *) & gtp_hdr, 0, 4);
 
-    if (!(gtp_hdr.flags & 0x10))
+       if (!(gtp_hdr.flags & 0x10))
                gtp_prime = 1;
-    else
+       else
                gtp_prime = 0;
 
-    switch ((gtp_hdr.flags >> 5) & 0x07) {
-           case 0:
-                       gtp_version = 0;
-                       break;
-               case 1:
-                       gtp_version = 1;
-                       break;
-           default:
-                       gtp_version = 1;
-                       break;
-    }
-
-    if (check_col(pinfo->cinfo, COL_INFO))
-               col_add_str(pinfo->cinfo, COL_INFO, val_to_str(gtp_hdr.message, message_type, "Unknown"));
+       switch ((gtp_hdr.flags >> 5) & 0x07) {
+                       case 0:
+                               gtp_version = 0;
+                               break;
+                       case 1:
+                               gtp_version = 1;
+                               break;
+                       default:
+                               gtp_version = 1;
+                               break;
+       }
 
-    if (tree) {
-       ti = proto_tree_add_item(tree, proto_gtp, tvb, 0, -1, FALSE);
-       gtp_tree = proto_item_add_subtree(ti, ett_gtp);
+       col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext_const(gtp_hdr.message, &gtp_message_type_ext, "Unknown"));
+
+       if (tree) {
+               ti = proto_tree_add_item(tree, proto_gtp, tvb, 0, -1, ENC_NA);
+               gtp_tree = proto_item_add_subtree(ti, ett_gtp);
+
+               tf = proto_tree_add_uint(gtp_tree, hf_gtp_flags, tvb, 0, 1, gtp_hdr.flags);
+               flags_tree = proto_item_add_subtree(tf, ett_gtp_flags);
+
+               if(gtp_prime==1){
+                       /* Octet  8    7    6    5    4    3    2    1
+             * 1      Version   | PT| Spare '1 1 1 '| ' 0/1 '
+                        */
+                       proto_tree_add_uint(flags_tree, hf_gtp_prime_flags_ver, tvb, 0, 1, gtp_hdr.flags);
+                       proto_tree_add_uint(flags_tree, hf_gtp_flags_pt, tvb, 0, 1, gtp_hdr.flags);
+                       proto_tree_add_uint(flags_tree, hf_gtp_flags_spare1, tvb, 0, 1, gtp_hdr.flags);
+                       /* Bit 1 of octet 1 is not used in GTP' (except in v0), and it is marked '0'
+                        * in the GTP' header. It is in use in GTP' v0 and distinguishes the used header-length.
+                        * In the case of GTP' v0, this bit being marked one (1) indicates the usage of the 6
+                        * octets header. If the bit is set to '0' (usually the case) the 20-octet header is used.
+                        * For all other versions of GTP', this bit is not used and is set to '0'. However,
+                        * this does not suggest the use of the 20-octet header, rather a shorter 6-octet header.
+                        */
+                       if(gtp_version==0){
+                               proto_tree_add_item(flags_tree, hf_gtp_flags_hdr_length, tvb, 0, 1, ENC_BIG_ENDIAN);
+                       }
+               }else{
+                       proto_tree_add_uint(flags_tree, hf_gtp_flags_ver, tvb, 0, 1, gtp_hdr.flags);
+                       proto_tree_add_uint(flags_tree, hf_gtp_flags_pt, tvb, 0, 1, gtp_hdr.flags);
+                       if(gtp_version==0){
+                               proto_tree_add_uint(flags_tree, hf_gtp_flags_spare1, tvb, 0, 1, gtp_hdr.flags);
+                               proto_tree_add_boolean(flags_tree, hf_gtp_flags_snn, tvb, 0, 1, gtp_hdr.flags);
+                       }else{
+                               proto_tree_add_uint(flags_tree, hf_gtp_flags_spare2, tvb, 0, 1, gtp_hdr.flags);
+                               proto_tree_add_boolean(flags_tree, hf_gtp_flags_e, tvb, 0, 1, gtp_hdr.flags);
+                               proto_tree_add_boolean(flags_tree, hf_gtp_flags_s, tvb, 0, 1, gtp_hdr.flags);
+                               proto_tree_add_boolean(flags_tree, hf_gtp_flags_pn, tvb, 0, 1, gtp_hdr.flags);
+                       }
+               }
 
-       tf = proto_tree_add_uint(gtp_tree, hf_gtp_flags, tvb, 0, 1, gtp_hdr.flags);
-       flags_tree = proto_item_add_subtree(tf, ett_gtp_flags);
+               proto_tree_add_uint(gtp_tree, hf_gtp_message_type, tvb, 1, 1, gtp_hdr.message);
 
-       proto_tree_add_uint(flags_tree, hf_gtp_flags_ver, tvb, 0, 1, gtp_hdr.flags);
-       
-       if(version>=2){
-               proto_tree_add_text(tree, tvb, 0, -1, "No WS dissector for GTP version %u %s", version, val_to_str(version, ver_types, "Unknown"));
-               pinfo->private_data = pd_save;
-               return;
-       }
+               gtp_hdr.length = g_ntohs(gtp_hdr.length);
+               proto_tree_add_uint(gtp_tree, hf_gtp_length, tvb, 2, 2, gtp_hdr.length);
 
-       proto_tree_add_uint(flags_tree, hf_gtp_flags_pt, tvb, 0, 1, gtp_hdr.flags);
-
-       switch (gtp_version) {
-       case 0:
-           proto_tree_add_uint(flags_tree, hf_gtp_flags_spare1, tvb, 0, 1, gtp_hdr.flags);
-           proto_tree_add_boolean(flags_tree, hf_gtp_flags_snn, tvb, 0, 1, gtp_hdr.flags);
-           break;
-       case 1:
-           proto_tree_add_uint(flags_tree, hf_gtp_flags_spare2, tvb, 0, 1, gtp_hdr.flags);
-           proto_tree_add_boolean(flags_tree, hf_gtp_flags_e, tvb, 0, 1, gtp_hdr.flags);
-           proto_tree_add_boolean(flags_tree, hf_gtp_flags_s, tvb, 0, 1, gtp_hdr.flags);
-           proto_tree_add_boolean(flags_tree, hf_gtp_flags_pn, tvb, 0, 1, gtp_hdr.flags);
-           break;
-       default:
-           break;
-       }
+               offset = 4;
 
-       proto_tree_add_uint(gtp_tree, hf_gtp_message_type, tvb, 1, 1, gtp_hdr.message);
-
-       gtp_hdr.length = g_ntohs(gtp_hdr.length);
-       proto_tree_add_uint(gtp_tree, hf_gtp_length, tvb, 2, 2, gtp_hdr.length);
-
-       offset = 4;
-
-       if (gtp_prime) {
-           seq_no = tvb_get_ntohs(tvb, offset);
-           proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
-           offset += 2;
-       } else
-           switch (gtp_version) {
-           case 0:
-               seq_no = tvb_get_ntohs(tvb, offset);
-               proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
-               offset += 2;
-
-               flow_label = tvb_get_ntohs(tvb, offset);
-               proto_tree_add_uint(gtp_tree, hf_gtp_flow_label, tvb, offset, 2, flow_label);
-               offset += 2;
-
-               pdu_no = tvb_get_guint8(tvb, offset);
-               proto_tree_add_uint(gtp_tree, hf_gtp_sndcp_number, tvb, offset, 1, pdu_no);
-               offset += 4;
-
-               tid_val = tvb_get_ptr(tvb, offset, 8);
-               tid_str = id_to_str(tid_val);
-               proto_tree_add_string(gtp_tree, hf_gtp_tid, tvb, offset, 8, tid_str);
-               offset += 8;
-               break;
-           case 1:
-               teid = tvb_get_ntohl(tvb, offset);
-               proto_tree_add_uint(gtp_tree, hf_gtp_teid, tvb, offset, 4, teid);
-               offset += 4;
-
-               if (gtp_hdr.flags & 0x07) {
-                   seq_no = tvb_get_ntohs(tvb, offset);
-                   proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
-                   offset += 2;
-
-                   pdu_no = tvb_get_guint8(tvb, offset);
-                   proto_tree_add_uint(gtp_tree, hf_gtp_npdu_number, tvb, offset, 1, pdu_no);
-                   offset++;
-
-                   next_hdr = tvb_get_guint8(tvb, offset);
-                   proto_tree_add_uint(gtp_tree, hf_gtp_next, tvb, offset, 1, next_hdr);
-                   if (!next_hdr)
-                       offset++;
+               if (gtp_prime) {
+                       seq_no = tvb_get_ntohs(tvb, offset);
+                       proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
+                       offset += 2;
+                       /* If GTP' version is 0 and bit 1 is 0 20 bytes header is used, step past it */
+                       if( (gtp_version==0)&&((gtp_hdr.flags & 0x01)==0) ){
+                               offset = GTPv0_HDR_LENGTH;
+                       }
+               } else
+                       switch (gtp_version) {
+                       case 0:
+                               seq_no = tvb_get_ntohs(tvb, offset);
+                               proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
+                               offset += 2;
+
+                               flow_label = tvb_get_ntohs(tvb, offset);
+                               proto_tree_add_uint(gtp_tree, hf_gtp_flow_label, tvb, offset, 2, flow_label);
+                               offset += 2;
+
+                               pdu_no = tvb_get_guint8(tvb, offset);
+                               proto_tree_add_uint(gtp_tree, hf_gtp_sndcp_number, tvb, offset, 1, pdu_no);
+                               offset += 4;
+
+                               tid_str = id_to_str(tvb, offset);
+                               proto_tree_add_string(gtp_tree, hf_gtp_tid, tvb, offset, 8, tid_str);
+                               offset += 8;
+                               break;
+                       case 1:
+                               teid = tvb_get_ntohl(tvb, offset);
+                               proto_tree_add_uint(gtp_tree, hf_gtp_teid, tvb, offset, 4, teid);
+                               offset += 4;
+
+                               /* Are sequence number/N-PDU Number/extension header present? */
+                               if (gtp_hdr.flags & 0x07) {
+                                       seq_no = tvb_get_ntohs(tvb, offset);
+                                       proto_tree_add_uint(gtp_tree, hf_gtp_seq_number, tvb, offset, 2, seq_no);
+                                       offset += 2;
+
+                                       pdu_no = tvb_get_guint8(tvb, offset);
+                                       proto_tree_add_uint(gtp_tree, hf_gtp_npdu_number, tvb, offset, 1, pdu_no);
+                                       offset++;
+
+                                       next_hdr = tvb_get_guint8(tvb, offset);
+
+                                       /* Don't add extension header, we'll add a subtree for that */
+                                       /* proto_tree_add_uint(gtp_tree, hf_gtp_next, tvb, offset, 1, next_hdr); */
+
+                                       offset++;
+
+                                       /* Change to while? */
+                                       if (next_hdr) {
+
+                                               /* TODO Add support for more than one extension header */
+
+                                               noOfExtHdrs++;
+
+                                               tf = proto_tree_add_uint(gtp_tree, hf_gtp_ext_hdr, tvb, offset, 4, next_hdr);
+                                               ext_tree = proto_item_add_subtree(tf, ett_gtp_ext_hdr);
+
+                                               /* PDCP PDU
+                                               * 3GPP 29.281 v9.0.0, 5.2.2.2 PDCP PDU Number
+                                               *
+                                               * "This extension header is transmitted, for example in UTRAN, at SRNS relocation time,
+                                               * to provide the PDCP sequence number of not yet acknowledged N-PDUs. It is 4 octets long,
+                                               *  and therefore the Length field has value 1.
+                                               *
+                                               *  When used between two eNBs at the X2 interface in E-UTRAN, bits 5-8 of octet 2 are spare.
+                                               *  The meaning of the spare bits shall be set to zero.
+                                               *
+                                               * Wireshark Note: TS 29.060 does not define bit 5-6 as spare, so no check is possible unless a preference is used.
+                                               */
+                                               if (next_hdr == GTP_EXT_HDR_PDCP_SN) {
+
+                                                       /* First byte is length (should be 1) */
+                                                       ext_hdr_length = tvb_get_guint8(tvb, offset);
+                                                       if (ext_hdr_length != 1) {
+                                                               expert_add_info_format(pinfo, ext_tree, PI_PROTOCOL, PI_WARN, "The length field for the PDCP SN Extension header should be 1.");
+                                                       }
+                                                       proto_tree_add_item(ext_tree, hf_gtp_ext_hdr_length, tvb, offset,1, ENC_BIG_ENDIAN);
+                                                       offset++;
+
+                                                       proto_tree_add_item(ext_tree, hf_gtp_ext_hdr_pdcpsn, tvb, offset, 2, ENC_BIG_ENDIAN);
+                                                       offset += 2;
+
+                                                       /* Last is next_hdr */
+                                                       next_hdr = tvb_get_guint8(tvb, offset);
+                                                       item = proto_tree_add_item(ext_tree, hf_gtp_ext_hdr_next, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+                                                       if (next_hdr) {
+                                                               expert_add_info_format(pinfo, item, PI_UNDECODED, PI_WARN, "Can't decode more than one extension header.");
+                                                       }
+                                                       offset++;
+                                               }
+                                       }
+                               }
+                               break;
+                       default:
+                               break;
                }
-               break;
-           default:
-               break;
-           }
-
-       if (gtp_hdr.message != GTP_MSG_TPDU) {
-           /* TODO: This code should be cleaned up to handle more than one
-            * header and possibly display the header content */
-           if (next_hdr) {
-               offset++;
-               switch (next_hdr) {
-               case 1:
-                   /* MBMS support indication */
-                   proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- MBMS support indication header ---]");
-                   offset += 3;
-                   break;
-               case 2:
-                   /* MS Info Change Reporting support indication */
-                   proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- MS Info Change Reporting support indication header ---]");
-                   offset += 3;
-                   break;
-               case 0xc0:
-                   /* PDCP PDU number */
-                   proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- PDCP PDU number header ---]");
-                   offset += 3;
-                   break;
-               case 0xc1:
-                   /* Suspend Request */
-                   proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- Suspend Request header ---]");
-                   offset += 3;
-                   break;
-               case 0xc2:
-                   /* Suspend Response */
-                   proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- Suspend Response header ---]");
-                   offset += 3;
-                   break;
-               default:
-                   proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- Unknown extension header ---]");
-                   offset += 3;
-                   break;
+
+               if (gtp_hdr.message != GTP_MSG_TPDU) {
+                       /* TODO: This code should be cleaned up to handle more than one
+                       * header and possibly display the header content */
+                       if (next_hdr) {
+                               offset++;
+                               switch (next_hdr) {
+                               case 1:
+                                       /* MBMS support indication */
+                                       proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- MBMS support indication header ---]");
+                                       offset += 3;
+                                       break;
+                               case 2:
+                                       /* MS Info Change Reporting support indication */
+                                       proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- MS Info Change Reporting support indication header ---]");
+                                       offset += 3;
+                                       break;
+                               case 0xc0:
+                                       /* PDCP PDU number */
+                                       proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- PDCP PDU number header ---]");
+                                       offset += 3;
+                                       break;
+                               case 0xc1:
+                                       /* Suspend Request */
+                                       proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- Suspend Request header ---]");
+                                       offset += 3;
+                                       break;
+                               case 0xc2:
+                                       /* Suspend Response */
+                                       proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- Suspend Response header ---]");
+                                       offset += 3;
+                                       break;
+                               default:
+                                       proto_tree_add_text(gtp_tree, tvb, offset, 4, "[--- Unknown extension header ---]");
+                                       offset += 3;
+                                       break;
+                               }
+                               next_hdr = tvb_get_guint8(tvb, offset);
+                               proto_tree_add_uint(gtp_tree, hf_gtp_next, tvb, offset, 1, next_hdr);
+                               offset++;
+                       }
+                       /* proto_tree_add_text(gtp_tree, tvb, 0, 0, "[--- end of GTP header, beginning of extension headers ---]");*/
+                       length = tvb_length(tvb);
+                       mandatory = 0;      /* check order of GTP fields against ETSI */
+                       for (;;) {
+                               if (offset >= length)
+                                       break;
+                               if (next_hdr) {
+                                       ext_hdr_val = next_hdr;
+                                       next_hdr = 0;
+                               } else
+                                       ext_hdr_val = tvb_get_guint8(tvb, offset);
+                               if (g_gtp_etsi_order) {
+                                       checked_field = check_field_presence(gtp_hdr.message, ext_hdr_val, (int *) &mandatory);
+                                       switch (checked_field) {
+                                       case -2:
+                                               proto_tree_add_text(gtp_tree, tvb, 0, 0, "[WARNING] message not found");
+                                               break;
+                                       case -1:
+                                               proto_tree_add_text(gtp_tree, tvb, 0, 0, "[WARNING] field not present");
+                                               break;
+                                       case 0:
+                                               break;
+                                       default:
+                                               proto_tree_add_text(gtp_tree, tvb, offset, 1, "[WARNING] wrong next field, should be: %s",
+                                                       val_to_str_ext_const(checked_field, &gtp_val_ext, "Unknown extension field"));
+                                               break;
+                                       }
+                               }
+
+                               i = -1;
+                               while (gtpopt[++i].optcode)
+                                       if (gtpopt[i].optcode == ext_hdr_val)
+                                               break;
+                               offset = offset + (*gtpopt[i].decode) (tvb, offset, pinfo, gtp_tree);
+                       }
+
+                       /*Use sequence number to track Req/Resp pairs*/
+                       if (seq_no) {
+                               gcrp = gtp_match_response(tvb, pinfo, gtp_tree, seq_no, gtp_hdr.message);
+                               /*pass packet to tap for response time reporting*/
+                               if (gcrp) {
+                                       tap_queue_packet(gtp_tap,pinfo,gcrp);
+                               }
+                       }
                }
-               next_hdr = tvb_get_guint8(tvb, offset);
-               proto_tree_add_uint(gtp_tree, hf_gtp_next, tvb, offset, 1, next_hdr);
-               offset++;
-           }
-           proto_tree_add_text(gtp_tree, tvb, 0, 0, "[--- end of GTP header, beginning of extension headers ---]");
-           length = tvb_length(tvb);
-           mandatory = 0;      /* check order of GTP fields against ETSI */
-           for (;;) {
-               if (offset >= length)
-                   break;
-               if (next_hdr) {
-                   ext_hdr_val = next_hdr;
-                   next_hdr = 0;
+               proto_item_set_len (ti, offset);
+       }
+
+       if ((gtp_hdr.message == GTP_MSG_TPDU) && g_gtp_tpdu) {
+
+               if (gtp_prime)
+                       offset = 6;
+               else if (gtp_version == 1) {
+                       if (gtp_hdr.flags & 0x07) {
+                               offset = 11;
+                               if (tvb_get_guint8(tvb, offset) == 0)
+                                       offset++;
+                       } else
+                               offset = 8;
                } else
-                   ext_hdr_val = tvb_get_guint8(tvb, offset);
-               if (g_gtp_etsi_order) {
-                   checked_field = check_field_presence(gtp_hdr.message, ext_hdr_val, (int *) &mandatory);
-                   switch (checked_field) {
-                   case -2:
-                       proto_tree_add_text(gtp_tree, tvb, 0, 0, "[WARNING] message not found");
-                       break;
-                   case -1:
-                       proto_tree_add_text(gtp_tree, tvb, 0, 0, "[WARNING] field not present");
-                       break;
-                   case 0:
-                       break;
-                   default:
-                       proto_tree_add_text(gtp_tree, tvb, offset, 1, "[WARNING] wrong next field, should be: %s",
-                                           val_to_str(checked_field, gtp_val, "Unknown extension field"));
-                       break;
-                   }
+                       offset = 20;
+
+               /* Can only handle one extension header type... */
+               if (noOfExtHdrs != 0) offset+= 1 + noOfExtHdrs*4;
+
+               sub_proto = tvb_get_guint8(tvb, offset);
+
+               if ((sub_proto >= 0x45) && (sub_proto <= 0x4e)) {
+                       /* this is most likely an IPv4 packet
+                       * we can exclude 0x40 - 0x44 because the minimum header size is 20 octets
+                       * 0x4f is excluded because PPP protocol type "IPv6 header compression"
+                       * with protocol field compression is more likely than a plain IPv4 packet with 60 octet header size */
+
+                       next_tvb = tvb_new_subset_remaining(tvb, offset);
+                       call_dissector(ip_handle, next_tvb, pinfo, tree);
+
+               } else if ((sub_proto & 0xf0) == 0x60) {
+                       /* this is most likely an IPv6 packet */
+                       next_tvb = tvb_new_subset_remaining(tvb, offset);
+                       call_dissector(ipv6_handle, next_tvb, pinfo, tree);
+               } else {
+                       /* this seems to be a PPP packet */
+
+                       if (sub_proto == 0xff) {
+                               /* this might be an address field, even it shouldn't be here */
+                               control_field = tvb_get_guint8(tvb, offset + 1);
+                               if (control_field == 0x03)
+                                       /* now we are pretty sure that address and control field are mistakenly inserted -> ignore it for PPP dissection */
+                                       acfield_len = 2;
+                       }
+
+                       next_tvb = tvb_new_subset_remaining(tvb, offset + acfield_len);
+                       call_dissector(ppp_handle, next_tvb, pinfo, tree);
                }
 
-               i = -1;
-               while (gtpopt[++i].optcode)
-                   if (gtpopt[i].optcode == ext_hdr_val)
-                       break;
-               offset = offset + (*gtpopt[i].decode) (tvb, offset, pinfo, gtp_tree);
-           }
-
-            /*Use sequence number to track Req/Resp pairs*/
-            if(seq_no) {
-                gcrp = gtp_match_response(tvb, pinfo, gtp_tree, seq_no, gtp_hdr.message);
-                /*pass packet to tap for response time reporting*/
-                if(gcrp) {
-                    tap_queue_packet(gtp_tap,pinfo,gcrp);
-                }
-            }
-        }
-    }
-    
-    if ((gtp_hdr.message == GTP_MSG_TPDU) && g_gtp_tpdu) {
-
-       if (gtp_prime)
-           offset = 6;
-       else if (gtp_version == 1) {
-           if (gtp_hdr.flags & 0x07) {
-               offset = 11;
-               if (tvb_get_guint8(tvb, offset) == 0)
-                   offset++;
-           } else
-               offset = 8;
-       } else
-           offset = 20;
-
-       sub_proto = tvb_get_guint8(tvb, offset);
-
-       if ((sub_proto >= 0x45) && (sub_proto <= 0x4e)) {
-           /* this is most likely an IPv4 packet
-            * we can exclude 0x40 - 0x44 because the minimum header size is 20 octets
-            * 0x4f is excluded because PPP protocol type "IPv6 header compression"
-            * with protocol field compression is more likely than a plain IPv4 packet with 60 octet header size */
-
-           next_tvb = tvb_new_subset_remaining(tvb, offset);
-           call_dissector(ip_handle, next_tvb, pinfo, tree);
-
-       } else if ((sub_proto & 0xf0) == 0x60) {
-           /* this is most likely an IPv6 packet */
-           next_tvb = tvb_new_subset_remaining(tvb, offset);
-           call_dissector(ipv6_handle, next_tvb, pinfo, tree);
-       } else {
-           /* this seems to be a PPP packet */
-
-           if (sub_proto == 0xff) {
-               /* this might be an address field, even it shouldn't be here */
-               control_field = tvb_get_guint8(tvb, offset + 1);
-               if (control_field == 0x03)
-                   /* now we are pretty sure that address and control field are mistakenly inserted -> ignore it for PPP dissection */
-                   acfield_len = 2;
-           }
-
-           next_tvb = tvb_new_subset_remaining(tvb, offset + acfield_len);
-           call_dissector(ppp_handle, next_tvb, pinfo, tree);
+               col_prepend_fstr(pinfo->cinfo, COL_PROTOCOL, "GTP <");
+               col_append_str(pinfo->cinfo, COL_PROTOCOL, ">");
        }
+       pinfo->private_data = pd_save;
+}
 
-       if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
-           col_prepend_fstr(pinfo->cinfo, COL_PROTOCOL, "GTP <");
-           col_append_str(pinfo->cinfo, COL_PROTOCOL, ">");
-       }
+static void dissect_gtpprim(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
+{
+
+    dissect_gtp_common(tvb, pinfo, tree);
+}
+
+static void dissect_gtp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
+{
+    guint8 version;
+    /*
+     * If this is GTPv2-C call the gtpv2 dissector if present
+     * Should this be moved to after the conversation stuff to retain that functionality for GTPv2 ???
+     */
+    version = tvb_get_guint8(tvb,0)>>5;
+    if (version==2) {
+        /* GTPv2-C 3GPP TS 29.274 */
+        if (gtpv2_handle) {
+            call_dissector(gtpv2_handle, tvb, pinfo, tree);
+            return;
+        }
+    }
+    if(version>2){
+        proto_tree_add_text(tree, tvb, 0, -1, "No WS dissector for GTP version %u %s", version,
+                            val_to_str_const(version, ver_types, "Unknown"));
+        return;
     }
-    pinfo->private_data = pd_save;
+
+    dissect_gtp_common(tvb, pinfo, tree);
+
 }
 
+
 static const true_false_string yes_no_tfs = {
     "yes",
     "no"
@@ -6623,414 +7197,479 @@ void proto_register_gtp(void)
 {
     static hf_register_info hf_gtp[] = {
 
-       {&hf_gtp_response_in,
-        {"Response In", "gtp.response_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "The response to this GTP request is in this frame", HFILL}},
-       {&hf_gtp_response_to,
-        {"Response To", "gtp.response_to", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "This is a response to the GTP request in this frame", HFILL}},
-       {&hf_gtp_time, {"Time", "gtp.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "The time between the Request and the Response", HFILL}},
-       {&hf_gtp_apn, {"APN", "gtp.apn", FT_STRING, BASE_NONE, NULL, 0, "Access Point Name", HFILL}},
-       {&hf_gtp_cause, {"Cause", "gtp.cause", FT_UINT8, BASE_DEC, VALS(cause_type), 0, "Cause of operation", HFILL}},
-       {&hf_gtp_chrg_char, {"Charging characteristics", "gtp.chrg_char", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_chrg_char_s, {"Spare", "gtp.chrg_char_s", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_S, NULL, HFILL}},
-       {&hf_gtp_chrg_char_n, {"Normal charging", "gtp.chrg_char_n", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_N, NULL, HFILL}},
-       {&hf_gtp_chrg_char_p, {"Prepaid charging", "gtp.chrg_char_p", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_P, NULL, HFILL}},
-       {&hf_gtp_chrg_char_f,
-        {"Flat rate charging", "gtp.chrg_char_f", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_F, NULL, HFILL}},
-       {&hf_gtp_chrg_char_h,
-        {"Hot billing charging", "gtp.chrg_char_h", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_H, NULL, HFILL}},
-       {&hf_gtp_chrg_char_r, {"Reserved", "gtp.chrg_char_r", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_R, NULL, HFILL}},
-       {&hf_gtp_chrg_id, {"Charging ID", "gtp.chrg_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_chrg_ipv4, {"CG address IPv4", "gtp.chrg_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Charging Gateway address IPv4", HFILL}},
-       {&hf_gtp_chrg_ipv6, {"CG address IPv6", "gtp.chrg_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Charging Gateway address IPv6", HFILL}},
-       {&hf_gtp_ext_flow_label, {"Flow Label Data I", "gtp.ext_flow_label", FT_UINT16, BASE_HEX, NULL, 0, "Flow label data", HFILL}},
-       {&hf_gtp_ext_id, {"Extension identifier", "gtp.ext_id", FT_UINT16, BASE_DEC, VALS(sminmpec_values), 0, "Extension Identifier", HFILL}},
-       {&hf_gtp_ext_val, {"Extension value", "gtp.ext_val", FT_BYTES, BASE_NONE, NULL, 0, "Extension Value", HFILL}},
-       {&hf_gtp_flags, {"Flags", "gtp.flags", FT_UINT8, BASE_HEX, NULL, 0, "Ver/PT/Spare...", HFILL}},
-       {&hf_gtp_flags_ver,
-        {"Version", "gtp.flags.version",
-         FT_UINT8, BASE_DEC, VALS(ver_types), GTP_VER_MASK,
-         "GTP Version", HFILL}
-        },
-       {&hf_gtp_flags_pt,
-        {"Protocol type", "gtp.flags.payload",
-         FT_UINT8, BASE_DEC, VALS(pt_types), GTP_PT_MASK,
-         "Protocol Type", HFILL}
-        },
-       {&hf_gtp_flags_spare1,
-        {"Reserved", "gtp.flags.reserved",
-         FT_UINT8, BASE_DEC, NULL, GTP_SPARE1_MASK,
-         "Reserved (shall be sent as '111' )", HFILL}
-        },
-       {&hf_gtp_flags_snn,
-        {"Is SNDCP N-PDU included?", "gtp.flags.snn", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_SNN_MASK,
-         "Is SNDCP N-PDU LLC Number included? (1 = yes, 0 = no)", HFILL}},
-       {&hf_gtp_flags_spare2,
-        {"Reserved", "gtp.flags.reserved", FT_UINT8, BASE_DEC, NULL, GTP_SPARE2_MASK, "Reserved (shall be sent as '1' )", HFILL}},
-       {&hf_gtp_flags_e,
-        {"Is Next Extension Header present?", "gtp.flags.e", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_E_MASK,
-         "Is Next Extension Header present? (1 = yes, 0 = no)", HFILL}},
-       {&hf_gtp_flags_s,
-        {"Is Sequence Number present?", "gtp.flags.s", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_S_MASK, "Is Sequence Number present? (1 = yes, 0 = no)",
-         HFILL}},
-       {&hf_gtp_flags_pn,
-        {"Is N-PDU number present?", "gtp.flags.pn", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_PN_MASK, "Is N-PDU number present? (1 = yes, 0 = no)",
-         HFILL}},
-       {&hf_gtp_flow_ii, {"Flow Label Data II", "gtp.flow_ii", FT_UINT16, BASE_DEC, NULL, 0, "Downlink flow label data", HFILL}},
-       {&hf_gtp_flow_label, {"Flow label", "gtp.flow_label", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_flow_sig, {"Flow label Signalling", "gtp.flow_sig", FT_UINT16, BASE_HEX, NULL, 0, "Flow label signalling", HFILL}},
-       {&hf_gtp_gsn_addr_len,
-        {"GSN Address Length", "gtp.gsn_addr_len", FT_UINT8, BASE_DEC, NULL, GTP_EXT_GSN_ADDR_LEN_MASK, NULL, HFILL}},
-       {&hf_gtp_gsn_addr_type,
-        {"GSN Address Type", "gtp.gsn_addr_type", FT_UINT8, BASE_DEC, VALS(gsn_addr_type), GTP_EXT_GSN_ADDR_TYPE_MASK, NULL, HFILL}},
-       {&hf_gtp_gsn_ipv4, {"GSN address IPv4", "gtp.gsn_ipv4", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_gsn_ipv6, {"GSN address IPv6", "gtp.gsn_ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_imsi, {"IMSI", "gtp.imsi", FT_STRING, BASE_NONE, NULL, 0, "International Mobile Subscriber Identity number", HFILL}},
-       {&hf_gtp_length, {"Length", "gtp.length", FT_UINT16, BASE_DEC, NULL, 0, "Length (i.e. number of octets after TID or TEID)", HFILL}},
-       {&hf_gtp_map_cause, {"MAP cause", "gtp.map_cause", FT_UINT8, BASE_DEC, VALS(gsm_old_GSMMAPLocalErrorcode_vals), 0, NULL, HFILL}},
-       {&hf_gtp_message_type, {"Message Type", "gtp.message", FT_UINT8, BASE_HEX, VALS(message_type), 0x0, "GTP Message Type", HFILL}},
-       {&hf_gtp_ms_reason,
-        {"MS not reachable reason", "gtp.ms_reason", FT_UINT8, BASE_DEC, VALS(ms_not_reachable_type), 0, "MS Not Reachable Reason", HFILL}},
-       {&hf_gtp_ms_valid, {"MS validated", "gtp.ms_valid", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-       {&hf_gtp_msisdn, {"MSISDN", "gtp.msisdn", FT_STRING, BASE_NONE, NULL, 0, "MS international PSTN/ISDN number", HFILL}},
-       {&hf_gtp_next,
-        {"Next extension header type", "gtp.next", FT_UINT8, BASE_HEX, VALS(next_extension_header_fieldvals), 0, "Next Extension Header Type",
-         HFILL}},
-       {&hf_gtp_node_ipv4, {"Node address IPv4", "gtp.node_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Recommended node address IPv4", HFILL}},
-       {&hf_gtp_node_ipv6, {"Node address IPv6", "gtp.node_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Recommended node address IPv6", HFILL}},
-       {&hf_gtp_npdu_number, {"N-PDU Number", "gtp.npdu_number", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_nsapi, {"NSAPI", "gtp.nsapi", FT_UINT8, BASE_DEC, NULL, 0, "Network layer Service Access Point Identifier", HFILL}},
-       {&hf_gtp_qos_version, {"Version", "gtp.qos_version", FT_STRING, BASE_NONE, NULL, 0, "Version of the QoS Profile", HFILL}},
-       {&hf_gtp_qos_spare1, {"Spare", "gtp.qos_spare1", FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE1_MASK, "Spare (shall be sent as '00' )", HFILL}},
-       {&hf_gtp_qos_delay,
-        {"QoS delay", "gtp.qos_delay", FT_UINT8, BASE_DEC, VALS(qos_delay_type), GTP_EXT_QOS_DELAY_MASK, "Quality of Service Delay Class", HFILL}},
-       {&hf_gtp_qos_reliability,
-        {"QoS reliability", "gtp.qos_reliabilty", FT_UINT8, BASE_DEC, VALS(qos_reliability_type), GTP_EXT_QOS_RELIABILITY_MASK,
-         "Quality of Service Reliability Class", HFILL}},
-       {&hf_gtp_qos_peak,
-        {"QoS peak", "gtp.qos_peak", FT_UINT8, BASE_DEC, VALS(qos_peak_type), GTP_EXT_QOS_PEAK_MASK, "Quality of Service Peak Throughput", HFILL}},
-       {&hf_gtp_qos_spare2, {"Spare", "gtp.qos_spare2", FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE2_MASK, "Spare (shall be sent as 0)", HFILL}},
-       {&hf_gtp_qos_precedence,
-        {"QoS precedence", "gtp.qos_precedence", FT_UINT8, BASE_DEC, VALS(qos_precedence_type), GTP_EXT_QOS_PRECEDENCE_MASK,
-         "Quality of Service Precedence Class", HFILL}},
-       {&hf_gtp_qos_spare3,
-        {"Spare", "gtp.qos_spare3", FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE3_MASK, "Spare (shall be sent as '000' )", HFILL}},
-       {&hf_gtp_qos_mean,
-        {"QoS mean", "gtp.qos_mean", FT_UINT8, BASE_DEC, VALS(qos_mean_type), GTP_EXT_QOS_MEAN_MASK, "Quality of Service Mean Throughput", HFILL}},
-       {&hf_gtp_qos_al_ret_priority,
-        {"Allocation/Retention priority", "gtp.qos_al_ret_priority", FT_UINT8, BASE_DEC, NULL, 0, "Allocation/Retention Priority", HFILL}},
-       {&hf_gtp_qos_traf_class,
-        {"Traffic class", "gtp.qos_traf_class", FT_UINT8, BASE_DEC, VALS(qos_traf_class), GTP_EXT_QOS_TRAF_CLASS_MASK, "Traffic Class", HFILL}},
-       {&hf_gtp_qos_del_order,
-        {"Delivery order", "gtp.qos_del_order", FT_UINT8, BASE_DEC, VALS(qos_del_order), GTP_EXT_QOS_DEL_ORDER_MASK, "Delivery Order", HFILL}},
-       {&hf_gtp_qos_del_err_sdu,
-        {"Delivery of erroneous SDU", "gtp.qos_del_err_sdu", FT_UINT8, BASE_DEC, VALS(qos_del_err_sdu), GTP_EXT_QOS_DEL_ERR_SDU_MASK,
-         "Delivery of Erroneous SDU", HFILL}},
-       {&hf_gtp_qos_max_sdu_size,
-        {"Maximum SDU size", "gtp.qos_max_sdu_size", FT_UINT8, BASE_DEC, VALS(qos_max_sdu_size), 0, NULL, HFILL}},
-       {&hf_gtp_qos_max_ul,
-        {"Maximum bit rate for uplink", "gtp.qos_max_ul", FT_UINT8, BASE_DEC, VALS(qos_max_ul), 0, NULL, HFILL}},
-       {&hf_gtp_qos_max_dl,
-        {"Maximum bit rate for downlink", "gtp.qos_max_dl", FT_UINT8, BASE_DEC, VALS(qos_max_dl), 0, NULL, HFILL}},
-       {&hf_gtp_qos_res_ber,
-        {"Residual BER", "gtp.qos_res_ber", FT_UINT8, BASE_DEC, VALS(qos_res_ber), GTP_EXT_QOS_RES_BER_MASK, "Residual Bit Error Rate", HFILL}},
-       {&hf_gtp_qos_sdu_err_ratio,
-        {"SDU Error ratio", "gtp.qos_sdu_err_ratio", FT_UINT8, BASE_DEC, VALS(qos_sdu_err_ratio), GTP_EXT_QOS_SDU_ERR_RATIO_MASK, "SDU Error Ratio",
-         HFILL}},
-       {&hf_gtp_qos_trans_delay,
-        {"Transfer delay", "gtp.qos_trans_delay", FT_UINT8, BASE_DEC, VALS(qos_trans_delay), GTP_EXT_QOS_TRANS_DELAY_MASK, "Transfer Delay", HFILL}},
-       {&hf_gtp_qos_traf_handl_prio,
-        {"Traffic handling priority", "gtp.qos_traf_handl_prio", FT_UINT8, BASE_DEC, VALS(qos_traf_handl_prio), GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK,
-         "Traffic Handling Priority", HFILL}},
-       {&hf_gtp_qos_guar_ul,
-        {"Guaranteed bit rate for uplink", "gtp.qos_guar_ul", FT_UINT8, BASE_DEC, VALS(qos_guar_ul), 0, NULL, HFILL}},
-       {&hf_gtp_qos_guar_dl,
-        {"Guaranteed bit rate for downlink", "gtp.qos_guar_dl", FT_UINT8, BASE_DEC, VALS(qos_guar_dl), 0, NULL,
-         HFILL}},
-       {&hf_gtp_qos_src_stat_desc,
-                {"Source Statistics Descriptor", "gtp.src_stat_desc", FT_UINT8, BASE_DEC, VALS(src_stat_desc_vals), 0xf, NULL, HFILL}},
-       {&hf_gtp_qos_sig_ind,
-                {"Signalling Indication", "gtp.sig_ind", FT_BOOLEAN, 8, TFS(&gtp_sig_ind), 0x10, NULL, HFILL}},
-       {&hf_gtp_pkt_flow_id, {"Packet Flow ID", "gtp.pkt_flow_id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_ptmsi, {"P-TMSI", "gtp.ptmsi", FT_UINT32, BASE_HEX, NULL, 0, "Packet-Temporary Mobile Subscriber Identity", HFILL}},
-       {&hf_gtp_ptmsi_sig, {"P-TMSI Signature", "gtp.ptmsi_sig", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_rab_gtpu_dn, {"Downlink GTP-U seq number", "gtp.rab_gtp_dn", FT_UINT16, BASE_DEC, NULL, 0, "Downlink GTP-U sequence number", HFILL}},
-       {&hf_gtp_rab_gtpu_up, {"Uplink GTP-U seq number", "gtp.rab_gtp_up", FT_UINT16, BASE_DEC, NULL, 0, "Uplink GTP-U sequence number", HFILL}},
-       {&hf_gtp_rab_pdu_dn,
-        {"Downlink next PDCP-PDU seq number", "gtp.rab_pdu_dn", FT_UINT16, BASE_DEC, NULL, 0, "Downlink next PDCP-PDU sequence number", HFILL}},
-       {&hf_gtp_rab_pdu_up,
-        {"Uplink next PDCP-PDU seq number", "gtp.rab_pdu_up", FT_UINT16, BASE_DEC, NULL, 0, "Uplink next PDCP-PDU sequence number", HFILL}},
-       {&hf_gtp_rai_mcc, {"MCC", "gtp.mcc", FT_UINT16, BASE_DEC, NULL, 0, "Mobile Country Code", HFILL}},
-       {&hf_gtp_rai_mnc, {"MNC", "gtp.mnc", FT_UINT8, BASE_DEC, NULL, 0, "Mobile Network Code", HFILL}},
-       {&hf_gtp_rai_rac, {"RAC", "gtp.rac", FT_UINT8, BASE_DEC, NULL, 0, "Routing Area Code", HFILL}},
-       {&hf_gtp_rai_lac, {"LAC", "gtp.lac", FT_UINT16, BASE_DEC, NULL, 0, "Location Area Code", HFILL}},
-       {&hf_gtp_ranap_cause, {"RANAP cause", "gtp.ranap_cause", FT_UINT8, BASE_DEC, VALS(ranap_cause_type), 0, NULL, HFILL}},
-       {&hf_gtp_recovery, {"Recovery", "gtp.recovery", FT_UINT8, BASE_DEC, NULL, 0, "Restart counter", HFILL}},
-       {&hf_gtp_reorder, {"Reordering required", "gtp.reorder", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-       {&hf_gtp_rnc_ipv4, {"RNC address IPv4", "gtp.rnc_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Radio Network Controller address IPv4", HFILL}},
-       {&hf_gtp_rnc_ipv6, {"RNC address IPv6", "gtp.rnc_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Radio Network Controller address IPv6", HFILL}},
-       {&hf_gtp_rp, {"Radio Priority", "gtp.rp", FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_MASK, "Radio Priority for uplink tx", HFILL}},
-       {&hf_gtp_rp_nsapi,
-        {"NSAPI in Radio Priority", "gtp.rp_nsapi", FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_NSAPI_MASK,
-         "Network layer Service Access Point Identifier in Radio Priority", HFILL}},
-       {&hf_gtp_rp_sms, {"Radio Priority SMS", "gtp.rp_sms", FT_UINT8, BASE_DEC, NULL, 0, "Radio Priority for MO SMS", HFILL}},
-       {&hf_gtp_rp_spare, {"Reserved", "gtp.rp_spare", FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_SPARE_MASK, "Spare bit", HFILL}},
-       {&hf_gtp_sel_mode,
-        {"Selection mode", "gtp.sel_mode",
-         FT_UINT8, BASE_DEC, VALS(sel_mode_type), 0x03,
-         "Selection Mode", HFILL}
-        },
-       {&hf_gtp_seq_number, {"Sequence number", "gtp.seq_number", FT_UINT16, BASE_HEX, NULL, 0, "Sequence Number", HFILL}},
-       {&hf_gtp_sndcp_number, {"SNDCP N-PDU LLC Number", "gtp.sndcp_number", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_tear_ind, {"Teardown Indicator", "gtp.tear_ind", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
-       {&hf_gtp_teid, {"TEID", "gtp.teid", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier", HFILL}},
-       {&hf_gtp_teid_cp, {"TEID Control Plane", "gtp.teid_cp", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier Control Plane", HFILL}},
-       {&hf_gtp_ulink_teid_cp,
-        {"Uplink TEID Control Plane", "gtp.ulink_teid_cp", FT_UINT32, BASE_HEX, NULL, 0, "Uplink Tunnel Endpoint Identifier Control Plane", HFILL}},
-       {&hf_gtp_teid_data, {"TEID Data I", "gtp.teid_data", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier Data I", HFILL}},
-       {&hf_gtp_ulink_teid_data,
-        {"Uplink TEID Data I", "gtp.ulink_teid_data", FT_UINT32, BASE_HEX, NULL, 0, "UplinkTunnel Endpoint Identifier Data I", HFILL}},
-       {&hf_gtp_teid_ii, {"TEID Data II", "gtp.teid_ii", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier Data II", HFILL}},
-       {&hf_gtp_tft_code,
-        {"TFT operation code", "gtp.tft_code", FT_UINT8, BASE_DEC, VALS(tft_code_type), GTPv1_TFT_CODE_MASK, NULL, HFILL}},
-       {&hf_gtp_tft_spare, {"TFT spare bit", "gtp.tft_spare", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_SPARE_MASK, NULL, HFILL}},
-       {&hf_gtp_tft_number,
-        {"Number of packet filters", "gtp.tft_number", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_NUMBER_MASK, NULL, HFILL}},
-       {&hf_gtp_tft_eval, {"Evaluation precedence", "gtp.tft_eval", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_tid, {"TID", "gtp.tid", FT_STRING, BASE_NONE, NULL, 0, "Tunnel Identifier", HFILL}},
-       {&hf_gtp_tlli, {"TLLI", "gtp.tlli", FT_UINT32, BASE_HEX, NULL, 0, "Temporary Logical Link Identity", HFILL}},
-       {&hf_gtp_tr_comm, {"Packet transfer command", "gtp.tr_comm", FT_UINT8, BASE_DEC, VALS(tr_comm_type), 0, "Packat transfer command", HFILL}},
-       {&hf_gtp_trace_ref, {"Trace reference", "gtp.trace_ref", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_trace_type, {"Trace type", "gtp.trace_type", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_unknown, {"Unknown data (length)", "gtp.unknown", FT_UINT16, BASE_DEC, NULL, 0, "Unknown data", HFILL}},
-       {&hf_gtp_user_addr_pdp_org,
-        {"PDP type organization", "gtp.user_addr_pdp_org", FT_UINT8, BASE_DEC, VALS(pdp_org_type), 0, NULL, HFILL}},
-       {&hf_gtp_user_addr_pdp_type, {"PDP type number", "gtp.user_addr_pdp_type", FT_UINT8, BASE_HEX, VALS(pdp_type), 0, "PDP type", HFILL}},
-       {&hf_gtp_user_ipv4, {"End user address IPv4", "gtp.user_ipv4", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_user_ipv6, {"End user address IPv6", "gtp.user_ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL}},
-       {&hf_gtp_security_mode,
-        {"Security Mode", "gtp.security_mode",
-         FT_UINT8, BASE_DEC, VALS(mm_sec_modep), 0xc0,
-         NULL, HFILL}
-        },
-       {&hf_gtp_no_of_vectors,
-        {"No of Vectors", "gtp.no_of_vectors",
-         FT_UINT8, BASE_DEC, NULL, 0x38,
-         NULL, HFILL}
-        },
-       {&hf_gtp_cipher_algorithm,
-        {"Cipher Algorithm", "gtp.no_of_vectors",
-         FT_UINT8, BASE_DEC, VALS(gtp_cipher_algorithm), 0x07,
-         NULL, HFILL}
-        },
-       {&hf_gtp_cksn_ksi,
-        {"Ciphering Key Sequence Number (CKSN)/Key Set Identifier (KSI)", "gtp.cksn_ksi",
-         FT_UINT8, BASE_DEC, NULL, 0x07,
-         "CKSN/KSI", HFILL}
-        },
-       {&hf_gtp_cksn,
-        {"Ciphering Key Sequence Number (CKSN)", "gtp.cksn_ksi",
-         FT_UINT8, BASE_DEC, NULL, 0x07,
-         "CKSN", HFILL}
-        },
-       {&hf_gtp_ksi,
-        {"Key Set Identifier (KSI)", "gtp.cksn_ksi",
-         FT_UINT8, BASE_DEC, NULL, 0x07,
-         "KSI", HFILL}
-        },
-       {&hf_gtp_ext_length,
-        {"Length", "gtp.ext_length",
-         FT_UINT16, BASE_DEC, NULL, 0x0,
-         "IE Length", HFILL}
-        },
-       {&hf_gtp_ext_apn_res,
-        {"Restriction Type", "gtp.ext_apn_res",
-         FT_UINT8, BASE_DEC, NULL, 0x0,
-         NULL, HFILL}
-        },
-       {&hf_gtp_ext_rat_type,   
-      {"RAT Type", "gtp.ext_rat_type",   
-       FT_UINT8, BASE_DEC, VALS(gtp_ext_rat_type_vals), 0x0,   
-       NULL, HFILL}   
-     }, 
-       {&hf_gtp_ext_geo_loc_type,
-        {"Geographic Location Type", "gtp.ext_geo_loc_type",
-         FT_UINT8, BASE_DEC, NULL, 0x0,
-         NULL, HFILL}
-        },
-       {&hf_gtp_ext_sac,
-        {"SAC", "gtp.ext_sac",
-         FT_UINT16, BASE_HEX, NULL, 0x0,
-         NULL, HFILL}
-        },
-       {&hf_gtp_ext_imeisv,
-        {"IMEI(SV)", "gtp.ext_imeisv",
-         FT_STRING, BASE_NONE, NULL, 0x0,
-         NULL, HFILL}
-        },
-    { &hf_gtp_targetRNC_ID,
-      { "targetRNC-ID", "gtp.targetRNC_ID",
-        FT_NONE, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
-       {&hf_gtp_bssgp_cause,
-        {"BSSGP Cause", "gtp.bssgp_cause",
-         FT_UINT8, BASE_DEC, VALS(tab_cause), 0,
-         NULL, HFILL}},
-       {&hf_gtp_sapi,
-        {"PS Handover XID SAPI", "gtp.ps_handover_xid_sapi",
-         FT_UINT8, BASE_DEC, NULL, 0x0F,
-         "SAPI", HFILL}},
-       {&hf_gtp_xid_par_len,
-        {"PS Handover XID parameter length", "gtp.ps_handover_xid_par_len",
-         FT_UINT8, BASE_DEC, NULL, 0xFF,
-         "XID parameter length", HFILL}},
-       {&hf_gtp_cmn_flg_ppc,
-        {"Prohibit Payload Compression", "gtp.cmn_flg.ppc",
-         FT_BOOLEAN, 8, NULL, 0x01,
-         NULL, HFILL}},
-       {&hf_gtp_cmn_flg_mbs_srv_type,
-        {"MBMS Service Type", "gtp.cmn_flg.mbs_srv_type",
-         FT_BOOLEAN, 8, NULL, 0x02,
-         NULL, HFILL}},
-       {&hf_gtp_cmn_flg_mbs_ran_pcd_rdy,
-        {"RAN Procedures Ready", "gtp.cmn_flg.ran_pcd_rd",
-         FT_BOOLEAN, 8, NULL, 0x04,
-         NULL, HFILL}},
-       {&hf_gtp_cmn_flg_mbs_cnt_inf,
-        {"MBMS Counting Information", "gtp.cmn_flg.mbs_cnt_inf",
-         FT_BOOLEAN, 8, NULL, 0x08,
-         NULL, HFILL}},
-       {&hf_gtp_cmn_flg_no_qos_neg,
-        {"No QoS negotiation", "gtp.cmn_flg.no_qos_neg",
-         FT_BOOLEAN, 8, NULL, 0x10,
-         NULL, HFILL}},
-       {&hf_gtp_cmn_flg_nrsn,
-        {"NRSN bit field", "gtp.cmn_flg.nrsn",
-         FT_BOOLEAN, 8, NULL, 0x20,
-         NULL, HFILL}},
-       {&hf_gtp_cmn_flg_upgrd_qos_sup,
-        {"Upgrade QoS Supported", "gtp.cmn_flg.ran_pcd_rd",
-         FT_BOOLEAN, 8, NULL, 0x40,
-         NULL, HFILL}},
-       {&hf_gtp_tmgi,
-        {"Temporary Mobile Group Identity (TMGI)", "gtp.cmn_flg.ran_pcd_rd",
-         FT_BYTES, BASE_NONE, NULL, 0x0,
-         NULL, HFILL}},
-       {&hf_gtp_no_of_mbms_sa_codes,
-        {"Number of MBMS service area codes", "gtp.no_of_mbms_sa_codes",
-         FT_UINT8, BASE_DEC, NULL, 0x0,
-         "Number N of MBMS service area codes", HFILL}
-        },
-       {&hf_gtp_mbms_ses_dur_days,
-        {"Estimated session duration days", "gtp.mbms_ses_dur_days",
-         FT_UINT8, BASE_DEC, NULL, 0xfe,
-         NULL, HFILL}
-        },
-       {&hf_gtp_mbms_ses_dur_s,
-        {"Estimated session duration seconds", "gtp.mbms_ses_dur_s",
-         FT_UINT24, BASE_DEC, NULL, 0x01ffff,
-         NULL, HFILL}
-        },
-       {&hf_gtp_mbms_sa_code,
-        {"MBMS service area code", "gtp.mbms_sa_code",
-         FT_UINT16, BASE_DEC, NULL, 0x0,
-         NULL, HFILL}
-        },
-       {&hf_gtp_mbs_2g_3g_ind,
-        {"MBMS 2G/3G Indicator", "gtp.mbs_2g_3g_ind",
-         FT_UINT8, BASE_DEC, VALS(gtp_mbs_2g_3g_ind_vals), 0x0,
-         NULL, HFILL}
-        },
-       {&hf_gtp_time_2_dta_tr,
-        {"Time to MBMS Data Transfer", "gtp.time_2_dta_tr",
-         FT_UINT8, BASE_DEC, NULL, 0x0,
-         NULL, HFILL}
-        },
-        { &hf_gtp_ext_ei,
-        {"Error Indication (EI)", "gtp.ei",
-         FT_UINT8, BASE_DEC, NULL, 0x04,
-         NULL, HFILL}
-        },
-        {&hf_gtp_ext_gcsi,
-        {"GPRS-CSI (GCSI)", "gtp.gcsi",
-         FT_UINT8, BASE_DEC, NULL, 0x02,
-         NULL, HFILL}
-        },
-        { &hf_gtp_ext_dti,
-        {"Direct Tunnel Indicator (DTI)", "gtp.dti",
-         FT_UINT8, BASE_DEC, NULL, 0x01,
-         NULL, HFILL}
-        },
+        {&hf_gtp_response_in,
+         {"Response In", "gtp.response_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "The response to this GTP request is in this frame", HFILL}},
+        {&hf_gtp_response_to,
+         {"Response To", "gtp.response_to", FT_FRAMENUM, BASE_NONE, NULL, 0x0, "This is a response to the GTP request in this frame", HFILL}},
+        {&hf_gtp_time, {"Time", "gtp.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "The time between the Request and the Response", HFILL}},
+        {&hf_gtp_apn, {"APN", "gtp.apn", FT_STRING, BASE_NONE, NULL, 0, "Access Point Name", HFILL}},
+        {&hf_gtp_cause, {"Cause", "gtp.cause", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &cause_type_ext, 0, "Cause of operation", HFILL}},
+        {&hf_gtp_chrg_char, {"Charging characteristics", "gtp.chrg_char", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_chrg_char_s, {"Spare", "gtp.chrg_char_s", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_S, NULL, HFILL}},
+        {&hf_gtp_chrg_char_n, {"Normal charging", "gtp.chrg_char_n", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_N, NULL, HFILL}},
+        {&hf_gtp_chrg_char_p, {"Prepaid charging", "gtp.chrg_char_p", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_P, NULL, HFILL}},
+        {&hf_gtp_chrg_char_f,
+         {"Flat rate charging", "gtp.chrg_char_f", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_F, NULL, HFILL}},
+        {&hf_gtp_chrg_char_h,
+         {"Hot billing charging", "gtp.chrg_char_h", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_H, NULL, HFILL}},
+        {&hf_gtp_chrg_char_r, {"Reserved", "gtp.chrg_char_r", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_R, NULL, HFILL}},
+        {&hf_gtp_chrg_id, {"Charging ID", "gtp.chrg_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_chrg_ipv4, {"CG address IPv4", "gtp.chrg_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Charging Gateway address IPv4", HFILL}},
+        {&hf_gtp_chrg_ipv6, {"CG address IPv6", "gtp.chrg_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Charging Gateway address IPv6", HFILL}},
+        {&hf_gtp_ext_flow_label, {"Flow Label Data I", "gtp.ext_flow_label", FT_UINT16, BASE_HEX, NULL, 0, "Flow label data", HFILL}},
+        {&hf_gtp_ext_id, {"Extension identifier", "gtp.ext_id", FT_UINT16, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0, NULL, HFILL}},
+        {&hf_gtp_ext_val, {"Extension value", "gtp.ext_val", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_flags, {"Flags", "gtp.flags", FT_UINT8, BASE_HEX, NULL, 0, "Ver/PT/Spare...", HFILL}},
+        {&hf_gtp_ext_hdr, {"Extension header", "gtp.ext_hdr", FT_UINT8, BASE_HEX, VALS(next_extension_header_fieldvals), 0, NULL, HFILL}},
+        {&hf_gtp_ext_hdr_next, {"Next extension header", "gtp.ext_hdr.next", FT_UINT8, BASE_HEX, VALS(next_extension_header_fieldvals), 0, NULL, HFILL}},
+        {&hf_gtp_ext_hdr_pdcpsn, {"PDCP Sequence Number", "gtp.ext_hdr.pdcp_sn", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_ext_hdr_length, {"Extension Header Length", "gtp.ext_hdr.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_flags_ver,
+         {"Version", "gtp.flags.version",
+          FT_UINT8, BASE_DEC, VALS(ver_types), GTP_VER_MASK,
+          "GTP Version", HFILL}
+        },
+        {&hf_gtp_prime_flags_ver,
+         {"Version", "gtp.prim.flags.version",
+          FT_UINT8, BASE_DEC,NULL, GTP_VER_MASK,
+          "GTP' Version", HFILL}
+        },
+        {&hf_gtp_flags_pt,
+         {"Protocol type", "gtp.flags.payload",
+          FT_UINT8, BASE_DEC, VALS(pt_types), GTP_PT_MASK,
+          NULL, HFILL}
+        },
+        {&hf_gtp_flags_spare1,
+         {"Reserved", "gtp.flags.reserved",
+          FT_UINT8, BASE_DEC, NULL, GTP_SPARE1_MASK,
+          "Reserved (shall be sent as '111' )", HFILL}
+        },
+        {&hf_gtp_flags_hdr_length,
+         {"Header length", "gtp.flags._hdr_length",
+          FT_BOOLEAN, 8,  TFS(&gtp_hdr_length_vals), 0x01,
+          NULL, HFILL}
+               },
+               {&hf_gtp_flags_snn,
+         {"Is SNDCP N-PDU included?", "gtp.flags.snn", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_SNN_MASK,
+          "Is SNDCP N-PDU LLC Number included? (1 = yes, 0 = no)", HFILL}},
+        {&hf_gtp_flags_spare2,
+         {"Reserved", "gtp.flags.reserved", FT_UINT8, BASE_DEC, NULL, GTP_SPARE2_MASK, "Reserved (shall be sent as '1' )", HFILL}},
+        {&hf_gtp_flags_e,
+         {"Is Next Extension Header present?", "gtp.flags.e", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_E_MASK,
+          "Is Next Extension Header present? (1 = yes, 0 = no)", HFILL}},
+        {&hf_gtp_flags_s,
+         {"Is Sequence Number present?", "gtp.flags.s", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_S_MASK, "Is Sequence Number present? (1 = yes, 0 = no)",
+          HFILL}},
+        {&hf_gtp_flags_pn,
+         {"Is N-PDU number present?", "gtp.flags.pn", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_PN_MASK, "Is N-PDU number present? (1 = yes, 0 = no)",
+          HFILL}},
+        {&hf_gtp_flow_ii, {"Flow Label Data II", "gtp.flow_ii", FT_UINT16, BASE_DEC, NULL, 0, "Downlink flow label data", HFILL}},
+        {&hf_gtp_flow_label, {"Flow label", "gtp.flow_label", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_flow_sig, {"Flow label Signalling", "gtp.flow_sig", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_gsn_addr_len,
+         {"GSN Address Length", "gtp.gsn_addr_len", FT_UINT8, BASE_DEC, NULL, GTP_EXT_GSN_ADDR_LEN_MASK, NULL, HFILL}},
+        {&hf_gtp_gsn_addr_type,
+         {"GSN Address Type", "gtp.gsn_addr_type", FT_UINT8, BASE_DEC, VALS(gsn_addr_type), GTP_EXT_GSN_ADDR_TYPE_MASK, NULL, HFILL}},
+        {&hf_gtp_gsn_ipv4, {"GSN address IPv4", "gtp.gsn_ipv4", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_gsn_ipv6, {"GSN address IPv6", "gtp.gsn_ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_imsi, {"IMSI", "gtp.imsi", FT_STRING, BASE_NONE, NULL, 0, "International Mobile Subscriber Identity number", HFILL}},
+        {&hf_gtp_length, {"Length", "gtp.length", FT_UINT16, BASE_DEC, NULL, 0, "Length (i.e. number of octets after TID or TEID)", HFILL}},
+        {&hf_gtp_map_cause, {"MAP cause", "gtp.map_cause", FT_UINT8, BASE_DEC, VALS(gsm_old_GSMMAPLocalErrorcode_vals), 0, NULL, HFILL}},
+        {&hf_gtp_message_type, {"Message Type", "gtp.message", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &gtp_message_type_ext, 0x0, "GTP Message Type", HFILL}},
+        {&hf_gtp_ms_reason,
+         {"MS not reachable reason", "gtp.ms_reason", FT_UINT8, BASE_DEC, VALS(ms_not_reachable_type), 0, NULL, HFILL}},
+        {&hf_gtp_ms_valid, {"MS validated", "gtp.ms_valid", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+        {&hf_gtp_msisdn, {"MSISDN", "gtp.msisdn", FT_STRING, BASE_NONE, NULL, 0, "MS international PSTN/ISDN number", HFILL}},
+        {&hf_gtp_next,
+         {"Next extension header type", "gtp.next", FT_UINT8, BASE_HEX, VALS(next_extension_header_fieldvals), 0, NULL,
+          HFILL}},
+        {&hf_gtp_node_ipv4, {"Node address IPv4", "gtp.node_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Recommended node address IPv4", HFILL}},
+        {&hf_gtp_node_ipv6, {"Node address IPv6", "gtp.node_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Recommended node address IPv6", HFILL}},
+        {&hf_gtp_npdu_number, {"N-PDU Number", "gtp.npdu_number", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_nsapi, {"NSAPI", "gtp.nsapi", FT_UINT8, BASE_DEC, NULL, 0, "Network layer Service Access Point Identifier", HFILL}},
+        {&hf_gtp_qos_version, {"Version", "gtp.qos_version", FT_STRING, BASE_NONE, NULL, 0, "Version of the QoS Profile", HFILL}},
+        {&hf_gtp_qos_spare1, {"Spare", "gtp.qos_spare1", FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE1_MASK, "Spare (shall be sent as '00' )", HFILL}},
+        {&hf_gtp_qos_delay,
+         {"QoS delay", "gtp.qos_delay", FT_UINT8, BASE_DEC, VALS(qos_delay_type), GTP_EXT_QOS_DELAY_MASK, "Quality of Service Delay Class", HFILL}},
+        {&hf_gtp_qos_reliability,
+         {"QoS reliability", "gtp.qos_reliability", FT_UINT8, BASE_DEC, VALS(qos_reliability_type), GTP_EXT_QOS_RELIABILITY_MASK,
+          "Quality of Service Reliability Class", HFILL}},
+        {&hf_gtp_qos_peak,
+         {"QoS peak", "gtp.qos_peak", FT_UINT8, BASE_DEC, VALS(qos_peak_type), GTP_EXT_QOS_PEAK_MASK, "Quality of Service Peak Throughput", HFILL}},
+        {&hf_gtp_qos_spare2, {"Spare", "gtp.qos_spare2", FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE2_MASK, "Spare (shall be sent as 0)", HFILL}},
+        {&hf_gtp_qos_precedence,
+         {"QoS precedence", "gtp.qos_precedence", FT_UINT8, BASE_DEC, VALS(qos_precedence_type), GTP_EXT_QOS_PRECEDENCE_MASK,
+          "Quality of Service Precedence Class", HFILL}},
+        {&hf_gtp_qos_spare3,
+         {"Spare", "gtp.qos_spare3", FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE3_MASK, "Spare (shall be sent as '000' )", HFILL}},
+        {&hf_gtp_qos_mean,
+         {"QoS mean", "gtp.qos_mean", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &qos_mean_type_ext, GTP_EXT_QOS_MEAN_MASK, "Quality of Service Mean Throughput", HFILL}},
+        {&hf_gtp_qos_al_ret_priority,
+         {"Allocation/Retention priority", "gtp.qos_al_ret_priority", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_qos_traf_class,
+         {"Traffic class", "gtp.qos_traf_class", FT_UINT8, BASE_DEC, VALS(qos_traf_class), GTP_EXT_QOS_TRAF_CLASS_MASK, NULL, HFILL}},
+        {&hf_gtp_qos_del_order,
+         {"Delivery order", "gtp.qos_del_order", FT_UINT8, BASE_DEC, VALS(qos_del_order), GTP_EXT_QOS_DEL_ORDER_MASK, NULL, HFILL}},
+        {&hf_gtp_qos_del_err_sdu,
+         {"Delivery of erroneous SDU", "gtp.qos_del_err_sdu", FT_UINT8, BASE_DEC, VALS(qos_del_err_sdu), GTP_EXT_QOS_DEL_ERR_SDU_MASK,
+          NULL, HFILL}},
+        {&hf_gtp_qos_max_sdu_size,
+         {"Maximum SDU size", "gtp.qos_max_sdu_size", FT_UINT8, BASE_DEC, VALS(qos_max_sdu_size), 0, NULL, HFILL}},
+        {&hf_gtp_qos_max_ul,
+         {"Maximum bit rate for uplink", "gtp.qos_max_ul", FT_UINT8, BASE_DEC, VALS(qos_max_ul), 0, NULL, HFILL}},
+        {&hf_gtp_qos_max_dl,
+         {"Maximum bit rate for downlink", "gtp.qos_max_dl", FT_UINT8, BASE_DEC, VALS(qos_max_dl), 0, NULL, HFILL}},
+        {&hf_gtp_qos_res_ber,
+         {"Residual BER", "gtp.qos_res_ber", FT_UINT8, BASE_DEC, VALS(qos_res_ber), GTP_EXT_QOS_RES_BER_MASK, "Residual Bit Error Rate", HFILL}},
+        {&hf_gtp_qos_sdu_err_ratio,
+         {"SDU Error ratio", "gtp.qos_sdu_err_ratio", FT_UINT8, BASE_DEC, VALS(qos_sdu_err_ratio), GTP_EXT_QOS_SDU_ERR_RATIO_MASK, NULL,
+          HFILL}},
+        {&hf_gtp_qos_trans_delay,
+         {"Transfer delay", "gtp.qos_trans_delay", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &qos_trans_delay_ext, GTP_EXT_QOS_TRANS_DELAY_MASK, NULL, HFILL}},
+        {&hf_gtp_qos_traf_handl_prio,
+         {"Traffic handling priority", "gtp.qos_traf_handl_prio", FT_UINT8, BASE_DEC, VALS(qos_traf_handl_prio), GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK,
+          NULL, HFILL}},
+        {&hf_gtp_qos_guar_ul,
+         {"Guaranteed bit rate for uplink", "gtp.qos_guar_ul", FT_UINT8, BASE_DEC, VALS(qos_guar_ul), 0, NULL, HFILL}},
+        {&hf_gtp_qos_guar_dl,
+         {"Guaranteed bit rate for downlink", "gtp.qos_guar_dl", FT_UINT8, BASE_DEC, VALS(qos_guar_dl), 0, NULL,
+          HFILL}},
+        {&hf_gtp_qos_src_stat_desc,
+         {"Source Statistics Descriptor", "gtp.src_stat_desc", FT_UINT8, BASE_DEC, VALS(src_stat_desc_vals), GTP_EXT_QOS_SRC_STAT_DESC_MASK, NULL, HFILL}},
+        {&hf_gtp_qos_sig_ind,
+         {"Signalling Indication", "gtp.sig_ind", FT_BOOLEAN, 8, TFS(&gtp_sig_ind), GTP_EXT_QOS_SIG_IND_MASK, NULL, HFILL}},
+        {&hf_gtp_pkt_flow_id, {"Packet Flow ID", "gtp.pkt_flow_id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_ptmsi, {"P-TMSI", "gtp.ptmsi", FT_UINT32, BASE_HEX, NULL, 0, "Packet-Temporary Mobile Subscriber Identity", HFILL}},
+        {&hf_gtp_ptmsi_sig, {"P-TMSI Signature", "gtp.ptmsi_sig", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_rab_gtpu_dn, {"Downlink GTP-U seq number", "gtp.rab_gtp_dn", FT_UINT16, BASE_DEC, NULL, 0, "Downlink GTP-U sequence number", HFILL}},
+        {&hf_gtp_rab_gtpu_up, {"Uplink GTP-U seq number", "gtp.rab_gtp_up", FT_UINT16, BASE_DEC, NULL, 0, "Uplink GTP-U sequence number", HFILL}},
+        {&hf_gtp_rab_pdu_dn,
+         {"Downlink next PDCP-PDU seq number", "gtp.rab_pdu_dn", FT_UINT16, BASE_DEC, NULL, 0, "Downlink next PDCP-PDU sequence number", HFILL}},
+        {&hf_gtp_rab_pdu_up,
+         {"Uplink next PDCP-PDU seq number", "gtp.rab_pdu_up", FT_UINT16, BASE_DEC, NULL, 0, "Uplink next PDCP-PDU sequence number", HFILL}},
+        {&hf_gtp_rai_rac, {"RAC", "gtp.rac", FT_UINT8, BASE_DEC, NULL, 0, "Routing Area Code", HFILL}},
+        {&hf_gtp_rai_lac, {"LAC", "gtp.lac", FT_UINT16, BASE_DEC, NULL, 0, "Location Area Code", HFILL}},
+        {&hf_gtp_ranap_cause, {"RANAP cause", "gtp.ranap_cause", FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ranap_cause_type_ext, 0, NULL, HFILL}},
+        {&hf_gtp_recovery, {"Recovery", "gtp.recovery", FT_UINT8, BASE_DEC, NULL, 0, "Restart counter", HFILL}},
+        {&hf_gtp_reorder, {"Reordering required", "gtp.reorder", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+        {&hf_gtp_rnc_ipv4, {"RNC address IPv4", "gtp.rnc_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Radio Network Controller address IPv4", HFILL}},
+        {&hf_gtp_rnc_ipv6, {"RNC address IPv6", "gtp.rnc_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Radio Network Controller address IPv6", HFILL}},
+        {&hf_gtp_rp, {"Radio Priority", "gtp.rp", FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_MASK, "Radio Priority for uplink tx", HFILL}},
+        {&hf_gtp_rp_nsapi,
+         {"NSAPI in Radio Priority", "gtp.rp_nsapi", FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_NSAPI_MASK,
+          "Network layer Service Access Point Identifier in Radio Priority", HFILL}},
+        {&hf_gtp_rp_sms, {"Radio Priority SMS", "gtp.rp_sms", FT_UINT8, BASE_DEC, NULL, 0, "Radio Priority for MO SMS", HFILL}},
+        {&hf_gtp_rp_spare, {"Reserved", "gtp.rp_spare", FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_SPARE_MASK, "Spare bit", HFILL}},
+        {&hf_gtp_sel_mode,
+         {"Selection mode", "gtp.sel_mode",
+          FT_UINT8, BASE_DEC, VALS(sel_mode_type), 0x03,
+          NULL, HFILL}
+        },
+        {&hf_gtp_seq_number, {"Sequence number", "gtp.seq_number", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_sndcp_number, {"SNDCP N-PDU LLC Number", "gtp.sndcp_number", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_tear_ind, {"Teardown Indicator", "gtp.tear_ind", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+        {&hf_gtp_teid, {"TEID", "gtp.teid", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier", HFILL}},
+        {&hf_gtp_teid_cp, {"TEID Control Plane", "gtp.teid_cp", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier Control Plane", HFILL}},
+        {&hf_gtp_ulink_teid_cp,
+         {"Uplink TEID Control Plane", "gtp.ulink_teid_cp", FT_UINT32, BASE_HEX, NULL, 0, "Uplink Tunnel Endpoint Identifier Control Plane", HFILL}},
+        {&hf_gtp_teid_data, {"TEID Data I", "gtp.teid_data", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier Data I", HFILL}},
+        {&hf_gtp_ulink_teid_data,
+         {"Uplink TEID Data I", "gtp.ulink_teid_data", FT_UINT32, BASE_HEX, NULL, 0, "UplinkTunnel Endpoint Identifier Data I", HFILL}},
+        {&hf_gtp_teid_ii, {"TEID Data II", "gtp.teid_ii", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier Data II", HFILL}},
+        {&hf_gtp_tft_code,
+         {"TFT operation code", "gtp.tft_code", FT_UINT8, BASE_DEC, VALS(tft_code_type), GTPv1_TFT_CODE_MASK, NULL, HFILL}},
+        {&hf_gtp_tft_spare, {"TFT spare bit", "gtp.tft_spare", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_SPARE_MASK, NULL, HFILL}},
+        {&hf_gtp_tft_number,
+         {"Number of packet filters", "gtp.tft_number", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_NUMBER_MASK, NULL, HFILL}},
+        {&hf_gtp_tft_eval, {"Evaluation precedence", "gtp.tft_eval", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_tid, {"TID", "gtp.tid", FT_STRING, BASE_NONE, NULL, 0, "Tunnel Identifier", HFILL}},
+        {&hf_gtp_tlli, {"TLLI", "gtp.tlli", FT_UINT32, BASE_HEX, NULL, 0, "Temporary Logical Link Identity", HFILL}},
+        {&hf_gtp_tr_comm, {"Packet transfer command", "gtp.tr_comm", FT_UINT8, BASE_DEC, VALS(tr_comm_type), 0, "Packat transfer command", HFILL}},
+        {&hf_gtp_trace_ref, {"Trace reference", "gtp.trace_ref", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_trace_type, {"Trace type", "gtp.trace_type", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_unknown, {"Unknown data (length)", "gtp.unknown", FT_UINT16, BASE_DEC, NULL, 0, "Unknown data", HFILL}},
+        {&hf_gtp_user_addr_pdp_org,
+         {"PDP type organization", "gtp.user_addr_pdp_org", FT_UINT8, BASE_DEC, VALS(pdp_org_type), 0, NULL, HFILL}},
+        {&hf_gtp_user_addr_pdp_type, {"PDP type number", "gtp.user_addr_pdp_type", FT_UINT8, BASE_HEX, VALS(pdp_type), 0, "PDP type", HFILL}},
+        {&hf_gtp_user_ipv4, {"End user address IPv4", "gtp.user_ipv4", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_user_ipv6, {"End user address IPv6", "gtp.user_ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL}},
+        {&hf_gtp_security_mode,
+         {"Security Mode", "gtp.security_mode",
+          FT_UINT8, BASE_DEC, VALS(mm_sec_modep), 0xc0,
+          NULL, HFILL}
+        },
+        {&hf_gtp_no_of_vectors,
+         {"No of Vectors", "gtp.no_of_vectors",
+          FT_UINT8, BASE_DEC, NULL, 0x38,
+          NULL, HFILL}
+        },
+        {&hf_gtp_cipher_algorithm,
+         {"Cipher Algorithm", "gtp.cipher_algorithm",
+          FT_UINT8, BASE_DEC, VALS(gtp_cipher_algorithm), 0x07,
+          NULL, HFILL}
+        },
+        {&hf_gtp_cksn_ksi,
+         {"Ciphering Key Sequence Number (CKSN)/Key Set Identifier (KSI)", "gtp.cksn_ksi",
+          FT_UINT8, BASE_DEC, NULL, 0x07,
+          "CKSN/KSI", HFILL}
+        },
+        {&hf_gtp_cksn,
+         {"Ciphering Key Sequence Number (CKSN)", "gtp.cksn",
+          FT_UINT8, BASE_DEC, NULL, 0x07,
+          "CKSN", HFILL}
+        },
+        {&hf_gtp_ksi,
+         {"Key Set Identifier (KSI)", "gtp.ksi",
+          FT_UINT8, BASE_DEC, NULL, 0x07,
+          "KSI", HFILL}
+        },
+        {&hf_gtp_ext_length,
+         {"Length", "gtp.ext_length",
+          FT_UINT16, BASE_DEC, NULL, 0x0,
+          "IE Length", HFILL}
+        },
+        {&hf_gtp_ext_apn_res,
+         {"Restriction Type", "gtp.ext_apn_res",
+          FT_UINT8, BASE_DEC, NULL, 0x0,
+          NULL, HFILL}
+        },
+        {&hf_gtp_ext_rat_type,
+         {"RAT Type", "gtp.ext_rat_type",
+          FT_UINT8, BASE_DEC, VALS(gtp_ext_rat_type_vals), 0x0,
+          NULL, HFILL}
+        },
+        {&hf_gtp_ext_geo_loc_type,
+         {"Geographic Location Type", "gtp.ext_geo_loc_type",
+          FT_UINT8, BASE_DEC, NULL, 0x0,
+          NULL, HFILL}
+        },
+        {&hf_gtp_ext_sac,
+         {"SAC", "gtp.ext_sac",
+          FT_UINT16, BASE_HEX, NULL, 0x0,
+          NULL, HFILL}
+        },
+        {&hf_gtp_ext_imeisv,
+         {"IMEI(SV)", "gtp.ext_imeisv",
+          FT_STRING, BASE_NONE, NULL, 0x0,
+          NULL, HFILL}
+        },
+        { &hf_gtp_targetRNC_ID,
+          { "targetRNC-ID", "gtp.targetRNC_ID",
+            FT_NONE, BASE_NONE, NULL, 0,
+            NULL, HFILL }},
+        {&hf_gtp_bssgp_cause,
+         {"BSSGP Cause", "gtp.bssgp_cause",
+          FT_UINT8, BASE_DEC|BASE_EXT_STRING, &bssgp_cause_vals_ext, 0,
+          NULL, HFILL}},
+        { &hf_gtp_bssgp_ra_discriminator,
+          { "Routing Address Discriminator", "gtp.bssgp.rad",
+            FT_UINT8, BASE_DEC, VALS(gtp_bssgp_ra_discriminator_vals), 0x0f,
+            NULL, HFILL }
+        },
+        {&hf_gtp_sapi,
+         {"PS Handover XID SAPI", "gtp.ps_handover_xid_sapi",
+          FT_UINT8, BASE_DEC, NULL, 0x0F,
+          "SAPI", HFILL}},
+        {&hf_gtp_xid_par_len,
+         {"PS Handover XID parameter length", "gtp.ps_handover_xid_par_len",
+          FT_UINT8, BASE_DEC, NULL, 0xFF,
+          "XID parameter length", HFILL}},
+        {&hf_gtp_earp_pvi,
+         {"PVI Pre-emption Vulnerability", "gtp.EARP_pre_emption_par_vulnerability",
+          FT_UINT8, BASE_DEC, NULL, 0x01,
+          NULL, HFILL}},
+        {&hf_gtp_earp_pl,
+         {"PL Priority Level", "gtp.EARP_priority_level",
+          FT_UINT8, BASE_DEC, NULL, 0x3C,
+          NULL, HFILL}},
+        {&hf_gtp_earp_pci,
+         {"PCI Pre-emption Capability", "gtp.EARP_pre_emption_Capability",
+          FT_UINT8, BASE_DEC, NULL, 0x40,
+          NULL, HFILL}},
+        {&hf_gtp_cdr_app,
+         {"Application Identifier", "gtp.cdr_app",
+          FT_UINT8, BASE_DEC, NULL, 0xf0,
+          NULL, HFILL}},
+        { &hf_gtp_cdr_rel,
+         {"Release Identifier", "gtp.cdr_rel",
+          FT_UINT8, BASE_DEC, NULL, 0x0f,
+          NULL, HFILL}},
+        { &hf_gtp_cdr_ver,
+         {"Version Identifier", "gtp.cdr_ver",
+          FT_UINT8, BASE_DEC, NULL, 0x0,
+          NULL, HFILL}},
+        {&hf_gtp_spare,
+         {"Spare", "gtp.spare",
+          FT_UINT8, BASE_DEC, NULL, 0x02,
+          NULL, HFILL}},
+        {&hf_gtp_cmn_flg_ppc,
+         {"Prohibit Payload Compression", "gtp.cmn_flg.ppc",
+          FT_BOOLEAN, 8, NULL, 0x01,
+          NULL, HFILL}},
+        {&hf_gtp_cmn_flg_mbs_srv_type,
+         {"MBMS Service Type", "gtp.cmn_flg.mbs_srv_type",
+          FT_BOOLEAN, 8, NULL, 0x02,
+          NULL, HFILL}},
+        {&hf_gtp_cmn_flg_mbs_ran_pcd_rdy,
+         {"RAN Procedures Ready", "gtp.cmn_flg.mbs_ran_pcd_rdy",
+          FT_BOOLEAN, 8, NULL, 0x04,
+          NULL, HFILL}},
+        {&hf_gtp_cmn_flg_mbs_cnt_inf,
+         {"MBMS Counting Information", "gtp.cmn_flg.mbs_cnt_inf",
+          FT_BOOLEAN, 8, NULL, 0x08,
+          NULL, HFILL}},
+        {&hf_gtp_cmn_flg_no_qos_neg,
+         {"No QoS negotiation", "gtp.cmn_flg.no_qos_neg",
+          FT_BOOLEAN, 8, NULL, 0x10,
+          NULL, HFILL}},
+        {&hf_gtp_cmn_flg_nrsn,
+         {"NRSN bit field", "gtp.cmn_flg.nrsn",
+          FT_BOOLEAN, 8, NULL, 0x20,
+          NULL, HFILL}},
+        {&hf_gtp_cmn_flg_upgrd_qos_sup,
+         {"Upgrade QoS Supported", "gtp.cmn_flg.upgrd_qos_sup",
+          FT_BOOLEAN, 8, NULL, 0x40,
+          NULL, HFILL}},
+        {&hf_gtp_tmgi,
+         {"Temporary Mobile Group Identity (TMGI)", "gtp.tmgi",
+          FT_BYTES, BASE_NONE, NULL, 0x0,
+          NULL, HFILL}},
+        {&hf_gtp_no_of_mbms_sa_codes,
+         {"Number of MBMS service area codes", "gtp.no_of_mbms_sa_codes",
+          FT_UINT8, BASE_DEC, NULL, 0x0,
+          "Number N of MBMS service area codes", HFILL}
+        },
+        {&hf_gtp_mbms_ses_dur_days,
+         {"Estimated session duration days", "gtp.mbms_ses_dur_days",
+          FT_UINT8, BASE_DEC, NULL, 0xfe,
+          NULL, HFILL}
+        },
+        {&hf_gtp_mbms_ses_dur_s,
+         {"Estimated session duration seconds", "gtp.mbms_ses_dur_s",
+          FT_UINT24, BASE_DEC, NULL, 0x01ffff,
+          NULL, HFILL}
+        },
+        {&hf_gtp_mbms_sa_code,
+         {"MBMS service area code", "gtp.mbms_sa_code",
+          FT_UINT16, BASE_DEC, NULL, 0x0,
+          NULL, HFILL}
+        },
+        {&hf_gtp_mbs_2g_3g_ind,
+         {"MBMS 2G/3G Indicator", "gtp.mbs_2g_3g_ind",
+          FT_UINT8, BASE_DEC, VALS(gtp_mbs_2g_3g_ind_vals), 0x0,
+          NULL, HFILL}
+        },
+        {&hf_gtp_time_2_dta_tr,
+         {"Time to MBMS Data Transfer", "gtp.time_2_dta_tr",
+          FT_UINT8, BASE_DEC, NULL, 0x0,
+          NULL, HFILL}
+        },
+        { &hf_gtp_ext_ei,
+          {"Error Indication (EI)", "gtp.ei",
+           FT_UINT8, BASE_DEC, NULL, 0x04,
+           NULL, HFILL}
+        },
+        {&hf_gtp_ext_gcsi,
+         {"GPRS-CSI (GCSI)", "gtp.gcsi",
+          FT_UINT8, BASE_DEC, NULL, 0x02,
+          NULL, HFILL}
+        },
+        { &hf_gtp_ext_dti,
+          {"Direct Tunnel Indicator (DTI)", "gtp.dti",
+           FT_UINT8, BASE_DEC, NULL, 0x01,
+           NULL, HFILL}
+        },
+        { &hf_gtp_ra_prio_lcs,
+          {"Radio Priority LCS", "gtp.raplcs",
+           FT_UINT8, BASE_DEC, NULL, 0x07,
+           NULL, HFILL}
+        },
+        { &hf_gtp_bcm,
+         {"Bearer Control Mode", "gtp.bcm",
+          FT_UINT8, BASE_DEC, VALS(gtp_pdp_bcm_type_vals), 0,
+          NULL, HFILL}
+        },
+               { &hf_gtp_rim_routing_addr,
+         {"RIM Routing Address value", "gtp.rim_routing_addr_val",
+          FT_BYTES, BASE_NONE, NULL, 0,
+          NULL, HFILL}
+        },
     };
 
     static gint *ett_gtp_array[] = {
-       &ett_gtp,
-       &ett_gtp_flags,
-       &ett_gtp_ext,
-       &ett_gtp_rai,
-       &ett_gtp_qos,
-       &ett_gtp_auth_tri,
-       &ett_gtp_flow_ii,
-       &ett_gtp_rab_cntxt,
-       &ett_gtp_rp,
-       &ett_gtp_pkt_flow_id,
-       &ett_gtp_chrg_char,
-       &ett_gtp_user,
-       &ett_gtp_mm,
-       &ett_gtp_trip,
-       &ett_gtp_quint,
-       &ett_gtp_pdp,
-       &ett_gtp_apn,
-       &ett_gtp_proto,
-       &ett_gtp_gsn_addr,
-       &ett_gtp_tft,
-       &ett_gtp_tft_pf,
-       &ett_gtp_tft_flags,
-       &ett_gtp_rab_setup,
-       &ett_gtp_hdr_list,
-       &ett_gtp_chrg_addr,
-       &ett_gtp_node_addr,
-       &ett_gtp_rel_pack,
-       &ett_gtp_can_pack,
-       &ett_gtp_data_resp,
-       &ett_gtp_priv_ext,
-       &ett_gtp_net_cap,
-       &ett_gtp_ext_tree_apn_res,
-       &ett_gtp_ext_rat_type,
-       &ett_gtp_ext_imeisv,
-       &ett_gtp_ext_ran_tr_cont,
-       &ett_gtp_ext_pdp_cont_prio,
-       &ett_gtp_ext_ssgn_no,
-       &ett_gtp_ext_rab_setup_inf,
-       &ett_gtp_ext_common_flgs,
-       &ett_gtp_ext_usr_loc_inf,
-       &ett_gtp_ext_ms_time_zone,
-       &ett_gtp_ext_camel_chg_inf_con,
-       &ett_GTP_EXT_MBMS_UE_CTX,
-       &ett_gtp_ext_tmgi,
-       &ett_gtp_tmgi,
-       &ett_gtp_ext_rim_ra,
-       &ett_gtp_ext_mbms_prot_conf_opt,
-       &ett_gtp_ext_mbms_sa,
-       &ett_gtp_ext_bms_ses_dur,
-       &ett_gtp_ext_src_rnc_pdp_ctx_inf,
-       &ett_gtp_ext_add_trs_inf,
-       &ett_gtp_ext_hop_count,
-       &ett_gtp_ext_sel_plmn_id,
-       &ett_gtp_ext_mbms_ses_id,
-       &ett_gtp_ext_mbms_2g_3g_ind,
-       &ett_gtp_ext_enh_nsapi,
-       &ett_gtp_ext_ad_mbms_trs_inf,
-       &ett_gtp_ext_mbms_ses_id_rep_no,
-       &ett_gtp_ext_mbms_time_to_data_tr,
-       &ett_gtp_ext_ps_ho_req_ctx,
-       &ett_gtp_ext_bss_cont,
-       &ett_gtp_ext_cell_id,
-       &ett_gtp_ext_pdu_no,
-       &ett_gtp_ext_bssgp_cause,
-       &ett_gtp_ext_ra_prio_lcs,
-       &ett_gtp_ext_ps_handover_xid,
-       &ett_gtp_target_id,
-       &ett_gtp_utran_cont,
+        &ett_gtp,
+        &ett_gtp_flags,
+        &ett_gtp_ext,
+        &ett_gtp_rai,
+        &ett_gtp_qos,
+        &ett_gtp_auth_tri,
+        &ett_gtp_flow_ii,
+        &ett_gtp_rab_cntxt,
+        &ett_gtp_rp,
+        &ett_gtp_pkt_flow_id,
+        &ett_gtp_chrg_char,
+        &ett_gtp_user,
+        &ett_gtp_mm,
+        &ett_gtp_trip,
+        &ett_gtp_quint,
+        &ett_gtp_pdp,
+        &ett_gtp_apn,
+        &ett_gtp_proto,
+        &ett_gtp_gsn_addr,
+        &ett_gtp_tft,
+        &ett_gtp_tft_pf,
+        &ett_gtp_tft_flags,
+        &ett_gtp_rab_setup,
+        &ett_gtp_hdr_list,
+        &ett_gtp_chrg_addr,
+        &ett_gtp_node_addr,
+        &ett_gtp_rel_pack,
+        &ett_gtp_can_pack,
+        &ett_gtp_data_resp,
+        &ett_gtp_priv_ext,
+        &ett_gtp_net_cap,
+        &ett_gtp_ext_tree_apn_res,
+        &ett_gtp_ext_rat_type,
+        &ett_gtp_ext_imeisv,
+        &ett_gtp_ext_ran_tr_cont,
+        &ett_gtp_ext_pdp_cont_prio,
+        &ett_gtp_ext_ssgn_no,
+        &ett_gtp_ext_rab_setup_inf,
+        &ett_gtp_ext_common_flgs,
+        &ett_gtp_ext_usr_loc_inf,
+        &ett_gtp_ext_ms_time_zone,
+        &ett_gtp_ext_camel_chg_inf_con,
+        &ett_GTP_EXT_MBMS_UE_CTX,
+        &ett_gtp_ext_tmgi,
+        &ett_gtp_tmgi,
+        &ett_gtp_ext_rim_ra,
+        &ett_gtp_ext_mbms_prot_conf_opt,
+        &ett_gtp_ext_mbms_sa,
+        &ett_gtp_ext_bms_ses_dur,
+        &ett_gtp_ext_src_rnc_pdp_ctx_inf,
+        &ett_gtp_ext_add_trs_inf,
+        &ett_gtp_ext_hop_count,
+        &ett_gtp_ext_sel_plmn_id,
+        &ett_gtp_ext_mbms_ses_id,
+        &ett_gtp_ext_mbms_2g_3g_ind,
+        &ett_gtp_ext_enh_nsapi,
+        &ett_gtp_ext_ad_mbms_trs_inf,
+        &ett_gtp_ext_mbms_ses_id_rep_no,
+        &ett_gtp_ext_mbms_time_to_data_tr,
+        &ett_gtp_ext_ps_ho_req_ctx,
+        &ett_gtp_ext_bss_cont,
+        &ett_gtp_ext_cell_id,
+        &ett_gtp_ext_pdu_no,
+        &ett_gtp_ext_bssgp_cause,
+        &ett_gtp_ext_ra_prio_lcs,
+        &ett_gtp_ext_ps_handover_xid,
+        &ett_gtp_target_id,
+        &ett_gtp_utran_cont,
+        &ett_gtp_bcm,
+        &ett_gtp_cdr_ver,
+        &ett_gtp_cdr_dr,
+        &ett_gtp_ext_hdr,
+               &ett_gtp_uli_rai,
     };
 
     module_t *gtp_module;
@@ -7041,11 +7680,11 @@ void proto_register_gtp(void)
 
     gtp_module = prefs_register_protocol(proto_gtp, proto_reg_handoff_gtp);
 
-    prefs_register_uint_preference(gtp_module, "v0_port", "GTPv0 port", "GTPv0 port (default 3386)", 10, &g_gtpv0_port);
-    prefs_register_uint_preference(gtp_module, "v1c_port", "GTPv1 control plane (GTP-C) port", "GTPv1 control plane port (default 2123)", 10,
-                                  &g_gtpv1c_port);
+    prefs_register_uint_preference(gtp_module, "v0_port", "GTPv0 and GTP' port", "GTPv0 and GTP' port (default 3386)", 10, &g_gtpv0_port);
+    prefs_register_uint_preference(gtp_module, "v1c_port", "GTPv1 or GTPv2 control plane (GTP-C, GTPv2-C) port", "GTPv1 and GTPv2 control plane port (default 2123)", 10,
+                                   &g_gtpv1c_port);
     prefs_register_uint_preference(gtp_module, "v1u_port", "GTPv1 user plane (GTP-U) port", "GTPv1 user plane port (default 2152)", 10,
-                                  &g_gtpv1u_port);
+                                   &g_gtpv1u_port);
     prefs_register_bool_preference(gtp_module, "dissect_tpdu", "Dissect T-PDU", "Dissect T-PDU", &g_gtp_tpdu);
 
     prefs_register_obsolete_preference(gtp_module, "v0_dissect_cdr_as");
@@ -7060,67 +7699,89 @@ void proto_register_gtp(void)
     prefs_register_bool_preference(gtp_module, "dissect_gtp_over_tcp", "Dissect GTP over TCP", "Dissect GTP over TCP", &g_gtp_over_tcp);
 
     register_dissector("gtp", dissect_gtp, proto_gtp);
+    register_dissector("gtpprim", dissect_gtpprim, proto_gtp);
+
+    gtp_priv_ext_dissector_table = register_dissector_table("gtp.priv_ext", "GTP PRIVATE EXT", FT_UINT16, BASE_DEC);
+    gtp_cdr_fmt_dissector_table = register_dissector_table("gtp.cdr_fmt", "GTP DATA RECORD TYPE", FT_UINT16, BASE_DEC);
 
-       register_init_routine(gtp_reinit);
-       gtp_tap=register_tap("gtp");
+    register_init_routine(gtp_reinit);
+    gtp_tap=register_tap("gtp");
 }
+/* TS 132 295 V9.0.0 (2010-02)
+ * 5.1.3 Port usage
+ * - The UDP Destination Port may be the server port number 3386 which has been reserved for GTP'.
+ * Alternatively another port can be used, which has been configured by O&M, except Port Number 2123
+ * which is used by GTPv2-C.
+ * :
+ * The TCP Destination Port may be the server port number 3386, which has been reserved for G-PDUs. Alternatively,
+ * another port may be used as configured by O&M. Extra implementation-specific destination ports are possible but
+ * all CGFs shall support the server port number.
+ */
 
 void proto_reg_handoff_gtp(void)
 {
     static gboolean Initialized = FALSE;
-    static dissector_handle_t gtp_handle;
+    static dissector_handle_t gtp_handle, gtp_prim_handle;
     static gboolean gtp_over_tcp;
     static guint gtpv0_port;
     static guint gtpv1c_port;
     static guint gtpv1u_port;
 
     if (!Initialized) {
-       gtp_handle = find_dissector("gtp");
-       ppp_subdissector_table = find_dissector_table("ppp.protocol");
-
-       radius_register_avp_dissector(VENDOR_THE3GPP, 5, dissect_radius_qos_umts);
-       radius_register_avp_dissector(VENDOR_THE3GPP, 12, dissect_radius_selection_mode);
-       radius_register_avp_dissector(VENDOR_THE3GPP, 22, dissect_radius_user_loc);
-
-       ip_handle = find_dissector("ip");
-       ipv6_handle = find_dissector("ipv6");
-       ppp_handle = find_dissector("ppp");
-       data_handle = find_dissector("data");
-       gtpcdr_handle = find_dissector("gtpcdr");
-       sndcpxid_handle = find_dissector("sndcpxid");
-       gtpv2_handle = find_dissector("gtpv2");
-       bssap_pdu_type_table = find_dissector_table("bssap.pdu_type");
-       /* AVP Code: 904 MBMS-Session-Duration */
-       dissector_add("diameter.3gpp", 904, new_create_dissector_handle(dissect_gtp_mbms_ses_dur, proto_gtp));
-       /* AVP Code: 911 MBMS-Time-To-Data-Transfer */
-       dissector_add("diameter.3gpp", 911, new_create_dissector_handle(dissect_gtp_mbms_time_to_data_tr, proto_gtp));
-
-       Initialized = TRUE;
+        gtp_handle = find_dissector("gtp");
+        gtp_prim_handle = find_dissector("gtpprim");
+        ppp_subdissector_table = find_dissector_table("ppp.protocol");
+
+        radius_register_avp_dissector(VENDOR_THE3GPP, 5, dissect_radius_qos_umts);
+        radius_register_avp_dissector(VENDOR_THE3GPP, 12, dissect_radius_selection_mode);
+        radius_register_avp_dissector(VENDOR_THE3GPP, 22, dissect_radius_user_loc);
+
+
+
+        ip_handle = find_dissector("ip");
+        ipv6_handle = find_dissector("ipv6");
+        ppp_handle = find_dissector("ppp");
+        data_handle = find_dissector("data");
+        gtpcdr_handle = find_dissector("gtpcdr");
+        sndcpxid_handle = find_dissector("sndcpxid");
+        gtpv2_handle = find_dissector("gtpv2");
+        bssgp_handle = find_dissector("bssgp");
+        bssap_pdu_type_table = find_dissector_table("bssap.pdu_type");
+        /* AVP Code: 5 3GPP-GPRS Negotiated QoS profile */
+        dissector_add_uint("diameter.3gpp", 5, new_create_dissector_handle(dissect_diameter_3gpp_qosprofile, proto_gtp));
+        /* AVP Code: 903 MBMS-Service-Area */
+        dissector_add_uint("diameter.3gpp", 903, new_create_dissector_handle(dissect_gtp_3gpp_mbms_service_area, proto_gtp));
+        /* AVP Code: 904 MBMS-Session-Duration */
+        dissector_add_uint("diameter.3gpp", 904, new_create_dissector_handle(dissect_gtp_mbms_ses_dur, proto_gtp));
+        /* AVP Code: 911 MBMS-Time-To-Data-Transfer */
+        dissector_add_uint("diameter.3gpp", 911, new_create_dissector_handle(dissect_gtp_mbms_time_to_data_tr, proto_gtp));
+
+        Initialized = TRUE;
     } else {
-       dissector_delete("udp.port", gtpv0_port, gtp_handle);
-       dissector_delete("udp.port", gtpv1c_port, gtp_handle);
-       dissector_delete("udp.port", gtpv1u_port, gtp_handle);
-
-       if (gtp_over_tcp) {
-           dissector_delete("tcp.port", gtpv0_port, gtp_handle);
-           dissector_delete("tcp.port", gtpv1c_port, gtp_handle);
-           dissector_delete("tcp.port", gtpv1u_port, gtp_handle);
-       }
+        dissector_delete_uint("udp.port", gtpv0_port, gtp_prim_handle);
+        dissector_delete_uint("udp.port", gtpv1c_port, gtp_handle);
+        dissector_delete_uint("udp.port", gtpv1u_port, gtp_handle);
+
+        if (gtp_over_tcp) {
+            dissector_delete_uint("tcp.port", gtpv0_port, gtp_prim_handle);
+            dissector_delete_uint("tcp.port", gtpv1c_port, gtp_handle);
+            dissector_delete_uint("tcp.port", gtpv1u_port, gtp_handle);
+        }
     }
 
     gtp_over_tcp = g_gtp_over_tcp;
-    gtpv0_port = g_gtpv0_port;
-    gtpv1c_port = g_gtpv1c_port;
-    gtpv1u_port = g_gtpv1u_port;
+    gtpv0_port   = g_gtpv0_port;
+    gtpv1c_port  = g_gtpv1c_port;
+    gtpv1u_port  = g_gtpv1u_port;
 
-    dissector_add("udp.port", g_gtpv0_port, gtp_handle);
-    dissector_add("udp.port", g_gtpv1c_port, gtp_handle);
-    dissector_add("udp.port", g_gtpv1u_port, gtp_handle);
+    dissector_add_uint("udp.port", g_gtpv0_port, gtp_prim_handle);
+    dissector_add_uint("udp.port", g_gtpv1c_port, gtp_handle);
+    dissector_add_uint("udp.port", g_gtpv1u_port, gtp_handle);
 
     if (g_gtp_over_tcp) {
-       dissector_add("tcp.port", g_gtpv0_port, gtp_handle);
-       dissector_add("tcp.port", g_gtpv1c_port, gtp_handle);
-       dissector_add("tcp.port", g_gtpv1u_port, gtp_handle);
+        dissector_add_uint("tcp.port", g_gtpv0_port, gtp_prim_handle);
+        dissector_add_uint("tcp.port", g_gtpv1c_port, gtp_handle);
+        dissector_add_uint("tcp.port", g_gtpv1u_port, gtp_handle);
     }
 }
 
@@ -7130,9 +7791,9 @@ void proto_reg_handoff_gtp(void)
  * Local variables:
  * c-basic-offset: 4
  * tab-width: 8
- * indent-tabs-mode: t
+ * indent-tabs-mode: nil
  * End:
  *
- * vi: set shiftwidth=4 tabstop=8 noexpandtab
- * :indentSize=4:tabSize=8:noTabs=false:
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
  */