Fill value_strings.

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

4 files changed, 284 insertions, 121 deletions

diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 5a5e8d18a2..80c5e6ba1a 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -390,79 +390,161 @@ static const value_string next_extension_header_fieldvals[] = {
 #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"},
+    {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_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"},
     {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_END_MARKER, "End Marker"},
-    {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.
+	 */
+    {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"},
+    /* 130-239 For future use. Shall not be sent. If received,
+	 * shall be treated as an Unknown message.
+	 */
+    {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.
+	 */
+    {GTP_MSG_END_MARKER,          "End Marker"},
+    {GTP_MSG_TPDU,                "T-PDU"},
     {0, NULL}
 };
 static value_string_ext message_type_ext = VALUE_STRING_EXT_INIT(message_type);
@@ -796,6 +878,7 @@ 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
+ * ETSI TS 129 060 V9.4.0 (2010-10)
  */
 static const value_string cause_type[] = {
     {  0, "Request IMSI"},
@@ -804,13 +887,26 @@ static const value_string cause_type[] = {
     {  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"},
-    {192, "Non-existent"},
+    {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
+	 */
+	{192, "Non-existent"},
     {193, "Invalid message format"},
     {194, "IMSI not known"},
     {195, "MS is GPRS detached"},
@@ -845,6 +941,13 @@ static const value_string cause_type[] = {
     {224, "MS MBMS Capabilities Insufficient"},
     {225, "Invalid Correlation-ID"},
     {226, "MBMS Bearer Context Superseded"},
+    {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 */
@@ -2816,6 +2919,7 @@ static int check_field_presence(guint8 message, guint8 field, int *position)
 
 /* 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)
 {
diff --git a/epan/dissectors/packet-gtp.h b/epan/dissectors/packet-gtp.h
index 0ef59e4078..7b40fba857 100644
--- a/epan/dissectors/packet-gtp.h
+++ b/epan/dissectors/packet-gtp.h
@@ -103,8 +103,8 @@ typedef struct gtp_msg_hash_entry {
 /* 122-127  For future use. Shall not be sent.
  * If received, shall be treated as an Unknown message.
  */
-#define GTP_MS_INFO_CNG_NOT_REQ     121
-#define GTP_MS_INFO_CNG_NOT_RES     122
+#define GTP_MS_INFO_CNG_NOT_REQ     128
+#define GTP_MS_INFO_CNG_NOT_RES     129
 /* 130-239  For future use. Shall not be sent.
  * If received, shall be treated as an Unknown message.
  */
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 95a5d97cb4..e4bfe4c0ca 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -3037,7 +3037,7 @@ static const value_string bearer_network_connection_characteristics_vals[] = {
   { 0x02,   "AAL type 2"},
   { 0x03,   "Structured AAL type 1"},
   { 0x04,   "IP/RTP"},
-  { 0x05, "TDM (reserved for use by ITU-T Rec. Q.1950)"},
+  { 0x05,   "TDM (reserved for use by ITU-T Rec. Q.1950)"},
   { 0,  NULL }
 };
 value_string_ext bearer_network_connection_characteristics_vals_ext = VALUE_STRING_EXT_INIT(bearer_network_connection_characteristics_vals);
@@ -3070,7 +3070,7 @@ static const value_string Bearer_Redirection_Indicator_vals[] = {
 static value_string_ext Bearer_Redirection_Indicator_vals_ext = VALUE_STRING_EXT_INIT(Bearer_Redirection_Indicator_vals);
 
 /*26/Q.765.5 - Signal Type */
-static const value_string BAt_ASE_Signal_Type_vals[] = {
+static const value_string BAT_ASE_Signal_Type_vals[] = {
   { 0x00,  "DTMF 0"},
   { 0x01,  "DTMF 1"},
   { 0x02,  "DTMF 2"},
@@ -3086,7 +3086,61 @@ static const value_string BAt_ASE_Signal_Type_vals[] = {
   { 0x0c,  "DTMF A"},
   { 0x0d,  "DTMF B"},
   { 0x0e,  "DTMF C"},
-  { 0x1f,  "DTMF D"},
+  { 0x0f,  "DTMF D"},
+  /* 0001 0000
+   * to
+   * 0011 1111
+   * Spare
+   */
+  { 0x10,  "Spare"},
+  { 0x11,  "Spare"},
+  { 0x12,  "Spare"},
+  { 0x13,  "Spare"},
+  { 0x14,  "Spare"},
+  { 0x15,  "Spare"},
+  { 0x16,  "Spare"},
+  { 0x17,  "Spare"},
+  { 0x18,  "Spare"},
+  { 0x19,  "Spare"},
+  { 0x1a,  "Spare"},
+  { 0x1b,  "Spare"},
+  { 0x1c,  "Spare"},
+  { 0x1d,  "Spare"},
+  { 0x1e,  "Spare"},
+  { 0x1f,  "Spare"},
+  { 0x20,  "Spare"},
+  { 0x21,  "Spare"},
+  { 0x22,  "Spare"},
+  { 0x23,  "Spare"},
+  { 0x24,  "Spare"},
+  { 0x25,  "Spare"},
+  { 0x26,  "Spare"},
+  { 0x27,  "Spare"},
+  { 0x28,  "Spare"},
+  { 0x29,  "Spare"},
+  { 0x2a,  "Spare"},
+  { 0x2b,  "Spare"},
+  { 0x2c,  "Spare"},
+  { 0x2d,  "Spare"},
+  { 0x2e,  "Spare"},
+  { 0x2f,  "Spare"},
+  { 0x30,  "Spare"},
+  { 0x31,  "Spare"},
+  { 0x32,  "Spare"},
+  { 0x33,  "Spare"},
+  { 0x34,  "Spare"},
+  { 0x35,  "Spare"},
+  { 0x36,  "Spare"},
+  { 0x37,  "Spare"},
+  { 0x38,  "Spare"},
+  { 0x39,  "Spare"},
+  { 0x3a,  "Spare"},
+  { 0x3b,  "Spare"},
+  { 0x3c,  "Spare"},
+  { 0x3d,  "Spare"},
+  { 0x3e,  "Spare"},
+  { 0x3f,  "Spare"},
+
   { 0x40,  "dial tone"},
   { 0x41,  "PABX internal dial tone"},
   { 0x42,  "special dial tone"},
@@ -3109,7 +3163,7 @@ static const value_string BAt_ASE_Signal_Type_vals[] = {
   { 0x53,  "negative indication tone"},
   { 0,  NULL }
 };
-static value_string_ext BAt_ASE_Signal_Type_vals_ext = VALUE_STRING_EXT_INIT(BAt_ASE_Signal_Type_vals);
+static value_string_ext BAT_ASE_Signal_Type_vals_ext = VALUE_STRING_EXT_INIT(BAT_ASE_Signal_Type_vals);
 
 static const value_string BAT_ASE_Report_Reason_vals[] = {
 
@@ -8434,7 +8488,7 @@ proto_register_isup(void)
 
     { &hf_bat_ase_signal,
       { "Q.765.5 - Signal Type",  "bat_ase.signal_type",
-        FT_UINT8, BASE_HEX|BASE_EXT_STRING, &BAt_ASE_Signal_Type_vals_ext,0x0,
+        FT_UINT8, BASE_HEX|BASE_EXT_STRING, &BAT_ASE_Signal_Type_vals_ext,0x0,
         NULL, HFILL }},
 
     { &hf_bat_ase_duration,
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index 4518060272..f36ee830f1 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -163,49 +163,49 @@ dissect_q931_IEs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root_tree,
     proto_tree *q931_tree, gboolean is_over_ip, int offset, int initial_codeset);
 
 const value_string q931_message_type_vals[] = {
-	{ Q931_ESCAPE,			"ESCAPE" },
-	{ Q931_ALERTING,		"ALERTING" },
-	{ Q931_CALL_PROCEEDING,		"CALL PROCEEDING" },
-	{ Q931_PROGRESS,		"PROGRESS" },
-	{ Q931_SETUP,			"SETUP" },
-	{ Q931_GROUIP_SERVICE,		"GROUP SERVICE" },
-	{ Q931_CONNECT,			"CONNECT" },
-	{ Q931_RESYNC_REQ,		"RESYNC REQ" },
-	{ Q931_RESYNC_RESP,		"RESYNC RESP" },
-	{ Q931_VERSION,			"VERSION" },
-	{ Q931_GROUIP_SERVICE_ACK,	"GROUP SERVICE ACK" },
-	{ Q931_SETUP_ACK,		"SETUP ACKNOWLEDGE" },
-	{ Q931_CONNECT_ACK,		"CONNECT ACKNOWLEDGE" },
-	{ Q931_USER_INFORMATION,	"USER INFORMATION" },
-	{ Q931_SUSPEND_REJECT,		"SUSPEND REJECT" },
-	{ Q931_RESUME_REJECT,		"RESUME REJECT" },
-	{ Q931_HOLD,			"HOLD" },
-	{ Q931_SUSPEND,			"SUSPEND" },
-	{ Q931_RESUME,			"RESUME" },
-	{ Q931_HOLD_ACK,		"HOLD_ACKNOWLEDGE" },
-	{ Q931_SUSPEND_ACK,		"SUSPEND ACKNOWLEDGE" },
-	{ Q931_RESUME_ACK,		"RESUME ACKNOWLEDGE" },
-	{ Q931_HOLD_REJECT,		"HOLD_REJECT" },
-	{ Q931_RETRIEVE,		"RETRIEVE" },
-	{ Q931_RETRIEVE_ACK,		"RETRIEVE ACKNOWLEDGE" },
-	{ Q931_RETRIEVE_REJECT,		"RETRIEVE REJECT" },
-	{ Q931_DETACH, 			"DETACH" },
-	{ Q931_DISCONNECT,		"DISCONNECT" },
-	{ Q931_RESTART,			"RESTART" },
-	{ Q931_DETACH_ACKNOWLEDGE,	"DETACH ACKNOWLEDGE" },
-	{ Q931_RELEASE,			"RELEASE" },
-	{ Q931_RESTART_ACK,		"RESTART ACKNOWLEDGE" },
-	{ Q931_RELEASE_COMPLETE,	"RELEASE COMPLETE" },
-	{ Q931_SEGMENT,			"SEGMENT" },
-	{ Q931_FACILITY,		"FACILITY" },
-	{ Q931_REGISTER,		"REGISTER" },
-	{ Q931_FACILITY_ACKNOWLEDGE,	"FACILITY ACKNOWLEDGE" },
-	{ Q931_NOTIFY,			"NOTIFY" },
-	{ Q931_FACILITY_REJECT,		"FACILITY REJECT" },
-	{ Q931_STATUS_ENQUIRY,		"STATUS ENQUIRY" },
-	{ Q931_CONGESTION_CONTROL,	"CONGESTION CONTROL" },
-	{ Q931_INFORMATION,		"INFORMATION" },
-	{ Q931_STATUS,			"STATUS" },
+/*  0 */	{ Q931_ESCAPE,				"ESCAPE" },
+/*  1 */	{ Q931_ALERTING,			"ALERTING" },
+/*  2 */	{ Q931_CALL_PROCEEDING,		"CALL PROCEEDING" },
+/*  3 */	{ Q931_PROGRESS,			"PROGRESS" },
+/*  5 */	{ Q931_SETUP,				"SETUP" },
+/*  6 */	{ Q931_GROUIP_SERVICE,		"GROUP SERVICE" },
+/*  7 */	{ Q931_CONNECT,				"CONNECT" },
+/*  8 */	{ Q931_RESYNC_REQ,			"RESYNC REQ" },
+/*  9 */	{ Q931_RESYNC_RESP,			"RESYNC RESP" },
+/* 10 */	{ Q931_VERSION,				"VERSION" },
+/* 11 */	{ Q931_GROUIP_SERVICE_ACK,	"GROUP SERVICE ACK" },
+/* 13 */	{ Q931_SETUP_ACK,			"SETUP ACKNOWLEDGE" },
+/* 15 */	{ Q931_CONNECT_ACK,			"CONNECT ACKNOWLEDGE" },
+/* 32 */	{ Q931_USER_INFORMATION,	"USER INFORMATION" },
+/* 33 */	{ Q931_SUSPEND_REJECT,		"SUSPEND REJECT" },
+/* 34 */	{ Q931_RESUME_REJECT,		"RESUME REJECT" },
+/* 36 */	{ Q931_HOLD,				"HOLD" },
+/* 37 */	{ Q931_SUSPEND,				"SUSPEND" },
+/* 38 */	{ Q931_RESUME,				"RESUME" },
+/* 40 */	{ Q931_HOLD_ACK,			"HOLD_ACKNOWLEDGE" },
+/* 45 */	{ Q931_SUSPEND_ACK,			"SUSPEND ACKNOWLEDGE" },
+/* 46 */	{ Q931_RESUME_ACK,			"RESUME ACKNOWLEDGE" },
+/* 48 */	{ Q931_HOLD_REJECT,			"HOLD_REJECT" },
+/* 49 */	{ Q931_RETRIEVE,			"RETRIEVE" },
+/* 51 */	{ Q931_RETRIEVE_ACK,		"RETRIEVE ACKNOWLEDGE" },
+/* 55 */	{ Q931_RETRIEVE_REJECT,		"RETRIEVE REJECT" },
+/* 64 */	{ Q931_DETACH, 				"DETACH" },
+/* 69 */	{ Q931_DISCONNECT,			"DISCONNECT" },
+/* 70 */	{ Q931_RESTART,				"RESTART" },
+/* 72 */	{ Q931_DETACH_ACKNOWLEDGE,	"DETACH ACKNOWLEDGE" },
+/* 77 */	{ Q931_RELEASE,				"RELEASE" },
+/* 78 */	{ Q931_RESTART_ACK,			"RESTART ACKNOWLEDGE" },
+/* 90 */	{ Q931_RELEASE_COMPLETE,	"RELEASE COMPLETE" },
+/* 96 */	{ Q931_SEGMENT,				"SEGMENT" },
+/* 98 */	{ Q931_FACILITY,			"FACILITY" },
+/*100 */	{ Q931_REGISTER,			"REGISTER" },
+/*106 */	{ Q931_FACILITY_ACKNOWLEDGE,	"FACILITY ACKNOWLEDGE" },
+/*110 */	{ Q931_NOTIFY,				"NOTIFY" },
+/*114 */	{ Q931_FACILITY_REJECT,		"FACILITY REJECT" },
+/*117 */	{ Q931_STATUS_ENQUIRY,		"STATUS ENQUIRY" },
+/*121 */	{ Q931_CONGESTION_CONTROL,	"CONGESTION CONTROL" },
+/*123 */	{ Q931_INFORMATION,			"INFORMATION" },
+/*125 */	{ Q931_STATUS,				"STATUS" },
 
 	{ 0,				NULL }
 };
@@ -1089,7 +1089,10 @@ static const value_string q931_cause_location_vals[] = {
 	{ 0x03, "Transit network (TN)" },
 	{ 0x04, "Public network serving the remote user (RLN)" },
 	{ 0x05, "Private network serving the remote user (RPN)" },
+	{ 0x06, "Unallocated code" },
 	{ 0x07, "International network (INTL)" },
+	{ 0x08, "Unallocated code" },
+	{ 0x09, "Unallocated code" },
 	{ 0x0A, "Network beyond interworking point (BI)" },
 	{ 0,    NULL }
 };
@@ -2465,8 +2468,10 @@ static const value_string q931_protocol_discriminator_vals[] = {
 	{ Q931_PROTOCOL_DISCRIMINATOR_USER, "User-specific protocol" },
 	{ 0x01,					"OSI high layer protocols" },
 	{ 0x02,					"X.244" },
+	{ 0x03,					"Reserved for system management convergence function" },
 	{ Q931_PROTOCOL_DISCRIMINATOR_IA5,	"IA5 characters" },
 	{ Q931_PROTOCOL_DISCRIMINATOR_ASN1,	"X.208 and X.209 coded user information" },
+	{ 0x06,					"Undefined" },
 	{ 0x07,					"V.120 rate adaption" },
 	{ 0x08,					"Q.931/I.451 user-network call control messages" },
 	{ 0,					NULL }