From ae61fe0158bd3afc2cfc034e81199cc7a39c2585 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Tue, 22 Jan 2013 23:25:44 +0000 Subject: [PATCH] Try to fix dissection of GSM protocol family broken by r47209. Using val_to_str seemed to be a good idea, but most value_string arrays were not properly filled or were using hacks. (I hope I got everything right...) svn path=/trunk/; revision=47218 --- epan/dissectors/packet-bssgp.c | 116 +++++----- epan/dissectors/packet-gmr1_common.c | 2 +- epan/dissectors/packet-gmr1_rr.c | 64 +++--- epan/dissectors/packet-gsm_a_bssmap.c | 295 +++++++++++++++---------- epan/dissectors/packet-gsm_a_common.c | 84 +++---- epan/dissectors/packet-gsm_a_common.h | 34 ++- epan/dissectors/packet-gsm_a_dtap.c | 160 +++++++------- epan/dissectors/packet-gsm_a_gm.c | 128 +++++------ epan/dissectors/packet-gsm_a_rp.c | 8 +- epan/dissectors/packet-gsm_a_rr.c | 162 +++++++------- epan/dissectors/packet-gsm_bsslap.c | 64 +++--- epan/dissectors/packet-gsm_bssmap_le.c | 112 +++++----- epan/dissectors/packet-nas_eps.c | 158 ++++++------- epan/dissectors/packet-sgsap.c | 82 +++---- 14 files changed, 767 insertions(+), 702 deletions(-) diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index ed2cada036..e962e9b9d6 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -3270,12 +3270,12 @@ const value_string bssgp_elem_strings[] = { { 0x28, "Packet Flow Identifier (PFI)" }, /* 11.3.42 Packet Flow Identifier (PFI) GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID*/ /* 11.3.42a (void) */ { 0x29, "GPRS Timer" }, /* 11.3.44 GPRS Timer */ - { 0x3a, "Aggregate BSS QoS Profile" }, /* 11.3.43 Aggregate BSS QoS Profile GSM_A_PDU_TYPE_GM, DE_QOS*/ - { 0x3b, "Feature Bitmap" }, /* 11.3.45 Feature Bitmap */ - { 0x3c, "Bucket Full Ratio" }, /* 11.3.46 Bucket Full Ratio */ - { 0x3d, "Service UTRAN CCO" }, /* 11.3.47 Service UTRAN CCO */ - { 0x3e, "NSEI (Network Service Entity Identifier)" }, /* 11.3.48 NSEI (Network Service Entity Identifier) */ - { 0x00, "RRLP APDU" }, /* 11.3.49 RRLP APDU */ + { 0x2a, "Aggregate BSS QoS Profile" }, /* 11.3.43 Aggregate BSS QoS Profile GSM_A_PDU_TYPE_GM, DE_QOS*/ + { 0x2b, "Feature Bitmap" }, /* 11.3.45 Feature Bitmap */ + { 0x2c, "Bucket Full Ratio" }, /* 11.3.46 Bucket Full Ratio */ + { 0x2d, "Service UTRAN CCO" }, /* 11.3.47 Service UTRAN CCO */ + { 0x2e, "NSEI (Network Service Entity Identifier)" }, /* 11.3.48 NSEI (Network Service Entity Identifier) */ + { 0x2f, "RRLP APDU" }, /* 11.3.49 RRLP APDU */ /* 11.3.50 LCS QoS BSSGP_IEI_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS*/ /* 11.3.51 LCS Client Type BSSGP_IEI_LCS_CLIENT_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE*/ /* 11.3.52 Requested GPS Assistance Data BSSGP_IEI_REQUESTED_GPS_ASSISTANCE_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GPS_ASSIST_D*/ @@ -3286,86 +3286,86 @@ const value_string bssgp_elem_strings[] = { /* 11.3.57 LCS Priority BSSGP_IEI_LCS_PRIORITY, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO;*/ /* 11.3.58 LCS Cause BSSGP_IEI_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE */ /* 11.3.59 LCS Capability 0x49 , GSM_A_PDU_TYPE_GM, DE_PS_LCS_CAP*/ - { 0x00, "RRLP Flags" }, /* 11.3.60 RRLP Flags */ - { 0x00, "RIM Application Identity" }, /* 11.3.61 RIM Application Identity */ - { 0x00, "RIM Sequence Number" }, /* 11.3.62 RIM Sequence Number */ + { 0x30, "RRLP Flags" }, /* 11.3.60 RRLP Flags */ + { 0x31, "RIM Application Identity" }, /* 11.3.61 RIM Application Identity */ + { 0x32, "RIM Sequence Number" }, /* 11.3.62 RIM Sequence Number */ /* 11.3.62a RIM Container */ /* 11.3.62a.0 General */ - { 0x00, "RAN-INFORMATION-REQUEST RIM Container" }, /* 11.3.62a.1 RAN-INFORMATION-REQUEST RIM Container */ - { 0x00, "RAN-INFORMATION RIM Container" }, /* 11.3.62a.2 RAN-INFORMATION RIM Container */ - { 0x00, "RAN-INFORMATION-ACK RIM Container" }, /* 11.3.62a.3 RAN-INFORMATION-ACK RIM Container */ - { 0x00, "RAN-INFORMATION-ERROR RIM Container" }, /* 11.3.62a.4 RAN-INFORMATION-ERROR RIM Container */ - { 0x00, "RAN-INFORMATION-APPLICATION-ERROR RIM Container" }, /* 11.3.62a.5 RAN-INFORMATION-APPLICATION-ERROR RIM Container */ + { 0x33, "RAN-INFORMATION-REQUEST RIM Container" }, /* 11.3.62a.1 RAN-INFORMATION-REQUEST RIM Container */ + { 0x34, "RAN-INFORMATION RIM Container" }, /* 11.3.62a.2 RAN-INFORMATION RIM Container */ + { 0x35, "RAN-INFORMATION-ACK RIM Container" }, /* 11.3.62a.3 RAN-INFORMATION-ACK RIM Container */ + { 0x36, "RAN-INFORMATION-ERROR RIM Container" }, /* 11.3.62a.4 RAN-INFORMATION-ERROR RIM Container */ + { 0x37, "RAN-INFORMATION-APPLICATION-ERROR RIM Container" }, /* 11.3.62a.5 RAN-INFORMATION-APPLICATION-ERROR RIM Container */ /* 11.3.63 Application Container */ - { 0x00, "RAN-INFORMATION-REQUEST Application Container" }, /* 11.3.63.1 RAN-INFORMATION-REQUEST Application Container */ + { 0x38, "RAN-INFORMATION-REQUEST Application Container" }, /* 11.3.63.1 RAN-INFORMATION-REQUEST Application Container */ /* 11.3.63.1.0 General */ /* 11.3.63.1.1 RAN-INFORMATION-REQUEST Application Container for the NACC Application */ /* 11.3.63.1.2 RAN-INFORMATION-REQUEST Application Container for the SI3 Application */ /* 11.3.63.1.3 RAN-INFORMATION-REQUEST Application Container for the MBMS data channel Application */ /* 11.3.63.1.4 RAN-INFORMATION-REQUEST Application Container for the SON Transfer Application */ - { 0x00, "RAN-INFORMATION Application Container Unit" }, /* 11.3.63.2 RAN-INFORMATION Application Container Unit */ + { 0x39, "RAN-INFORMATION Application Container Unit" }, /* 11.3.63.2 RAN-INFORMATION Application Container Unit */ /* 11.3.63.2.0 General */ /* 11.3.63.2.1 RAN-INFORMATION Application Container for the NACC Application */ /* 11.3.63.2.2 RAN-INFORMATION Application Container for the SI3 Application */ /* 11.3.63.2.3 RAN-INFORMATION Application Container for the MBMS data channel Application */ /* 11.3.63.2.4 RAN-INFORMATION Application Container for the SON Transfer Application */ - { 0x00, "Application Error Container" }, /* 11.3.64 Application Error Container */ + { 0x3a, "Application Error Container" }, /* 11.3.64 Application Error Container */ /* 11.3.64.1 Application Error Container layout for the NACC application */ /* 11.3.64.2 Application Error Container for the SI3 application */ /* 11.3.64.3 Application Error Container for the MBMS data channel application */ /* 11.3.64.4 Application Error Container for the SON Transfer Application */ - { 0x00, "RIM PDU Indications" }, /* 11.3.65 RIM PDU Indications */ + { 0x3b, "RIM PDU Indications" }, /* 11.3.65 RIM PDU Indications */ /* 11.3.65.0 General */ /* 11.3.65.1 RAN-INFORMATION-REQUEST RIM PDU Indications */ /* 11.3.65.2 RAN-INFORMATION RIM PDU Indications */ /* 11.3.65.3 RAN-INFORMATION-APPLICATION-ERROR RIM PDU Indications */ /* 11.3.66 (void) */ - { 0x00, "RIM Protocol Version Number" }, /* 11.3.67 RIM Protocol Version Number */ - { 0x00, "PFC Flow Control parameters" }, /* 11.3.68 PFC Flow Control parameters */ + { 0x3c, "RIM Protocol Version Number" }, /* 11.3.67 RIM Protocol Version Number */ + { 0x3d, "PFC Flow Control parameters" }, /* 11.3.68 PFC Flow Control parameters */ /* 0x53, SGSAP_PDU_TYPE, DE_SGSAP_GLOBAL_CN_ID */ /* 11.3.69 Global CN-Id */ - { 0x00, "RIM Routing Information" }, /* 11.3.70 RIM Routing Information */ - { 0x00, "MBMS Session Identity" }, /* 11.3.71 MBMS Session Identity */ - { 0x00, "MBMS Session Duration" }, /* 11.3.72 MBMS Session Duration */ - { 0x00, "MBMS Service Area Identity List" }, /* 11.3.73 MBMS Service Area Identity List */ - { 0x00, "MBMS Response" }, /* 11.3.74 MBMS Response */ - { 0x00, "MBMS Routing Area List" }, /* 11.3.75 MBMS Routing Area List */ - { 0x00, "MBMS Session Information" }, /* 11.3.76 MBMS Session Information */ - { 0x00, "TMGI" }, /* 11.3.77 TMGI (Temporary Mobile Group Identity) */ - { 0x00, "MBMS Stop Cause" }, /* 11.3.78 MBMS Stop Cause */ - { 0x00, "Source BSS to Target BSS Transparent Container" }, /* 11.3.79 Source BSS to Target BSS Transparent Container */ - { 0x00, "Target BSS to Source BSS Transparent Container" }, /* 11.3.80 Target BSS to Source BSS Transparent Container */ + { 0x3e, "RIM Routing Information" }, /* 11.3.70 RIM Routing Information */ + { 0x3f, "MBMS Session Identity" }, /* 11.3.71 MBMS Session Identity */ + { 0x40, "MBMS Session Duration" }, /* 11.3.72 MBMS Session Duration */ + { 0x41, "MBMS Service Area Identity List" }, /* 11.3.73 MBMS Service Area Identity List */ + { 0x42, "MBMS Response" }, /* 11.3.74 MBMS Response */ + { 0x43, "MBMS Routing Area List" }, /* 11.3.75 MBMS Routing Area List */ + { 0x44, "MBMS Session Information" }, /* 11.3.76 MBMS Session Information */ + { 0x45, "TMGI" }, /* 11.3.77 TMGI (Temporary Mobile Group Identity) */ + { 0x46, "MBMS Stop Cause" }, /* 11.3.78 MBMS Stop Cause */ + { 0x47, "Source BSS to Target BSS Transparent Container" }, /* 11.3.79 Source BSS to Target BSS Transparent Container */ + { 0x48, "Target BSS to Source BSS Transparent Container" }, /* 11.3.80 Target BSS to Source BSS Transparent Container */ /* 11.3.81 NAS container for PS Handover */ - { 0x00, "PFCs to be set-up list" }, /* 11.3.82 PFCs to be set-up list */ - { 0x00, "List of set-up PFCs" }, /* 11.3.83 List of set-up PFCs */ - { 0x00, "Extended Feature Bitmap" }, /* 11.3.84 Extended Feature Bitmap */ - { 0x00, "Source to Target Transparent Container" }, /* 11.3.85 Source to Target Transparent Container */ - { 0x00, "Target to Source Transparent Container" }, /* 11.3.86 Target to Source Transparent Container */ - { 0x00, "RNC Identifier" }, /* 11.3.87 RNC Identifier */ - { 0x00, "Page Mode" }, /* 11.3.88 Page Mode */ - { 0x00, "Container ID" }, /* 11.3.89 Container ID */ - { 0x00, "Global TFI" }, /* 11.3.90 Global TFI */ + { 0x49, "PFCs to be set-up list" }, /* 11.3.82 PFCs to be set-up list */ + { 0x4a, "List of set-up PFCs" }, /* 11.3.83 List of set-up PFCs */ + { 0x4b, "Extended Feature Bitmap" }, /* 11.3.84 Extended Feature Bitmap */ + { 0x4c, "Source to Target Transparent Container" }, /* 11.3.85 Source to Target Transparent Container */ + { 0x4d, "Target to Source Transparent Container" }, /* 11.3.86 Target to Source Transparent Container */ + { 0x4e, "RNC Identifier" }, /* 11.3.87 RNC Identifier */ + { 0x4f, "Page Mode" }, /* 11.3.88 Page Mode */ + { 0x50, "Container ID" }, /* 11.3.89 Container ID */ + { 0x51, "Global TFI" }, /* 11.3.90 Global TFI */ /* 11.3.91 IMEI */ - { 0x00, "Time to MBMS Data Transfer" }, /* 11.3.92 Time to MBMS Data Transfer */ - { 0x00, "MBMS Session Repetition Number" }, /* 11.3.93 MBMS Session Repetition Number */ - { 0x00, "Inter RAT Handover Info" }, /* 11.3.94 Inter RAT Handover Info */ - { 0x00, "PS Handover Command" }, /* 11.3.95 PS Handover Command */ - { 0x00, "PS Handover Indications" }, /* 11.3.95a PS Handover Indications */ - { 0x00, "SI/PSI Container" }, /* 11.3.95b SI/PSI Container */ - { 0x00, "Active PFCs List" }, /* 11.3.95c Active PFCs List */ - { 0x00, "Velocity Data" }, /* 11.3.96 Velocity Data */ - { 0x00, "DTM Handover Command" }, /* 11.3.97 DTM Handover Command */ - { 0x00, "PS Handover Indications" }, /* 11.3.98 CS Indication */ + { 0x52, "Time to MBMS Data Transfer" }, /* 11.3.92 Time to MBMS Data Transfer */ + { 0x53, "MBMS Session Repetition Number" }, /* 11.3.93 MBMS Session Repetition Number */ + { 0x54, "Inter RAT Handover Info" }, /* 11.3.94 Inter RAT Handover Info */ + { 0x55, "PS Handover Command" }, /* 11.3.95 PS Handover Command */ + { 0x56, "PS Handover Indications" }, /* 11.3.95a PS Handover Indications */ + { 0x57, "SI/PSI Container" }, /* 11.3.95b SI/PSI Container */ + { 0x58, "Active PFCs List" }, /* 11.3.95c Active PFCs List */ + { 0x59, "Velocity Data" }, /* 11.3.96 Velocity Data */ + { 0x5a, "DTM Handover Command" }, /* 11.3.97 DTM Handover Command */ + { 0x5b, "PS Handover Indications" }, /* 11.3.98 CS Indication */ /* 11.3.99 Requested GANSS Assistance Data 0x7b, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_ASS_DTA*/ /* 11.3.100 GANSS Location Type 0x7c, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_LOC_TYP*/ /* 11.3.101 GANSS Positioning Data ENC_BIG_ENDIAN);*/ - { 0x00, "Flow Control Granularity" }, /* 11.3.102 Flow Control Granularity */ - { 0x00, "eNB Identifier" }, /* 11.3.103 eNB Identifier */ - { 0x00, "E-UTRAN Inter RAT Handover Info" }, /* 11.3.104 E-UTRAN Inter RAT Handover Info */ - { 0x00, "Subscriber Profile ID for RAT/Frequency priority" }, /* 11.3.105 Subscriber Profile ID for RAT/Frequency priority */ - { 0x00, "Request for Inter-RAT Handover Info" }, /* 11.3.106 Request for Inter-RAT Handover Info */ - { 0x00, "Reliable Inter-RAT Handover Info" }, /* 11.3.107 Reliable Inter-RAT Handover Info */ - { 0x00, "Son transfer application identity" }, /* 11.3.108 SON Transfer Application Identity */ - { 0x00, "CSG Identifier" }, /* 11.3.109 CSG Identifier */ + { 0x5c, "Flow Control Granularity" }, /* 11.3.102 Flow Control Granularity */ + { 0x5d, "eNB Identifier" }, /* 11.3.103 eNB Identifier */ + { 0x5e, "E-UTRAN Inter RAT Handover Info" }, /* 11.3.104 E-UTRAN Inter RAT Handover Info */ + { 0x5f, "Subscriber Profile ID for RAT/Frequency priority" }, /* 11.3.105 Subscriber Profile ID for RAT/Frequency priority */ + { 0x60, "Request for Inter-RAT Handover Info" }, /* 11.3.106 Request for Inter-RAT Handover Info */ + { 0x61, "Reliable Inter-RAT Handover Info" }, /* 11.3.107 Reliable Inter-RAT Handover Info */ + { 0x62, "Son transfer application identity" }, /* 11.3.108 SON Transfer Application Identity */ + { 0x63, "CSG Identifier" }, /* 11.3.109 CSG Identifier */ /* 11.3.110 Tracking Area Code */ { 0, NULL } diff --git a/epan/dissectors/packet-gmr1_common.c b/epan/dissectors/packet-gmr1_common.c index 07eb80f83a..5b6021bb18 100644 --- a/epan/dissectors/packet-gmr1_common.c +++ b/epan/dissectors/packet-gmr1_common.c @@ -75,7 +75,7 @@ const value_string gmr1_pd_short_vals[] = { const value_string gmr1_ie_common_strings[] = { { 0, "Mobile Earth Station Classmark 2" }, /* [1] 11.5.1.6 */ - { 0, "Spare Half Octet" }, /* [1] 11.5.1.8 */ + { 1, "Spare Half Octet" }, /* [1] 11.5.1.8 */ { 0, NULL} }; diff --git a/epan/dissectors/packet-gmr1_rr.c b/epan/dissectors/packet-gmr1_rr.c index b59f8bb575..67095e96ae 100644 --- a/epan/dissectors/packet-gmr1_rr.c +++ b/epan/dissectors/packet-gmr1_rr.c @@ -95,38 +95,38 @@ enum gmr1_ie_rr_idx { }; const value_string gmr1_ie_rr_strings[] = { - { 0, "Channel Description" }, /* [1] 11.5.2.5 */ - { 0, "Channel Mode" }, /* [1] 11.5.2.6 */ - { 0, "Cipher Mode Setting" }, /* [4] 10.5.2.9 */ - { 0, "Cipher Response" }, /* [4] 10.5.2.10 */ - { 0, "L2 Pseudo Length" }, /* [1] 11.5.2.19 */ - { 0, "Page Mode" }, /* [1] 11.5.2.26 */ - { 0, "Request Reference" }, /* [1] 11.5.2.30 */ - { 0, "RR Cause" }, /* [1] 11.5.2.31 */ - { 0, "Timing Offset" }, /* [1] 11.5.2.40 */ - { 0, "TMSI/P-TMSI" }, /* [4] 10.5.2.42 */ - { 0, "Wait Indication" }, /* [4] 10.5.2.43 */ - { 0, "MES Information Flag" }, /* [1] 11.5.2.44 */ - { 0, "Frequency Offset" }, /* [1] 11.5.2.49 */ - { 0, "Paging Information" }, /* [1] 11.5.2.51 */ - { 0, "Position Display" }, /* [1] 11.5.2.52 */ - { 0, "Position Update Information" }, /* [1] 11.5.2.54 */ - { 0, "BCCH Carrier Specification"}, /* [1] 11.5.2.55 */ - { 0, "Reject Cause" }, /* [1] 11.5.2.56 */ - { 0, "GPS timestamp" }, /* [1] 11.5.2.57 */ - { 0, "Power Control Params" }, /* [1] 11.5.2.60 */ - { 0, "TMSI Availability Mask" }, /* [1] 11.5.2.62 */ - { 0, "GPS Almanac Data" }, /* [1] 11.5.2.63 */ - { 0, "MSC ID" }, /* [1] 11.5.2.100 */ - { 0, "GPS Discriminator" }, /* [1] 11.5.2.101 */ - { 0, "Packet Imm. Ass. Type 3 Params" },/* [3] 11.5.2.105 */ - { 0, "Packet Frequency Parameters" }, /* [3] 11.5.2.106 */ - { 0, "Packet Imm. Ass. Type 2 Params" },/* [3] 11.5.2.107 */ - { 0, "USF" }, /* [3] 11.5.2.110 */ - { 0, "Timing Advance Index" }, /* [3] 10.1.18.3.4 */ - { 0, "TLLI" }, /* [5] 12.16 */ - { 0, "Packet Power Control Params" }, /* [3] 10.1.18.3.3 */ - { 0, "Persistence Level" }, /* [3] 10.1.18.4.2 */ + { 0x00, "Channel Description" }, /* [1] 11.5.2.5 */ + { 0x01, "Channel Mode" }, /* [1] 11.5.2.6 */ + { 0x02, "Cipher Mode Setting" }, /* [4] 10.5.2.9 */ + { 0x03, "Cipher Response" }, /* [4] 10.5.2.10 */ + { 0x04, "L2 Pseudo Length" }, /* [1] 11.5.2.19 */ + { 0x05, "Page Mode" }, /* [1] 11.5.2.26 */ + { 0x06, "Request Reference" }, /* [1] 11.5.2.30 */ + { 0x07, "RR Cause" }, /* [1] 11.5.2.31 */ + { 0x08, "Timing Offset" }, /* [1] 11.5.2.40 */ + { 0x09, "TMSI/P-TMSI" }, /* [4] 10.5.2.42 */ + { 0x0a, "Wait Indication" }, /* [4] 10.5.2.43 */ + { 0x0b, "MES Information Flag" }, /* [1] 11.5.2.44 */ + { 0x0c, "Frequency Offset" }, /* [1] 11.5.2.49 */ + { 0x0d, "Paging Information" }, /* [1] 11.5.2.51 */ + { 0x0e, "Position Display" }, /* [1] 11.5.2.52 */ + { 0x0f, "Position Update Information" }, /* [1] 11.5.2.54 */ + { 0x10, "BCCH Carrier Specification"}, /* [1] 11.5.2.55 */ + { 0x11, "Reject Cause" }, /* [1] 11.5.2.56 */ + { 0x12, "GPS timestamp" }, /* [1] 11.5.2.57 */ + { 0x13, "Power Control Params" }, /* [1] 11.5.2.60 */ + { 0x14, "TMSI Availability Mask" }, /* [1] 11.5.2.62 */ + { 0x15, "GPS Almanac Data" }, /* [1] 11.5.2.63 */ + { 0x16, "MSC ID" }, /* [1] 11.5.2.100 */ + { 0x17, "GPS Discriminator" }, /* [1] 11.5.2.101 */ + { 0x18, "Packet Imm. Ass. Type 3 Params" },/* [3] 11.5.2.105 */ + { 0x19, "Packet Frequency Parameters" }, /* [3] 11.5.2.106 */ + { 0x1a, "Packet Imm. Ass. Type 2 Params" },/* [3] 11.5.2.107 */ + { 0x1b, "USF" }, /* [3] 11.5.2.110 */ + { 0x1c, "Timing Advance Index" }, /* [3] 10.1.18.3.4 */ + { 0x1d, "TLLI" }, /* [5] 12.16 */ + { 0x1e, "Packet Power Control Params" }, /* [3] 10.1.18.3.3 */ + { 0x1f, "Persistence Level" }, /* [3] 10.1.18.4.2 */ { 0, NULL }, }; diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 7c046cb67c..39103972c6 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -199,6 +199,7 @@ const value_string gsm_a_bssmap_msg_strings[] = { static value_string_ext gsm_a_bssmap_msg_strings_ext = VALUE_STRING_EXT_INIT(gsm_a_bssmap_msg_strings); const value_string gsm_bssmap_elem_strings[] = { + { 0x00, "Undefined" }, { 0x01, "Circuit Identity Code" }, { 0x02, "Reserved" }, { 0x03, "Resource Available" }, @@ -249,8 +250,8 @@ const value_string gsm_bssmap_elem_strings[] = { { 0x30, "Resource Situation" }, { 0x31, "Current Channel Type 1" }, { 0x32, "Queuing Indicator" }, - { 0x40, "Speech Version" }, { 0x33, "Assignment Requirement" }, + { 0x34, "Undefined" }, { 0x35, "Talker Flag" }, { 0x36, "Connection Release Requested" }, { 0x37, "Group Call Reference" }, @@ -262,13 +263,16 @@ const value_string gsm_bssmap_elem_strings[] = { { 0x3d, "LSA Information" }, { 0x3e, "LCS QoS" }, { 0x3f, "LSA access control suppression" }, + { 0x40, "Speech Version" }, + { 0x41, "Undefined" }, + { 0x42, "Undefined" }, { 0x43, "LCS Priority" }, { 0x44, "Location Type" }, { 0x45, "Location Estimate" }, { 0x46, "Positioning Data" }, { 0x47, "LCS Cause" }, { 0x48, "LCS Client Type" }, - { GSM_BSSMAP_APDU_IE, "APDU" }, + { 0x49, "APDU" }, { 0x4a, "Network Element Identity" }, { 0x4b, "GPS Assistance Data" }, { 0x4c, "Deciphering Keys" }, @@ -280,14 +284,26 @@ const value_string gsm_bssmap_elem_strings[] = { { 0x52, "Source RNC to target RNC transparent information (cdma2000)" }, { 0x53, "GERAN Classmark" }, { 0x54, "GERAN BSC Container" }, + { 0x55, "Velocity Estimate" }, + { 0x56, "Undefined" }, + { 0x57, "Undefined" }, + { 0x58, "Undefined" }, + { 0x59, "Undefined" }, + { 0x5a, "Undefined" }, + { 0x5b, "Undefined" }, + { 0x5c, "Undefined" }, + { 0x5d, "Undefined" }, + { 0x5e, "Undefined" }, + { 0x5f, "Undefined" }, + { 0x60, "Undefined" }, { 0x61, "New BSS to Old BSS Information" }, + { 0x62, "Undefined" }, { 0x63, "Inter-System Information" }, { 0x64, "SNA Access Information" }, { 0x65, "VSTK_RAND Information" }, { 0x66, "VSTK Information" }, { 0x67, "Paging Information" }, { 0x68, "IMEI" }, - { 0x55, "Velocity Estimate" }, { 0x69, "VGCS Feature Flags" }, { 0x6a, "Talker Priority" }, { 0x6b, "Emergency Set Indication" }, @@ -313,6 +329,7 @@ const value_string gsm_bssmap_elem_strings[] = { { 0x7f, "Call Identifier" }, { 0x80, "Call Identifier List" }, { 0x81, "A-Interface Selector for RESET" }, + { 0x82, "Undefined" }, { 0x83, "Kc128" }, { 0x84, "CSG Identifier" }, #if 0 @@ -646,123 +663,140 @@ Note this enum must be of the same size as the element decoding list typedef enum { - BE_CIC, /* Circuit Identity Code */ - BE_RSVD_1, /* Reserved */ - BE_RES_AVAIL, /* Resource Available */ - BE_CAUSE, /* Cause */ - BE_CELL_ID, /* Cell Identifier */ - BE_PRIO, /* Priority */ - BE_L3_HEADER_INFO, /* Layer 3 Header Information */ - BE_IMSI, /* IMSI */ - BE_TMSI, /* TMSI */ - BE_ENC_INFO, /* Encryption Information */ - BE_CHAN_TYPE, /* Channel Type */ - BE_PERIODICITY, /* Periodicity */ - BE_EXT_RES_IND, /* Extended Resource Indicator */ - BE_NUM_MS, /* Number Of MSs */ - BE_RSVD_2, /* Reserved */ - BE_RSVD_3, /* Reserved */ - BE_RSVD_4, /* Reserved */ - BE_CM_INFO_2, /* Classmark Information Type 2 */ - BE_CM_INFO_3, /* Classmark Information Type 3 */ - BE_INT_BAND, /* Interference Band To Be Used */ - BE_RR_CAUSE, /* RR Cause */ - BE_RSVD_5, /* Reserved */ - BE_L3_INFO, /* Layer 3 Information */ - BE_DLCI, /* DLCI */ - BE_DOWN_DTX_FLAG, /* Downlink DTX Flag */ - BE_CELL_ID_LIST, /* Cell Identifier List */ - BE_RESP_REQ, /* Response Request */ - BE_RES_IND_METHOD, /* Resource Indication Method */ - BE_CM_INFO_1, /* Classmark Information Type 1 */ - BE_CIC_LIST, /* Circuit Identity Code List */ - BE_DIAG, /* Diagnostic */ - BE_L3_MSG, /* Layer 3 Message Contents */ - BE_CHOSEN_CHAN, /* Chosen Channel */ - BE_TOT_RES_ACC, /* Total Resource Accessible */ - BE_CIPH_RESP_MODE, /* Cipher Response Mode */ - BE_CHAN_NEEDED, /* Channel Needed */ - BE_TRACE_TYPE, /* Trace Type */ - BE_TRIGGERID, /* TriggerID */ - BE_TRACE_REF, /* Trace Reference */ - BE_TRANSID, /* TransactionID */ - BE_MID, /* Mobile Identity */ - BE_OMCID, /* OMCID */ - BE_FOR_IND, /* Forward Indicator */ - BE_CHOSEN_ENC_ALG, /* Chosen Encryption Algorithm */ - BE_CCT_POOL, /* Circuit Pool */ - BE_CCT_POOL_LIST, /* Circuit Pool List */ - BE_TIME_IND, /* Time Indication */ - BE_RES_SIT, /* Resource Situation */ - BE_CURR_CHAN_1, /* Current Channel Type 1 */ - BE_QUE_IND, /* Queueing Indicator */ - BE_SPEECH_VER, /* Speech Version */ - BE_ASS_REQ, /* Assignment Requirement */ - BE_TALKER_FLAG, /* Talker Flag */ - BE_CONN_REL_REQ, /* Connection Release Requested */ - BE_GROUP_CALL_REF, /* Group Call Reference */ - BE_EMLPP_PRIO, /* eMLPP Priority */ - BE_CONF_EVO_IND, /* Configuration Evolution Indication */ - BE_OLD2NEW_INFO, /* Old BSS to New BSS Information */ - BE_LSA_ID, /* LSA Identifier */ - BE_LSA_ID_LIST, /* LSA Identifier List */ - BE_LSA_INFO, /* LSA Information */ - BE_LCS_QOS, /* LCS QoS */ - BE_LSA_ACC_CTRL, /* LSA access control suppression */ - BE_LCS_PRIO, /* LCS Priority */ - BE_LOC_TYPE, /* Location Type */ - BE_LOC_EST, /* Location Estimate */ - BE_POS_DATA, /* Positioning Data */ - BE_LCS_CAUSE, /* 3*2*2*66 LCS Cause */ - BE_LCS_CLIENT, /* LCS Client Type */ - BE_APDU, /* APDU */ - BE_NE_ID, /* Network Element Identity */ - BE_GPS_ASSIST_DATA, /* GPS Assistance Data */ - BE_DECIPH_KEYS, /* Deciphering Keys */ - BE_RET_ERR_REQ, /* Return Error Request */ - BE_RET_ERR_CAUSE, /* Return Error Cause */ - BE_SEG, /* Segmentation */ - BE_SERV_HO, /* Service Handover */ - BE_SRC_RNC_TO_TAR_RNC_UMTS, /* Source RNC to target RNC transparent information (UMTS) */ - BE_SRC_RNC_TO_TAR_RNC_CDMA, /* Source RNC to target RNC transparent information (cdma2000) */ - BE_GERAN_CLS_M, /* GERAN Classmark */ - BE_GERAN_BSC_CONT, /* GERAN BSC Container */ - BE_NEW_BSS_TO_OLD_BSS_INF, /* New BSS to Old BSS Information */ - BE_INTER_SYS_INF, /* Inter-System Information */ - BE_SNA_ACC_INF, /* SNA Access Information */ - BE_VSTK_RAND_INF, /* VSTK_RAND Information */ - BE_VSTK_INF, /* VSTK Information */ - BE_PAGING_INF, /* Paging Information */ - BE_IMEI, /* IMEI */ - BE_VEL_EST, /* Velocity Estimate */ - BE_VGCS_FEAT_FLG, /* VGCS Feature Flags */ - BE_TALKER_PRI, /* Talker Priority */ - BE_EMRG_SET_IND, /* Emergency Set Indication */ - BE_TALKER_ID, /* Talker Identity */ - BE_CELL_ID_LIST_SEG, /* Cell Identifier List Segment */ - BE_SMS_TO_VGCS, /* SMS to VGCS */ - BE_VGCS_TALKER_MOD, /* VGCS Talker Mode */ - BE_VGS_VBS_CELL_STAT, /* VGCS/VBS Cell Status */ - BE_CELL_ID_LST_SEG_F_EST_CELLS, /* Cell Identifier List Segment for established cells */ - BE_CELL_ID_LST_SEG_F_CELL_TB_EST, /* Cell Identifier List Segment for cells to be established */ - BE_CELL_ID_LST_SEG_F_REL_CELL, /* Cell Identifier List Segment for released cells - no user present */ - BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, /* Cell Identifier List Segment for not established cells - no establishment possible */ - BE_GANSS_ASS_DTA, /* GANSS Assistance Data */ - BE_GANSS_POS_DTA, /* GANSS Positioning Data */ - BE_GANSS_LOC_TYP, /* GANSS Location Type */ - BE_APP_DATA, /* Application Data */ - BE_DATA_ID /* Data Identity */ - BE_APP_DATA_INF, /* Application Data Information */ - BE_MSISDN, /* MSISDN */ - BE_AOIP_TRANS_LAY_ADD, /* AoIP Transport Layer Address */ - BE_SPEECH_CODEC_LST, /* Speech Codec List */ - BE_SPEECH_CODEC, /* Speech Codec */ - BE_CALL_ID, /* Call Identifier */ - BE_CALL_ID_LST, /* Call Identifier List */ - BE_A_ITF_SEL_FOR_RESET, /* A-Interface Selector for RESET */ - BE_KC128, /* Kc128 */ - BE_CSG_ID, /* CSG Identifier */ - BE_NONE /* NONE */ + BE_UDEF_0, /* Undefined */ + BE_CIC, /* Circuit Identity Code */ + BE_RSVD_1, /* Reserved */ + BE_RES_AVAIL, /* Resource Available */ + BE_CAUSE, /* Cause */ + BE_CELL_ID, /* Cell Identifier */ + BE_PRIO, /* Priority */ + BE_L3_HEADER_INFO, /* Layer 3 Header Information */ + BE_IMSI, /* IMSI */ + BE_TMSI, /* TMSI */ + BE_ENC_INFO, /* Encryption Information */ + BE_CHAN_TYPE, /* Channel Type */ + BE_PERIODICITY, /* Periodicity */ + BE_EXT_RES_IND, /* Extended Resource Indicator */ + BE_NUM_MS, /* Number Of MSs */ + BE_RSVD_2, /* Reserved */ + BE_RSVD_3, /* Reserved */ + BE_RSVD_4, /* Reserved */ + BE_CM_INFO_2, /* Classmark Information Type 2 */ + BE_CM_INFO_3, /* Classmark Information Type 3 */ + BE_INT_BAND, /* Interference Band To Be Used */ + BE_RR_CAUSE, /* RR Cause */ + BE_RSVD_5, /* Reserved */ + BE_L3_INFO, /* Layer 3 Information */ + BE_DLCI, /* DLCI */ + BE_DOWN_DTX_FLAG, /* Downlink DTX Flag */ + BE_CELL_ID_LIST, /* Cell Identifier List */ + BE_RESP_REQ, /* Response Request */ + BE_RES_IND_METHOD, /* Resource Indication Method */ + BE_CM_INFO_1, /* Classmark Information Type 1 */ + BE_CIC_LIST, /* Circuit Identity Code List */ + BE_DIAG, /* Diagnostic */ + BE_L3_MSG, /* Layer 3 Message Contents */ + BE_CHOSEN_CHAN, /* Chosen Channel */ + BE_TOT_RES_ACC, /* Total Resource Accessible */ + BE_CIPH_RESP_MODE, /* Cipher Response Mode */ + BE_CHAN_NEEDED, /* Channel Needed */ + BE_TRACE_TYPE, /* Trace Type */ + BE_TRIGGERID, /* TriggerID */ + BE_TRACE_REF, /* Trace Reference */ + BE_TRANSID, /* TransactionID */ + BE_MID, /* Mobile Identity */ + BE_OMCID, /* OMCID */ + BE_FOR_IND, /* Forward Indicator */ + BE_CHOSEN_ENC_ALG, /* Chosen Encryption Algorithm */ + BE_CCT_POOL, /* Circuit Pool */ + BE_CCT_POOL_LIST, /* Circuit Pool List */ + BE_TIME_IND, /* Time Indication */ + BE_RES_SIT, /* Resource Situation */ + BE_CURR_CHAN_1, /* Current Channel Type 1 */ + BE_QUE_IND, /* Queueing Indicator */ + BE_ASS_REQ, /* Assignment Requirement */ + BE_UDEF_52, /* Undefined */ + BE_TALKER_FLAG, /* Talker Flag */ + BE_CONN_REL_REQ, /* Connection Release Requested */ + BE_GROUP_CALL_REF, /* Group Call Reference */ + BE_EMLPP_PRIO, /* eMLPP Priority */ + BE_CONF_EVO_IND, /* Configuration Evolution Indication */ + BE_OLD2NEW_INFO, /* Old BSS to New BSS Information */ + BE_LSA_ID, /* LSA Identifier */ + BE_LSA_ID_LIST, /* LSA Identifier List */ + BE_LSA_INFO, /* LSA Information */ + BE_LCS_QOS, /* LCS QoS */ + BE_LSA_ACC_CTRL, /* LSA access control suppression */ + BE_SPEECH_VER, /* Speech Version */ + BE_UDEF_65, /* Undefined */ + BE_UDEF_66, /* Undefined */ + BE_LCS_PRIO, /* LCS Priority */ + BE_LOC_TYPE, /* Location Type */ + BE_LOC_EST, /* Location Estimate */ + BE_POS_DATA, /* Positioning Data */ + BE_LCS_CAUSE, /* 3.2.2.66 LCS Cause */ + BE_LCS_CLIENT, /* 10.14 LCS Client Type */ + BE_APDU, /* APDU */ + BE_NE_ID, /* Network Element Identity */ + BE_GPS_ASSIST_DATA, /* GPS Assistance Data */ + BE_DECIPH_KEYS, /* Deciphering Keys */ + BE_RET_ERR_REQ, /* Return Error Request */ + BE_RET_ERR_CAUSE, /* Return Error Cause */ + BE_SEG, /* Segmentation */ + BE_SERV_HO, /* Service Handover */ + BE_SRC_RNC_TO_TAR_RNC_UMTS, /* Source RNC to target RNC transparent information (UMTS) */ + BE_SRC_RNC_TO_TAR_RNC_CDMA, /* Source RNC to target RNC transparent information (cdma2000) */ + BE_GERAN_CLS_M, /* GERAN Classmark */ + BE_GERAN_BSC_CONT, /* GERAN BSC Container */ + BE_VEL_EST, /* Velocity Estimate */ + BE_UDEF_86, /* Undefined */ + BE_UDEF_87, /* Undefined */ + BE_UDEF_88, /* Undefined */ + BE_UDEF_89, /* Undefined */ + BE_UDEF_90, /* Undefined */ + BE_UDEF_91, /* Undefined */ + BE_UDEF_92, /* Undefined */ + BE_UDEF_93, /* Undefined */ + BE_UDEF_94, /* Undefined */ + BE_UDEF_95, /* Undefined */ + BE_UDEF_96, /* Undefined */ + BE_NEW_BSS_TO_OLD_BSS_INF, /* New BSS to Old BSS Information */ + BE_UDEF_98, /* Undefined */ + BE_INTER_SYS_INF, /* Inter-System Information */ + BE_SNA_ACC_INF, /* SNA Access Information */ + BE_VSTK_RAND_INF, /* VSTK_RAND Information */ + BE_VSTK_INF, /* VSTK Information */ + BE_PAGING_INF, /* Paging Information */ + BE_IMEI, /* IMEI */ + BE_VGCS_FEAT_FLG, /* VGCS Feature Flags */ + BE_TALKER_PRI, /* Talker Priority */ + BE_EMRG_SET_IND, /* Emergency Set Indication */ + BE_TALKER_ID, /* Talker Identity */ + BE_CELL_ID_LIST_SEG, /* Cell Identifier List Segment */ + BE_SMS_TO_VGCS, /* SMS to VGCS */ + BE_VGCS_TALKER_MOD, /* VGCS Talker Mode */ + BE_VGS_VBS_CELL_STAT, /* VGCS/VBS Cell Status */ + BE_CELL_ID_LST_SEG_F_EST_CELLS, /* Cell Identifier List Segment for established cells */ + BE_CELL_ID_LST_SEG_F_CELL_TB_EST, /* Cell Identifier List Segment for cells to be established */ + BE_CELL_ID_LST_SEG_F_REL_CELL, /* Cell Identifier List Segment for released cells - no user present */ + BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, /* Cell Identifier List Segment for not established cells - no establishment possible */ + BE_GANSS_ASS_DTA, /* GANSS Assistance Data */ + BE_GANSS_POS_DTA, /* GANSS Positioning Data */ + BE_GANSS_LOC_TYP, /* GANSS Location Type */ + BE_APP_DATA, /* Application Data */ + BE_DATA_ID, /* Data Identity */ + BE_APP_DATA_INF, /* Application Data Information */ + BE_MSISDN, /* MSISDN */ + BE_AOIP_TRANS_LAY_ADD, /* AoIP Transport Layer Address */ + BE_SPEECH_CODEC_LST, /* Speech Codec List */ + BE_SPEECH_CODEC, /* Speech Codec */ + BE_CALL_ID, /* Call Identifier */ + BE_CALL_ID_LST, /* Call Identifier List */ + BE_A_ITF_SEL_FOR_RESET, /* A-Interface Selector for RESET */ + BE_UDEF_130, /* Undefined */ + BE_KC128, /* Kc128 */ + BE_CSG_ID, /* CSG Identifier */ + BE_NONE /* NONE */ } bssmap_elem_idx_t; #endif @@ -4272,6 +4306,7 @@ be_csg_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offse } guint16 (*bssmap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) = { + NULL, /* Undefined */ be_cic, /* Circuit Identity Code */ NULL, /* Reserved */ be_res_avail, /* Resource Available */ @@ -4322,8 +4357,8 @@ guint16 (*bssmap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo NULL, /* Resource Situation */ be_curr_chan_1, /* Current Channel Type 1 */ be_que_ind, /* Queueing Indicator */ - be_speech_ver, /* Speech Version */ be_ass_req, /* Assignment Requirement */ + NULL, /* Undefined */ NULL /* no associated data */, /* Talker Flag */ NULL /* no associated data */, /* Connection Release Requested */ de_d_gb_call_ref, /* Group Call Reference */ @@ -4335,6 +4370,9 @@ guint16 (*bssmap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo be_lsa_info, /* LSA Information */ NULL, /* LCS QoS Dissected in packet-gsm_bssmap_le.c*/ NULL, /* LSA access control suppression */ + be_speech_ver, /* Speech Version */ + NULL, /* Undefined */ + NULL, /* Undefined */ be_lcs_prio, /* LCS Priority */ be_loc_type, /* Location Type */ be_loc_est, /* Location Estimate */ @@ -4353,14 +4391,26 @@ guint16 (*bssmap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo be_src_rnc_to_tar_rnc_cdma, /* Source RNC to target RNC transparent information (cdma2000) */ be_geran_cls_m, /* GERAN Classmark */ be_geran_bsc_cont, /* GERAN BSC Container */ + be_vel_est, /* Velocity Estimate */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ + NULL, /* Undefined */ be_field_element_dissect, /* New BSS to Old BSS Information */ + NULL, /* Undefined */ be_inter_sys_inf, /* Inter-System Information */ be_sna_acc_inf, /* SNA Access Information */ be_vstk_rand_info, /* VSTK_RAND Information */ be_vstk_info, /* VSTK Information */ be_paging_inf, /* Paging Information */ de_mid, /* 3.2.2.86 IMEI (use same dissector as IMSI)*/ - be_vel_est, /* Velocity Estimate */ be_vgcs_feat_flg, /* VGCS Feature Flags */ be_talker_pri, /* Talker Priority */ NULL, /* no data Emergency Set Indication */ @@ -4386,6 +4436,7 @@ guint16 (*bssmap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo be_call_id, /* Call Identifier */ be_call_id_lst, /* Call Identifier List */ be_a_itf_sel_for_reset, /* A-Interface Selector for RESET */ + NULL, /* Undefined */ be_kc128, /* Kc128 */ be_csg_id, /* CSG Identifier */ diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index 2668bbe68c..1f304ed6e9 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -47,23 +47,23 @@ const value_string gsm_common_elem_strings[] = { /* Common Information Elements 10.5.1 */ { 0x00, "Cell Identity" }, - { 0x00, "Ciphering Key Sequence Number" }, - { 0x00, "Location Area Identification (LAI)" }, - { 0x00, "Mobile Identity" }, - { 0x00, "Mobile Station Classmark 1" }, - { 0x00, "Mobile Station Classmark 2" }, - { 0x00, "Mobile Station Classmark 3" }, - { 0x00, "Spare Half Octet" }, - { 0x00, "Descriptive group or broadcast call reference" }, - { 0x00, "Group Cipher Key Number" }, - { 0x00, "PD and SAPI $(CCBS)$" }, - { 0x00, "Priority Level" }, - { 0x00, "CN Common GSM-MAP NAS system information" }, - { 0x00, "CS domain specific system information" }, - { 0x00, "PS domain specific system information" }, - { 0x00, "PLMN List" }, - { 0x00, "NAS container for PS HO" }, - { 0x00, "MS network feature support" }, + { 0x01, "Ciphering Key Sequence Number" }, + { 0x02, "Location Area Identification (LAI)" }, + { 0x03, "Mobile Identity" }, + { 0x04, "Mobile Station Classmark 1" }, + { 0x05, "Mobile Station Classmark 2" }, + { 0x06, "Mobile Station Classmark 3" }, + { 0x07, "Spare Half Octet" }, + { 0x08, "Descriptive group or broadcast call reference" }, + { 0x09, "Group Cipher Key Number" }, + { 0x0a, "PD and SAPI $(CCBS)$" }, + { 0x0b, "Priority Level" }, + { 0x0c, "CN Common GSM-MAP NAS system information" }, + { 0x0d, "CS domain specific system information" }, + { 0x0e, "PS domain specific system information" }, + { 0x0f, "PLMN List" }, + { 0x10, "NAS container for PS HO" }, + { 0x11, "MS network feature support" }, { 0, NULL } }; @@ -1086,49 +1086,49 @@ const char* get_gsm_a_msg_string(int pdu_type, int idx) switch (pdu_type) { case GSM_A_PDU_TYPE_BSSMAP: - msg_string = val_to_str(idx, gsm_bssmap_elem_strings, "GSM_A_PDU_TYPE_BSSMAP(%u)"); + msg_string = val_to_str(idx, gsm_bssmap_elem_strings, "GSM_A_PDU_TYPE_BSSMAP (%u)"); break; case GSM_A_PDU_TYPE_DTAP: - msg_string = val_to_str(idx, gsm_dtap_elem_strings, "GSM_A_PDU_TYPE_DTAP(%u)"); + msg_string = val_to_str(idx, gsm_dtap_elem_strings, "GSM_A_PDU_TYPE_DTAP (%u)"); break; case GSM_A_PDU_TYPE_RP: - msg_string = val_to_str(idx, gsm_rp_elem_strings, "GSM_A_PDU_TYPE_RP(%u)"); + msg_string = val_to_str(idx, gsm_rp_elem_strings, "GSM_A_PDU_TYPE_RP (%u)"); break; case GSM_A_PDU_TYPE_RR: - msg_string = val_to_str(idx, gsm_rr_elem_strings, "GSM_A_PDU_TYPE_RR(%u)"); + msg_string = val_to_str(idx, gsm_rr_elem_strings, "GSM_A_PDU_TYPE_RR (%u)"); break; case GSM_A_PDU_TYPE_COMMON: - msg_string = val_to_str(idx, gsm_common_elem_strings, "GSM_A_PDU_TYPE_COMMON(%u)"); + msg_string = val_to_str(idx, gsm_common_elem_strings, "GSM_A_PDU_TYPE_COMMON (%u)"); break; case GSM_A_PDU_TYPE_GM: - msg_string = val_to_str(idx, gsm_gm_elem_strings, "GSM_A_PDU_TYPE_GM(%u)"); + msg_string = val_to_str(idx, gsm_gm_elem_strings, "GSM_A_PDU_TYPE_GM (%u)"); break; case GSM_A_PDU_TYPE_BSSLAP: - msg_string = val_to_str(idx, gsm_bsslap_elem_strings, "GSM_A_PDU_TYPE_BSSLAP(%u)"); + msg_string = val_to_str(idx, gsm_bsslap_elem_strings, "GSM_A_PDU_TYPE_BSSLAP (%u)"); break; case GSM_PDU_TYPE_BSSMAP_LE: - msg_string = val_to_str(idx, gsm_bssmap_le_elem_strings, "GSM_PDU_TYPE_BSSMAP_LE(%u)"); + msg_string = val_to_str(idx, gsm_bssmap_le_elem_strings, "GSM_PDU_TYPE_BSSMAP_LE (%u)"); break; case NAS_PDU_TYPE_COMMON: - msg_string = val_to_str(idx, nas_eps_common_elem_strings, "NAS_PDU_TYPE_COMMON(%u)"); + msg_string = val_to_str(idx, nas_eps_common_elem_strings, "NAS_PDU_TYPE_COMMON (%u)"); break; case NAS_PDU_TYPE_EMM: - msg_string = val_to_str(idx, nas_emm_elem_strings, "NAS_PDU_TYPE_EMM(%u)"); + msg_string = val_to_str(idx, nas_emm_elem_strings, "NAS_PDU_TYPE_EMM (%u)"); break; case NAS_PDU_TYPE_ESM: - msg_string = val_to_str(idx, nas_esm_elem_strings, "NAS_PDU_TYPE_ESM(%u)"); + msg_string = val_to_str(idx, nas_esm_elem_strings, "NAS_PDU_TYPE_ESM (%u)"); break; case SGSAP_PDU_TYPE: - msg_string = val_to_str(idx, sgsap_elem_strings, "SGSAP_PDU_TYPE(%u)"); + msg_string = val_to_str(idx, sgsap_elem_strings, "SGSAP_PDU_TYPE (%u)"); break; case BSSGP_PDU_TYPE: - msg_string = val_to_str(idx, bssgp_elem_strings, "BSSGP_PDU_TYPE(%u)"); + msg_string = val_to_str(idx, bssgp_elem_strings, "BSSGP_PDU_TYPE (%u)"); break; case GMR1_IE_COMMON: - msg_string = val_to_str(idx, gmr1_ie_common_strings, "GMR1_IE_COMMON(%u)"); + msg_string = val_to_str(idx, gmr1_ie_common_strings, "GMR1_IE_COMMON (%u)"); break; case GMR1_IE_RR: - msg_string = val_to_str(idx, gmr1_ie_rr_strings, "GMR1_IE_RR(%u)"); + msg_string = val_to_str(idx, gmr1_ie_rr_strings, "GMR1_IE_RR (%u)"); break; default: DISSECTOR_ASSERT_NOT_REACHED(); @@ -1222,7 +1222,7 @@ guint16 elem_tlv(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint8 iei proto_tree_add_text(tree, tvb, curr_offset, parm_len + 1 + lengt_length, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); subtree = proto_item_add_subtree(item, elem_ett[idx]); @@ -1309,7 +1309,7 @@ guint16 elem_telv(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint8 ie proto_tree_add_text(tree, tvb, curr_offset, parm_len + 1 + lengt_length, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); subtree = proto_item_add_subtree(item, elem_ett[idx]); @@ -1386,7 +1386,7 @@ guint16 elem_tlv_e(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint8 i item = proto_tree_add_text(tree, tvb, curr_offset, parm_len + 1 + 2, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); subtree = proto_item_add_subtree(item, elem_ett[idx]); @@ -1461,7 +1461,7 @@ guint16 elem_tv(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint8 iei, proto_tree_add_text(tree, tvb, curr_offset, -1, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); subtree = proto_item_add_subtree(item, elem_ett[idx]); @@ -1534,7 +1534,7 @@ guint16 elem_tv_short(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint proto_tree_add_text(tree, tvb, curr_offset, -1, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); subtree = proto_item_add_subtree(item, elem_ett[idx]); @@ -1603,7 +1603,7 @@ guint16 elem_t(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint8 i get_hf_elem_id(pdu_type), tvb, curr_offset, 1, oct, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); consumed = 1; @@ -1638,7 +1638,7 @@ elem_lv(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gint pdu_type, int proto_tree_add_text(tree, tvb, curr_offset, parm_len + 1, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); subtree = proto_item_add_subtree(item, elem_ett[idx]); @@ -1699,7 +1699,7 @@ guint16 elem_lv_e(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gint pdu_ item = proto_tree_add_text(tree, tvb, curr_offset, parm_len + 2, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); subtree = proto_item_add_subtree(item, elem_ett[idx]); @@ -1775,7 +1775,7 @@ guint16 elem_v(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gint pdu_typ proto_tree_add_text(tree, tvb, curr_offset, 0, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), (name_add == NULL) || (name_add[0] == '\0') ? "" : name_add); subtree = proto_item_add_subtree(item, elem_ett[idx]); @@ -1818,7 +1818,7 @@ guint16 elem_v_short(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gint p item = proto_tree_add_text(tree, tvb, curr_offset, 0, "%s%s", - val_to_str(idx, elem_names, "Unknown(%u)"), + val_to_str(idx, elem_names, "Unknown (%u)"), ""); subtree = proto_item_add_subtree(item, elem_ett[idx]); diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h index 633c7ab731..1caf660449 100644 --- a/epan/dissectors/packet-gsm_a_common.h +++ b/epan/dissectors/packet-gsm_a_common.h @@ -182,9 +182,6 @@ extern int hf_gsm_a_gm_rac; extern int hf_gsm_a_spare_bits; extern int hf_gsm_a_lac; -/* for the nasty hack below */ -#define GSM_BSSMAP_APDU_IE 0x49 - /* flags for the packet-gsm_a_common routines */ #define GSM_A_PDU_TYPE_BSSMAP 0 /* BSSAP_PDU_TYPE_BSSMAP i.e. 0 - until split complete at least! */ #define GSM_A_PDU_TYPE_DTAP 1 /* BSSAP_PDU_TYPE_DTAP i.e. 1 - until split complete at least! */ @@ -784,6 +781,7 @@ common_elem_idx_t; typedef enum { + BE_UDEF_0, /* Undefined */ BE_CIC, /* Circuit Identity Code */ BE_RSVD_1, /* Reserved */ BE_RES_AVAIL, /* Resource Available */ @@ -834,8 +832,8 @@ typedef enum BE_RES_SIT, /* Resource Situation */ BE_CURR_CHAN_1, /* Current Channel Type 1 */ BE_QUE_IND, /* Queueing Indicator */ - BE_SPEECH_VER, /* Speech Version */ BE_ASS_REQ, /* Assignment Requirement */ + BE_UDEF_52, /* Undefined */ BE_TALKER_FLAG, /* Talker Flag */ BE_CONN_REL_REQ, /* Connection Release Requested */ BE_GROUP_CALL_REF, /* Group Call Reference */ @@ -847,6 +845,9 @@ typedef enum BE_LSA_INFO, /* LSA Information */ BE_LCS_QOS, /* LCS QoS */ BE_LSA_ACC_CTRL, /* LSA access control suppression */ + BE_SPEECH_VER, /* Speech Version */ + BE_UDEF_65, /* Undefined */ + BE_UDEF_66, /* Undefined */ BE_LCS_PRIO, /* LCS Priority */ BE_LOC_TYPE, /* Location Type */ BE_LOC_EST, /* Location Estimate */ @@ -865,14 +866,26 @@ typedef enum BE_SRC_RNC_TO_TAR_RNC_CDMA, /* Source RNC to target RNC transparent information (cdma2000) */ BE_GERAN_CLS_M, /* GERAN Classmark */ BE_GERAN_BSC_CONT, /* GERAN BSC Container */ + BE_VEL_EST, /* Velocity Estimate */ + BE_UDEF_86, /* Undefined */ + BE_UDEF_87, /* Undefined */ + BE_UDEF_88, /* Undefined */ + BE_UDEF_89, /* Undefined */ + BE_UDEF_90, /* Undefined */ + BE_UDEF_91, /* Undefined */ + BE_UDEF_92, /* Undefined */ + BE_UDEF_93, /* Undefined */ + BE_UDEF_94, /* Undefined */ + BE_UDEF_95, /* Undefined */ + BE_UDEF_96, /* Undefined */ BE_NEW_BSS_TO_OLD_BSS_INF, /* New BSS to Old BSS Information */ + BE_UDEF_98, /* Undefined */ BE_INTER_SYS_INF, /* Inter-System Information */ BE_SNA_ACC_INF, /* SNA Access Information */ BE_VSTK_RAND_INF, /* VSTK_RAND Information */ BE_VSTK_INF, /* VSTK Information */ BE_PAGING_INF, /* Paging Information */ BE_IMEI, /* IMEI */ - BE_VEL_EST, /* Velocity Estimate */ BE_VGCS_FEAT_FLG, /* VGCS Feature Flags */ BE_TALKER_PRI, /* Talker Priority */ BE_EMRG_SET_IND, /* Emergency Set Indication */ @@ -898,9 +911,10 @@ typedef enum BE_CALL_ID, /* Call Identifier */ BE_CALL_ID_LST, /* Call Identifier List */ BE_A_ITF_SEL_FOR_RESET, /* A-Interface Selector for RESET */ + BE_UDEF_130, /* Undefined */ BE_KC128, /* Kc128 */ BE_CSG_ID, /* CSG Identifier */ - BE_NONE /* NONE */ + BE_NONE /* NONE */ } bssmap_elem_idx_t; @@ -1358,8 +1372,8 @@ typedef enum DE_SGSAP_EPS_LOC_UPD_TYPE, /* 9.4.2 EPS location update type*/ DE_SGSAP_GLOBAL_CN_ID, /* 9.4.4 Global CN-Id*/ + DE_SGSAP_UDEF_11, /* Undefined */ DE_SGSAP_UDEF_12, /* Undefined */ - DE_SGSAP_UDEF_13, /* Undefined */ DE_SGSAP_MID, /* 9.4.14 Mobile identity*/ DE_SGSAP_REJ_CAUSE, /* 9.4.16 Reject cause */ @@ -1370,9 +1384,9 @@ typedef enum DE_SGSAP_NAS_MSG_CONTAINER, /* 9.4.15 NAS message container*/ DE_SGSAP_MM_INFO, /* 9.4.12 MM information*/ - DE_SGSAP_UDEF_24, /* Undefined */ - DE_SGSAP_UDEF_25, /* Undefined */ - DE_SGSAP_UDEF_26, /* Undefined */ + DE_SGSAP_UDEF_20, /* Undefined */ + DE_SGSAP_UDEF_21, /* Undefined */ + DE_SGSAP_UDEF_22, /* Undefined */ DE_SGSAP_ERR_MSG, /* 9.4.3 Erroneous message*/ DE_SGSAP_CLI, /* 9.4.1 CLI */ diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 93f9709165..acb1d8fc32 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -246,91 +246,91 @@ const value_string gsm_a_dtap_msg_tp_strings[] = { const value_string gsm_dtap_elem_strings[] = { /* Mobility Management Information Elements 10.5.3 */ { 0x00, "Authentication Parameter RAND" }, - { 0x00, "Authentication Parameter AUTN (UMTS and EPS authentication challenge)" }, - { 0x00, "Authentication Response Parameter" }, - { 0x00, "Authentication Response Parameter (extension) (UMTS authentication challenge only)" }, - { 0x00, "Authentication Failure Parameter (UMTS and EPS authentication challenge)" }, - { 0x00, "CM Service Type" }, - { 0x00, "Identity Type" }, - { 0x00, "Location Updating Type" }, - { 0x00, "Network Name" }, - { 0x00, "Reject Cause" }, - { 0x00, "Follow-on Proceed" }, - { 0x00, "Time Zone" }, - { 0x00, "Time Zone and Time" }, - { 0x00, "CTS Permission" }, - { 0x00, "LSA Identifier" }, - { 0x00, "Daylight Saving Time" }, - { 0x00, "Emergency Number List" }, - { 0x00, "Additional update parameters" }, - { 0x00, "MM Timer" }, + { 0x01, "Authentication Parameter AUTN (UMTS and EPS authentication challenge)" }, + { 0x02, "Authentication Response Parameter" }, + { 0x03, "Authentication Response Parameter (extension) (UMTS authentication challenge only)" }, + { 0x04, "Authentication Failure Parameter (UMTS and EPS authentication challenge)" }, + { 0x05, "CM Service Type" }, + { 0x06, "Identity Type" }, + { 0x07, "Location Updating Type" }, + { 0x08, "Network Name" }, + { 0x09, "Reject Cause" }, + { 0x0a, "Follow-on Proceed" }, + { 0x0b, "Time Zone" }, + { 0x0c, "Time Zone and Time" }, + { 0x0d, "CTS Permission" }, + { 0x0e, "LSA Identifier" }, + { 0x0f, "Daylight Saving Time" }, + { 0x10, "Emergency Number List" }, + { 0x11, "Additional update parameters" }, + { 0x12, "MM Timer" }, /* Call Control Information Elements 10.5.4 */ - { 0x00, "Auxiliary States" }, /* 10.5.4.4 Auxiliary states */ - { 0x00, "Bearer Capability" }, /* 10.5.4.4a Backup bearer capability */ - { 0x00, "Call Control Capabilities" }, - { 0x00, "Call State" }, - { 0x00, "Called Party BCD Number" }, - { 0x00, "Called Party Subaddress" }, - { 0x00, "Calling Party BCD Number" }, - { 0x00, "Calling Party Subaddress" }, - { 0x00, "Cause" }, - { 0x00, "CLIR Suppression" }, - { 0x00, "CLIR Invocation" }, - { 0x00, "Congestion Level" }, - { 0x00, "Connected Number" }, - { 0x00, "Connected Subaddress" }, - { 0x00, "Facility" }, - { 0x00, "High Layer Compatibility" }, - { 0x00, "Keypad Facility" }, - { 0x00, "Low Layer Compatibility" }, - { 0x00, "More Data" }, - { 0x00, "Notification Indicator" }, - { 0x00, "Progress Indicator" }, - { 0x00, "Recall type $(CCBS)$" }, - { 0x00, "Redirecting Party BCD Number" }, - { 0x00, "Redirecting Party Subaddress" }, - { 0x00, "Repeat Indicator" }, - { 0x00, "Reverse Call Setup Direction" }, - { 0x00, "SETUP Container $(CCBS)$" }, - { 0x00, "Signal" }, - { 0x00, "SS Version Indicator" }, - { 0x00, "User-user" }, - { 0x00, "Alerting Pattern $(NIA)$" }, /* 10.5.4.26 Alerting Pattern $(NIA)$ */ - { 0x00, "Allowed Actions $(CCBS)$" }, - { 0x00, "Stream Identifier" }, - { 0x00, "Network Call Control Capabilities" }, - { 0x00, "Cause of No CLI" }, /* 10.5.4.30 Cause of No CLI */ + { 0x13, "Auxiliary States" }, /* 10.5.4.4 Auxiliary states */ + { 0x14, "Bearer Capability" }, /* 10.5.4.4a Backup bearer capability */ + { 0x15, "Call Control Capabilities" }, + { 0x16, "Call State" }, + { 0x17, "Called Party BCD Number" }, + { 0x18, "Called Party Subaddress" }, + { 0x19, "Calling Party BCD Number" }, + { 0x1a, "Calling Party Subaddress" }, + { 0x1b, "Cause" }, + { 0x1c, "CLIR Suppression" }, + { 0x1d, "CLIR Invocation" }, + { 0x1e, "Congestion Level" }, + { 0x1f, "Connected Number" }, + { 0x20, "Connected Subaddress" }, + { 0x21, "Facility" }, + { 0x22, "High Layer Compatibility" }, + { 0x23, "Keypad Facility" }, + { 0x24, "Low Layer Compatibility" }, + { 0x25, "More Data" }, + { 0x26, "Notification Indicator" }, + { 0x27, "Progress Indicator" }, + { 0x28, "Recall type $(CCBS)$" }, + { 0x29, "Redirecting Party BCD Number" }, + { 0x2a, "Redirecting Party Subaddress" }, + { 0x2b, "Repeat Indicator" }, + { 0x2c, "Reverse Call Setup Direction" }, + { 0x2d, "SETUP Container $(CCBS)$" }, + { 0x2e, "Signal" }, + { 0x2f, "SS Version Indicator" }, + { 0x30, "User-user" }, + { 0x31, "Alerting Pattern $(NIA)$" }, /* 10.5.4.26 Alerting Pattern $(NIA)$ */ + { 0x32, "Allowed Actions $(CCBS)$" }, + { 0x33, "Stream Identifier" }, + { 0x34, "Network Call Control Capabilities" }, + { 0x35, "Cause of No CLI" }, /* 10.5.4.30 Cause of No CLI */ /* 10.5.4.31 Void */ - { 0x00, "Supported Codec List" }, /* 10.5.4.32 Supported codec list */ - { 0x00, "Service Category" }, /* 10.5.4.33 Service category */ - { 0x00, "Redial" }, /* 10.5.4.34 Redial */ - { 0x00, "Network-initiated Service Upgrade indicator" }, + { 0x36, "Supported Codec List" }, /* 10.5.4.32 Supported codec list */ + { 0x37, "Service Category" }, /* 10.5.4.33 Service category */ + { 0x38, "Redial" }, /* 10.5.4.34 Redial */ + { 0x39, "Network-initiated Service Upgrade indicator" }, /* 10.5.4.35 Network-initiated Service Upgrade indicator */ /* Short Message Service Information Elements [5] 8.1.4 */ - { 0x00, "CP-User Data" }, - { 0x00, "CP-Cause" }, + { 0x3a, "CP-User Data" }, + { 0x3b, "CP-Cause" }, /* Tests procedures information elements 3GPP TS 44.014 6.4.0, 3GPP TS 34.109 6.4.0 and 3GPP TS 36.509 9.1.0*/ - { 0x00, "Close TCH Loop Cmd Sub-channel"}, - { 0x00, "Open Loop Cmd Ack"}, - { 0x00, "Close Multi-slot Loop Cmd Loop type"}, - { 0x00, "Close Multi-slot Loop Ack Result"}, - { 0x00, "Test Interface Tested device"}, - { 0x00, "GPRS Test Mode Cmd PDU description"}, - { 0x00, "GPRS Test Mode Cmd Mode flag"}, - { 0x00, "EGPRS Start Radio Block Loopback Cmd Mode flag"}, - { 0x00, "MS Positioning Technology"}, - { 0x00, "Close UE Test Loop Mode"}, - { 0x00, "UE Positioning Technology"}, - { 0x00, "RLC SDU Counter Value"}, - { 0x00, "UE Test Loop Mode"}, - { 0x00, "UE Test Loop Mode A LB Setup"}, - { 0x00, "UE Test Loop Mode B LB Setup"}, - { 0x00, "UE Test Loop Mode C Setup"}, - { 0x00, "UE Positioning Technology"}, - { 0x00, "MBMS Packet Counter Value"}, - { 0x00, "Ellipsoid Point With Altitude"}, - { 0x00, "Horizontal Velocity"}, - { 0x00, "GNSS-TOD-msec"}, + { 0x3c, "Close TCH Loop Cmd Sub-channel"}, + { 0x3d, "Open Loop Cmd Ack"}, + { 0x3e, "Close Multi-slot Loop Cmd Loop type"}, + { 0x3f, "Close Multi-slot Loop Ack Result"}, + { 0x40, "Test Interface Tested device"}, + { 0x41, "GPRS Test Mode Cmd PDU description"}, + { 0x42, "GPRS Test Mode Cmd Mode flag"}, + { 0x43, "EGPRS Start Radio Block Loopback Cmd Mode flag"}, + { 0x44, "MS Positioning Technology"}, + { 0x45, "Close UE Test Loop Mode"}, + { 0x46, "UE Positioning Technology"}, + { 0x47, "RLC SDU Counter Value"}, + { 0x48, "UE Test Loop Mode"}, + { 0x49, "UE Test Loop Mode A LB Setup"}, + { 0x4a, "UE Test Loop Mode B LB Setup"}, + { 0x4b, "UE Test Loop Mode C Setup"}, + { 0x4c, "UE Positioning Technology"}, + { 0x4d, "MBMS Packet Counter Value"}, + { 0x4e, "Ellipsoid Point With Altitude"}, + { 0x4f, "Horizontal Velocity"}, + { 0x50, "GNSS-TOD-msec"}, { 0, NULL } }; diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index 29cb3b109b..3cf2bf8172 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -152,72 +152,72 @@ const value_string gsm_a_dtap_msg_sm_strings[] = { const value_string gsm_gm_elem_strings[] = { /* GPRS Mobility Management Information Elements 10.5.5 */ { 0x00, "Additional Update Type" }, - { 0x00, "Attach Result" }, - { 0x00, "Attach Type" }, - { 0x00, "Cipher Algorithm" }, - { 0x00, "TMSI Status" }, - { 0x00, "Detach Type" }, - { 0x00, "DRX Parameter" }, - { 0x00, "Force to Standby" }, - { 0x00, "Force to Standby" }, - { 0x00, "P-TMSI Signature" }, - { 0x00, "P-TMSI Signature 2" }, - { 0x00, "Identity Type 2" }, - { 0x00, "IMEISV Request" }, - { 0x00, "Receive N-PDU Numbers List" }, - { 0x00, "MS Network Capability" }, - { 0x00, "MS Radio Access Capability" }, - { 0x00, "GMM Cause" }, - { 0x00, "Routing Area Identification" }, - { 0x00, "Routing Area Identification 2" }, - { 0x00, "Update Result" }, - { 0x00, "Update Type" }, - { 0x00, "A&C Reference Number" }, - { 0x00, "A&C Reference Number" }, - { 0x00, "Service Type" }, - { 0x00, "Cell Notification" }, - { 0x00, "PS LCS Capability" }, - { 0x00, "Network Feature Support" }, - { 0x00, "Additional Network Feature Support" }, - { 0x00, "Inter RAT information container" }, - { 0x00, "Requested MS information" }, - { 0x00, "UE network capability" }, - { 0x00, "E-UTRAN inter RAT information container" }, - { 0x00, "Voice domain preference and UE's usage setting" }, - { 0x00, "P-TMSI type" }, - { 0x00, "Location Area Identification 2" }, - { 0x00, "Network resource identifier container" }, + { 0x01, "Attach Result" }, + { 0x02, "Attach Type" }, + { 0x03, "Cipher Algorithm" }, + { 0x04, "TMSI Status" }, + { 0x05, "Detach Type" }, + { 0x06, "DRX Parameter" }, + { 0x07, "Force to Standby" }, + { 0x08, "Force to Standby" }, + { 0x09, "P-TMSI Signature" }, + { 0x0a, "P-TMSI Signature 2" }, + { 0x0b, "Identity Type 2" }, + { 0x0c, "IMEISV Request" }, + { 0x0d, "Receive N-PDU Numbers List" }, + { 0x0e, "MS Network Capability" }, + { 0x0f, "MS Radio Access Capability" }, + { 0x10, "GMM Cause" }, + { 0x11, "Routing Area Identification" }, + { 0x12, "Routing Area Identification 2" }, + { 0x13, "Update Result" }, + { 0x14, "Update Type" }, + { 0x15, "A&C Reference Number" }, + { 0x16, "A&C Reference Number" }, + { 0x17, "Service Type" }, + { 0x18, "Cell Notification" }, + { 0x19, "PS LCS Capability" }, + { 0x1a, "Network Feature Support" }, + { 0x1b, "Additional Network Feature Support" }, + { 0x1c, "Inter RAT information container" }, + { 0x1d, "Requested MS information" }, + { 0x1e, "UE network capability" }, + { 0x1f, "E-UTRAN inter RAT information container" }, + { 0x20, "Voice domain preference and UE's usage setting" }, + { 0x21, "P-TMSI type" }, + { 0x22, "Location Area Identification 2" }, + { 0x23, "Network resource identifier container" }, /* Session Management Information Elements 10.5.6 */ - { 0x00, "Access Point Name" }, - { 0x00, "Network Service Access Point Identifier" }, - { 0x00, "Protocol Configuration Options" }, - { 0x00, "Packet Data Protocol Address" }, - { 0x00, "Quality Of Service" }, - { 0x00, "SM Cause" }, - { 0x00, "SM Cause 2" }, - { 0x00, "Linked TI" }, - { 0x00, "LLC Service Access Point Identifier" }, - { 0x00, "Tear Down Indicator" }, - { 0x00, "Packet Flow Identifier" }, - { 0x00, "Traffic Flow Template" }, - { 0x00, "Temporary Mobile Group Identity (TMGI)" }, - { 0x00, "MBMS bearer capabilities" }, - { 0x00, "MBMS protocol configuration options" }, - { 0x00, "Enhanced network service access point identifier" }, - { 0x00, "Request type" }, - { 0x00, "Notification indicator" }, - { 0x00, "Connectivity type" }, + { 0x24, "Access Point Name" }, + { 0x25, "Network Service Access Point Identifier" }, + { 0x26, "Protocol Configuration Options" }, + { 0x27, "Packet Data Protocol Address" }, + { 0x28, "Quality Of Service" }, + { 0x29, "SM Cause" }, + { 0x2a, "SM Cause 2" }, + { 0x2b, "Linked TI" }, + { 0x2c, "LLC Service Access Point Identifier" }, + { 0x2d, "Tear Down Indicator" }, + { 0x2e, "Packet Flow Identifier" }, + { 0x2f, "Traffic Flow Template" }, + { 0x30, "Temporary Mobile Group Identity (TMGI)" }, + { 0x31, "MBMS bearer capabilities" }, + { 0x32, "MBMS protocol configuration options" }, + { 0x33, "Enhanced network service access point identifier" }, + { 0x34, "Request type" }, + { 0x35, "Notification indicator" }, + { 0x36, "Connectivity type" }, /* GPRS Common Information Elements 10.5.7 */ - { 0x00, "PDP Context Status" }, - { 0x00, "Radio Priority" }, - { 0x00, "GPRS Timer" }, - { 0x00, "GPRS Timer 2" }, - { 0x00, "GPRS Timer 3" }, - { 0x00, "Radio Priority 2"}, - { 0x00, "MBMS context status"}, - { 0x00, "Uplink data status"}, - { 0x00, "Device properties"}, - { 0x00, "Spare Nibble"}, + { 0x37, "PDP Context Status" }, + { 0x38, "Radio Priority" }, + { 0x39, "GPRS Timer" }, + { 0x3a, "GPRS Timer 2" }, + { 0x3b, "GPRS Timer 3" }, + { 0x3c, "Radio Priority 2"}, + { 0x3d, "MBMS context status"}, + { 0x3e, "Uplink data status"}, + { 0x3f, "Device properties"}, + { 0x40, "Spare Nibble"}, { 0, NULL } }; diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c index 963e65f600..7c3ab70754 100644 --- a/epan/dissectors/packet-gsm_a_rp.c +++ b/epan/dissectors/packet-gsm_a_rp.c @@ -58,10 +58,10 @@ static const value_string gsm_rp_msg_strings[] = { const value_string gsm_rp_elem_strings[] = { /* Short Message Service RP Information Elements [5] 8.2 */ { 0x00, "RP-Message Reference" }, - { 0x00, "RP-Originator Address" }, - { 0x00, "RP-Destination Address" }, - { 0x00, "RP-User Data" }, - { 0x00, "RP-Cause" }, + { 0x01, "RP-Originator Address" }, + { 0x02, "RP-Destination Address" }, + { 0x03, "RP-User Data" }, + { 0x04, "RP-Cause" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 9e9b003534..de34de3918 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -175,91 +175,91 @@ const value_string gsm_a_dtap_msg_rr_strings[] = { const value_string gsm_rr_elem_strings[] = { /* Radio Resource Management Information Elements 10.5.2, most are from 10.5.1 */ { 0x00, "BA Range" }, /* [3] 10.5.2.1a BA Range */ - { 0x00, "Cell Channel Description" }, /* [3] 10.5.2.1b */ - { 0x00, "BA List Pref" }, /* [3] 10.5.2.1c BA List Pref */ - { 0x00, "UTRAN Frequency List" }, /* [3] 10.5.2.1d UTRAN Frequency List */ - { 0x00, "Cell Selection Indicator after Release of all TCH and SDCCH" }, /* [3] 10.5.2.1e Cell selection indicator after release of all TCH and SDCCH IE */ - { 0x00, "Cell Description" }, /* 10.5.2.2 */ - { 0x00, "Cell Options (BCCH)" }, /* [3] 10.5.2.3 Cell Options (BCCH) */ - { 0x00, "Cell Options (SACCH)" }, /* [3] 10.5.2.3a Cell Options (SACCH) */ - { 0x00, "Cell Selection Parameters" }, /* [3] 10.5.2.4 Cell Selection Parameters */ + { 0x01, "Cell Channel Description" }, /* [3] 10.5.2.1b */ + { 0x02, "BA List Pref" }, /* [3] 10.5.2.1c BA List Pref */ + { 0x03, "UTRAN Frequency List" }, /* [3] 10.5.2.1d UTRAN Frequency List */ + { 0x04, "Cell Selection Indicator after Release of all TCH and SDCCH" }, /* [3] 10.5.2.1e Cell selection indicator after release of all TCH and SDCCH IE */ + { 0x05, "Cell Description" }, /* 10.5.2.2 */ + { 0x06, "Cell Options (BCCH)" }, /* [3] 10.5.2.3 Cell Options (BCCH) */ + { 0x07, "Cell Options (SACCH)" }, /* [3] 10.5.2.3a Cell Options (SACCH) */ + { 0x08, "Cell Selection Parameters" }, /* [3] 10.5.2.4 Cell Selection Parameters */ /* [3] 10.5.2.4a (void) */ - { 0x00, "Channel Description" }, /* 10.5.2.5 */ - { 0x00, "Channel Description 2" }, /* 10.5.2.5a */ - { 0x00, "Channel Description 3" }, /* 10.5.2.5c */ - { 0x00, "Channel Mode" }, /* [3] 10.5.2.6 */ - { 0x00, "Channel Mode 2" }, /* [3] 10.5.2.7 */ - { 0x00, "UTRAN Classmark" }, /* [3] 10.5.2.7a */ + { 0x09, "Channel Description" }, /* 10.5.2.5 */ + { 0x0a, "Channel Description 2" }, /* 10.5.2.5a */ + { 0x0b, "Channel Description 3" }, /* 10.5.2.5c */ + { 0x0c, "Channel Mode" }, /* [3] 10.5.2.6 */ + { 0x0d, "Channel Mode 2" }, /* [3] 10.5.2.7 */ + { 0x0e, "UTRAN Classmark" }, /* [3] 10.5.2.7a */ /* [3] 10.5.2.7b (void) */ - { 0x00, "Classmark Enquiry Mask" }, /* [3] 10.5.2.7c */ + { 0x0f, "Classmark Enquiry Mask" }, /* [3] 10.5.2.7c */ /* [3] 10.5.2.7d GERAN Iu Mode Classmark information element */ - { 0x00, "Channel Needed"}, /* [3] 10.5.2.8 */ + { 0x10, "Channel Needed"}, /* [3] 10.5.2.8 */ /* [3] 10.5.2.8a (void) */ - { 0x00, "Channel Request Description 2"}, /* [3] 10.5.2.8b Channel Request Description 2 */ + { 0x11, "Channel Request Description 2"}, /* [3] 10.5.2.8b Channel Request Description 2 */ /* Pos 20 */ - { 0x00, "Cipher Mode Setting" }, /* [3] 10.5.2.9 */ - { 0x00, "Cipher Mode Response" }, /* [3] 10.5.2.10 */ - { 0x00, "Control Channel Description" }, /* [3] 10.5.2.11 Control Channel Description */ - { 0x00, "DTM Information Details" }, /* [3] 10.5.2.11a DTM Information Details */ - { 0x00, "Dynamic ARFCN Mapping" }, /* [3] 10.5.2.11b */ - { 0x00, "Frequency Channel Sequence" }, /* [3] 10.5.2.12 */ - { 0x00, "Frequency List" }, /* 10.5.2.13 */ - { 0x00, "Frequency Short List" }, /* 10.5.2.14 */ - { 0x00, "Frequency Short List2" }, /* 10.5.2.14a */ + { 0x12, "Cipher Mode Setting" }, /* [3] 10.5.2.9 */ + { 0x13, "Cipher Mode Response" }, /* [3] 10.5.2.10 */ + { 0x14, "Control Channel Description" }, /* [3] 10.5.2.11 Control Channel Description */ + { 0x15, "DTM Information Details" }, /* [3] 10.5.2.11a DTM Information Details */ + { 0x16, "Dynamic ARFCN Mapping" }, /* [3] 10.5.2.11b */ + { 0x17, "Frequency Channel Sequence" }, /* [3] 10.5.2.12 */ + { 0x18, "Frequency List" }, /* 10.5.2.13 */ + { 0x19, "Frequency Short List" }, /* 10.5.2.14 */ + { 0x1a, "Frequency Short List2" }, /* 10.5.2.14a */ /* [3] 10.5.2.14b Group Channel Description */ - { 0x00, "GPRS Resumption" }, /* [3] 10.5.2.14c GPRS Resumption */ - { 0x00, "GPRS Broadcast Information" }, /* [3] 10.5.2.14d GPRS broadcast information */ + { 0x1b, "GPRS Resumption" }, /* [3] 10.5.2.14c GPRS Resumption */ + { 0x1c, "GPRS Broadcast Information" }, /* [3] 10.5.2.14d GPRS broadcast information */ /* [3] 10.5.2.14e Enhanced DTM CS Release Indication */ - { 0x00, "Handover Reference" }, /* 10.5.2.15 */ - { 0x00, "IA Rest Octets" }, /* [3] 10.5.2.16 */ - { 0x00, "IAR Rest Octets" }, /* [3] 10.5.2.17 IAR Rest Octets */ - { 0x00, "IAX Rest Octets" }, /* [3] 10.5.2.18 IAX Rest Octets */ - { 0x00, "L2 Pseudo Length" }, /* [3] 10.5.2.19 */ - { 0x00, "Measurement Results" }, /* [3] 10.5.2.20 Measurement Results */ + { 0x1d, "Handover Reference" }, /* 10.5.2.15 */ + { 0x1e, "IA Rest Octets" }, /* [3] 10.5.2.16 */ + { 0x1f, "IAR Rest Octets" }, /* [3] 10.5.2.17 IAR Rest Octets */ + { 0x20, "IAX Rest Octets" }, /* [3] 10.5.2.18 IAX Rest Octets */ + { 0x21, "L2 Pseudo Length" }, /* [3] 10.5.2.19 */ + { 0x22, "Measurement Results" }, /* [3] 10.5.2.20 Measurement Results */ /* * [3] 10.5.2.20a GPRS Measurement Results */ - { 0x00, "Mobile Allocation" }, /* [3] 10.5.2.21 */ - { 0x00, "Mobile Time Difference" }, /* [3] 10.5.2.21a */ - { 0x00, "MultiRate configuration" }, /* [3] 10.5.2.21aa */ + { 0x23, "Mobile Allocation" }, /* [3] 10.5.2.21 */ + { 0x24, "Mobile Time Difference" }, /* [3] 10.5.2.21a */ + { 0x25, "MultiRate configuration" }, /* [3] 10.5.2.21aa */ /* Pos 30 */ - { 0x00, "Multislot Allocation" }, /* [3] 10.5.2.21b */ + { 0x26, "Multislot Allocation" }, /* [3] 10.5.2.21b */ /* * [3] 10.5.2.21c NC mode */ - { 0x00, "Neighbour Cell Description" }, /* [3] 10.5.2.22 Neighbour Cell Description */ - { 0x00, "Neighbour Cell Description 2" }, /* [3] 10.5.2.22a Neighbour Cell Description 2 */ + { 0x27, "Neighbour Cell Description" }, /* [3] 10.5.2.22 Neighbour Cell Description */ + { 0x28, "Neighbour Cell Description 2" }, /* [3] 10.5.2.22a Neighbour Cell Description 2 */ /* * [3] 10.5.2.22b (void) * [3] 10.5.2.22c NT/N Rest Octets */ - { 0x00, "P1 Rest Octets" }, /* [3] 10.5.2.23 P1 Rest Octets */ - { 0x00, "P2 Rest Octets" }, /* [3] 10.5.2.24 P2 Rest Octets */ - { 0x00, "P3 Rest Octets" }, /* [3] 10.5.2.25 P3 Rest Octets */ - { 0x00, "Packet Channel Description" }, /* [3] 10.5.2.25a */ - { 0x00, "Dedicated mode or TBF" }, /* [3] 10.5.2.25b */ - { 0x00, "Packet Uplink Assignment" }, /* [3] 10.5.2.25c RR Packet Uplink Assignment */ - { 0x00, "Packet Downlink Assignment" }, /* [3] 10.5.2.25d RR Packet Downlink Assignment */ - { 0x00, "Packet Downlink Assignment Type 2" }, /* [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 */ - { 0x00, "Page Mode" }, /* [3] 10.5.2.26 */ - { 0x00, "NCC Permitted" }, /* [3] 10.5.2.27 NCC Permitted */ - { 0x00, "Power Command" }, /* 10.5.2.28 */ - { 0x00, "Power Command and access type" }, /* 10.5.2.28a */ - { 0x00, "RACH Control Parameters" }, /* [3] 10.5.2.29 RACH Control Parameters */ - { 0x00, "Request Reference" }, /* [3] 10.5.2.30 Request Reference */ - { 0x00, "RR Cause" }, /* 10.5.2.31 */ - { 0x00, "Synchronization Indication" }, /* 10.5.2.39 */ - { 0x00, "SI 1 Rest Octets" }, /* [3] 10.5.2.32 */ + { 0x29, "P1 Rest Octets" }, /* [3] 10.5.2.23 P1 Rest Octets */ + { 0x2a, "P2 Rest Octets" }, /* [3] 10.5.2.24 P2 Rest Octets */ + { 0x2b, "P3 Rest Octets" }, /* [3] 10.5.2.25 P3 Rest Octets */ + { 0x2c, "Packet Channel Description" }, /* [3] 10.5.2.25a */ + { 0x2d, "Dedicated mode or TBF" }, /* [3] 10.5.2.25b */ + { 0x2e, "Packet Uplink Assignment" }, /* [3] 10.5.2.25c RR Packet Uplink Assignment */ + { 0x2f, "Packet Downlink Assignment" }, /* [3] 10.5.2.25d RR Packet Downlink Assignment */ + { 0x30, "Packet Downlink Assignment Type 2" }, /* [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 */ + { 0x31, "Page Mode" }, /* [3] 10.5.2.26 */ + { 0x32, "NCC Permitted" }, /* [3] 10.5.2.27 NCC Permitted */ + { 0x33, "Power Command" }, /* 10.5.2.28 */ + { 0x34, "Power Command and access type" }, /* 10.5.2.28a */ + { 0x35, "RACH Control Parameters" }, /* [3] 10.5.2.29 RACH Control Parameters */ + { 0x36, "Request Reference" }, /* [3] 10.5.2.30 Request Reference */ + { 0x37, "RR Cause" }, /* 10.5.2.31 */ + { 0x38, "Synchronization Indication" }, /* 10.5.2.39 */ + { 0x39, "SI 1 Rest Octets" }, /* [3] 10.5.2.32 */ /* [3] 10.5.2.33 SI 2bis Rest Octets */ - { 0x00, "SI 2ter Rest Octets" }, /* [3] 10.5.2.33a */ - { 0x00, "SI 2quater Rest Octets" }, /* [3] 10.5.2.33b */ - { 0x00, "SI 3 Rest Octets" }, /* [3] 10.5.2.34 */ - { 0x00, "SI 4 Rest Octets" }, /* [3] 10.5.2.35 */ - { 0x00, "SI 6 Rest Octets" }, /* [3] 10.5.2.35a */ + { 0x3a, "SI 2ter Rest Octets" }, /* [3] 10.5.2.33a */ + { 0x3b, "SI 2quater Rest Octets" }, /* [3] 10.5.2.33b */ + { 0x3c, "SI 3 Rest Octets" }, /* [3] 10.5.2.34 */ + { 0x3d, "SI 4 Rest Octets" }, /* [3] 10.5.2.35 */ + { 0x3e, "SI 6 Rest Octets" }, /* [3] 10.5.2.35a */ /* [3] 10.5.2.36 SI 7 Rest Octets * [3] 10.5.2.37 SI 8 Rest Octets * [3] 10.5.2.37a SI 9 Rest Octets */ - { 0x00, "SI 13 Rest Octets" }, /* [3] 10.5.2.37b */ + { 0x3f, "SI 13 Rest Octets" }, /* [3] 10.5.2.37b */ /* [3] 10.5.2.37c (void) * [3] 10.5.2.37d (void) * [3] 10.5.2.37e SI 16 Rest Octets @@ -267,31 +267,31 @@ const value_string gsm_rr_elem_strings[] = { * [3] 10.5.2.37g SI 19 Rest Octets * [3] 10.5.2.37h SI 18 Rest Octets * [3] 10.5.2.37i SI 20 Rest Octets */ - { 0x00, "Starting Time" }, /* [3] 10.5.2.38 Starting Time */ - { 0x00, "Timing Advance" }, /* [3] 10.5.2.40 Timing Advance */ - { 0x00, "Time Difference" }, /* [3] 10.5.2.41 Time Difference */ - { 0x00, "TLLI" }, /* [3] 10.5.2.41a TLLI */ - { 0x00, "TMSI/P-TMSI" }, /* [3] 10.5.2.42 TMSI/P-TMSI */ - { 0x00, "VGCS target mode Indication" }, /* [3] 10.5.2.42a */ + { 0x40, "Starting Time" }, /* [3] 10.5.2.38 Starting Time */ + { 0x41, "Timing Advance" }, /* [3] 10.5.2.40 Timing Advance */ + { 0x42, "Time Difference" }, /* [3] 10.5.2.41 Time Difference */ + { 0x43, "TLLI" }, /* [3] 10.5.2.41a TLLI */ + { 0x44, "TMSI/P-TMSI" }, /* [3] 10.5.2.42 TMSI/P-TMSI */ + { 0x45, "VGCS target mode Indication" }, /* [3] 10.5.2.42a */ /* Pos 40 */ - { 0x00, "VGCS Ciphering Parameters" }, /* [3] 10.5.2.42b */ - { 0x00, "Wait Indication" }, /* [3] 10.5.2.43 Wait Indication */ + { 0x46, "VGCS Ciphering Parameters" }, /* [3] 10.5.2.42b */ + { 0x47, "Wait Indication" }, /* [3] 10.5.2.43 Wait Indication */ /* [3] 10.5.2.44 SI10 rest octets $(ASCI)$ */ - { 0x00, "Extended Measurement Results" }, /* [3] 10.5.2.45 Extended Measurement Results */ - { 0x00, "Extended Measurement Frequency List" }, /* [3] 10.5.2.46 Extended Measurement Frequency List */ - { 0x00, "Suspension Cause" }, /* [3] 10.5.2.47 */ - { 0x00, "APDU ID" }, /* [3] 10.5.2.48 APDU ID */ - { 0x00, "APDU Flags" }, /* [3] 10.5.2.49 APDU Flags */ - { 0x00, "APDU Data" }, /* [3] 10.5.2.50 APDU Data */ - { 0x00, "Handover to UTRAN Command" }, /* [3] 10.5.2.51 Handover To UTRAN Command */ + { 0x48, "Extended Measurement Results" }, /* [3] 10.5.2.45 Extended Measurement Results */ + { 0x49, "Extended Measurement Frequency List" }, /* [3] 10.5.2.46 Extended Measurement Frequency List */ + { 0x4a, "Suspension Cause" }, /* [3] 10.5.2.47 */ + { 0x4b, "APDU ID" }, /* [3] 10.5.2.48 APDU ID */ + { 0x4c, "APDU Flags" }, /* [3] 10.5.2.49 APDU Flags */ + { 0x4d, "APDU Data" }, /* [3] 10.5.2.50 APDU Data */ + { 0x4e, "Handover to UTRAN Command" }, /* [3] 10.5.2.51 Handover To UTRAN Command */ /* [3] 10.5.2.52 Handover To cdma2000 Command * [3] 10.5.2.53 (void) * [3] 10.5.2.54 (void) * [3] 10.5.2.55 (void) * [3] 10.5.2.56 3G Target Cell */ - { 0x00, "Service Support" }, /* [3] 10.5.2.57 */ + { 0x4f, "Service Support" }, /* [3] 10.5.2.57 */ /* 10.5.2.58 MBMS p-t-m Channel Description */ - { 0x00, "Dedicated Service Information" }, /* [3] 10.5.2.59 */ + { 0x50, "Dedicated Service Information" }, /* [3] 10.5.2.59 */ /* * 10.5.2.60 MPRACH Description * 10.5.2.61 Restriction Timer @@ -303,7 +303,7 @@ const value_string gsm_rr_elem_strings[] = { * 10.5.2.67 PS Cause * 10.5.2.68 VGCS AMR Configuration */ - { 0x00, "Carrier Indication" }, /* 10.5.2.69 Carrier Indication */ + { 0x51, "Carrier Indication" }, /* 10.5.2.69 Carrier Indication */ { 0, NULL } }; diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c index 11ae0b8043..c5002b27ba 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -87,38 +87,38 @@ static int ett_bsslap_cell_list = -1; #define BSSLAP_PARAM_STARTING_TIME 0x2D const value_string gsm_bsslap_elem_strings[] = { - { 0x00, "Reserved" }, - { BSSLAP_PARAM_TIMING_ADVANCE, "Timing Advance" }, - { BSSLAP_PARAM_RESERVED_01, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_CELL_IDENTITY, "Cell Identity" }, - { BSSLAP_PARAM_RESERVED_02, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_RESERVED_03, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_RESERVED_04, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_CHANNEL_DESCRIPTION, "Channel Description" }, - { BSSLAP_PARAM_RESERVED_05, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_RESERVED_06, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_RESERVED_07, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_MEASUREMENT_REPORT, "Measurement Report" }, - { BSSLAP_PARAM_RESERVED_08, "Reserved" }, /* (note) */ - { BSSLAP_PARAM_CAUSE, "Cause" }, - { BSSLAP_PARAM_RRLP_FLAG, "RRLP Flag" }, - { BSSLAP_PARAM_RRLP_IE, "RRLP IE" }, - { BSSLAP_PARAM_CELL_IDENTITY_LIST, "Cell Identity List" }, - { BSSLAP_PARAM_ENHANCED_MEASUREMENT_REPORT, "Enhanced Measurement Report" }, - { BSSLAP_PARAM_LOCATION_AREA_CODE, "Location Area Code" }, - { BSSLAP_PARAM_FREQUENCY_LIST, "Frequency List" }, - { BSSLAP_PARAM_MS_POWER, "MS Power" }, - { BSSLAP_PARAM_DELTA_TIMER, "Delta Timer" }, - { BSSLAP_PARAM_SERVING_CELL_IDENTIFIER, "Serving Cell Identifier" }, - { BSSLAP_PARAM_ENCRYPTION_KEY, "Encryption Key (Kc)" }, - { BSSLAP_PARAM_CIPHER_MODE_SETTING, "Cipher Mode Setting" }, - { BSSLAP_PARAM_CHANNEL_MODE, "Channel Mode" }, - { BSSLAP_PARAM_MULTIRATE_CONFIGURATION, "MultiRate Configuration" }, - { BSSLAP_PARAM_POLLING_REPETITION, "Polling Repetition" }, - { BSSLAP_PARAM_PACKET_CHANNEL_DESCRIPTION, "Packet Channel Description" }, - { BSSLAP_PARAM_TLLI, "TLLI" }, - { BSSLAP_PARAM_TFI, "TFI" }, - { BSSLAP_PARAM_STARTING_TIME, "Starting Time" }, + { 0x00, "Reserved" }, + { 0x01, "Timing Advance" }, + { 0x02, "Reserved" }, /* (note) */ + { 0x03, "Cell Identity" }, + { 0x04, "Reserved" }, /* (note) */ + { 0x05, "Reserved" }, /* (note) */ + { 0x06, "Reserved" }, /* (note) */ + { 0x07, "Channel Description" }, + { 0x08, "Reserved" }, /* (note) */ + { 0x09, "Reserved" }, /* (note) */ + { 0x0a, "Reserved" }, /* (note) */ + { 0x0b, "Measurement Report" }, + { 0x0c, "Reserved" }, /* (note) */ + { 0x0d, "Cause" }, + { 0x0e, "RRLP Flag" }, + { 0x0f, "RRLP IE" }, + { 0x10, "Cell Identity List" }, + { 0x11, "Enhanced Measurement Report" }, + { 0x12, "Location Area Code" }, + { 0x13, "Frequency List" }, + { 0x14, "MS Power" }, + { 0x15, "Delta Timer" }, + { 0x16, "Serving Cell Identifier" }, + { 0x17, "Encryption Key (Kc)" }, + { 0x18, "Cipher Mode Setting" }, + { 0x19, "Channel Mode" }, + { 0x1a, "MultiRate Configuration" }, + { 0x1b, "Polling Repetition" }, + { 0x1c, "Packet Channel Description" }, + { 0x1d, "TLLI" }, + { 0x1e, "TFI" }, + { 0x1f, "Starting Time" }, { 0, NULL }, }; diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index 4d2a3f7aa4..f2fc5ad2d6 100644 --- a/epan/dissectors/packet-gsm_bssmap_le.c +++ b/epan/dissectors/packet-gsm_bssmap_le.c @@ -101,36 +101,36 @@ static const value_string gsm_bssmap_le_msg_strings[] = { #define BSSMAP_LE_IMEI 128 const value_string gsm_bssmap_le_elem_strings[] = { - { BSSMAP_LE_LCS_QOS, "LCS QoS" }, - { BSSMAP_LE_LCS_PRIORITY, "LCS Priority" }, - { BSSMAP_LE_LOCATION_TYPE, "Location Type" }, - { BSSMAP_LE_GANSS_LOCATION_TYPE, "GANSS Location Type" }, - { BSSMAP_LE_GEOGRAPHIC_LOCATION, "Geographic Location" }, - { BSSMAP_LE_POSITIONING_DATA, "Positioning Data" }, - { BSSMAP_LE_GANSS_POSITIONING_DATA, "GANSS Positioning Data" }, - { BSSMAP_LE_VELOCITY_DATA, "Velocity Data" }, - { BSSMAP_LE_LCS_CAUSE, "LCS Cause" }, - { BSSMAP_LE_LCS_CLIENT_TYPE, "LCS Client Type" }, - { BSSMAP_LE_APDU, "APDU" }, - { BSSMAP_LE_NETWORK_ELEMENT_IDENTITY, "Network Element Identity" }, - { BSSMAP_LE_REQUESTED_GPS_ASSISTANCE_DATA, "Requested GPS Assistance Data" }, - { BSSMAP_LE_REQUESTED_GANSS_ASSISTANCE_DATA, "Requested GANSS Assistance Data" }, - { BSSMAP_LE_DECIPHERING_KEYS, "Deciphering Keys" }, - { BSSMAP_LE_RETURN_ERROR_REQUEST, "Return Error Request" }, - { BSSMAP_LE_RETURN_ERROR_CAUSE, "Return Error Cause" }, - { BSSMAP_LE_SEGMENTATION, "Segmentation" }, - { BSSMAP_LE_CLASSMARK_INFORMATION_TYPE_3, "Classmark Information Type 3" }, - { BSSMAP_LE_CAUSE, "Cause" }, - { BSSMAP_LE_CELL_IDENTIFIER, "Cell Identifier" }, - { BSSMAP_LE_CHOSEN_CHANNEL, "Chosen Channel" }, - { BSSMAP_LE_IMSI, "IMSI" }, - { BSSMAP_LE_RESERVED_NOTE1, "Reserved" }, - { BSSMAP_LE_RESERVED_NOTE2, "Reserved" }, - { BSSMAP_LE_RESERVED_NOTE3, "Reserved" }, - { BSSMAP_LE_LCS_CAPABILITY, "LCS Capability" }, - { BSSMAP_LE_PACKET_MEASUREMENT_REPORT, "Packet Measurement Report" }, - { BSSMAP_LE_CELL_IDENTITY_LIST, "Cell Identity List" }, - { BSSMAP_LE_IMEI, "IMEI" }, + { 0x00, "LCS QoS" }, + { 0x01, "LCS Priority" }, + { 0x02, "Location Type" }, + { 0x03, "GANSS Location Type" }, + { 0x04, "Geographic Location" }, + { 0x05, "Positioning Data" }, + { 0x06, "GANSS Positioning Data" }, + { 0x07, "Velocity Data" }, + { 0x08, "LCS Cause" }, + { 0x09, "LCS Client Type" }, + { 0x0a, "APDU" }, + { 0x0b, "Network Element Identity" }, + { 0x0c, "Requested GPS Assistance Data" }, + { 0x0d, "Requested GANSS Assistance Data" }, + { 0x0e, "Deciphering Keys" }, + { 0x0f, "Return Error Request" }, + { 0x10, "Return Error Cause" }, + { 0x11, "Segmentation" }, + { 0x12, "Classmark Information Type 3" }, + { 0x13, "Cause" }, + { 0x14, "Cell Identifier" }, + { 0x15, "Chosen Channel" }, + { 0x16, "IMSI" }, + { 0x17, "Reserved" }, + { 0x18, "Reserved" }, + { 0x19, "Reserved" }, + { 0x20, "LCS Capability" }, + { 0x21, "Packet Measurement Report" }, + { 0x22, "Cell Identity List" }, + { 0x23, "IMEI" }, { 0, NULL } }; @@ -758,37 +758,37 @@ bssmap_le_perf_loc_request(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ curr_len = len; /* Location Type 9.1.1 M 3-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_LOC_TYPE].value, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_TYPE, NULL) + ELEM_MAND_TLV(BSSMAP_LE_LOCATION_TYPE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_TYPE, NULL) /* Cell Identifier 9.1.2 O 5-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BSSMAP_LE_CELL_IDENTIFIER, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Classmark Information Type 3 9.1.3 O 3-14 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CM_INFO_3].value, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); + ELEM_OPT_TLV(BSSMAP_LE_CLASSMARK_INFORMATION_TYPE_3, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); /* LCS Client Type 9.1.4 C (note 3) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CLIENT_TYPE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CLIENT_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE, NULL); /* Chosen Channel 9.1.5 O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BSSMAP_LE_CHOSEN_CHANNEL, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); /* LCS Priority 9.1.6 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LCS_PRIO].value, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_PRIORITY, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO, NULL); /* LCS QoS 9.1.6a C (note 1) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCSQOS].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS, NULL); /* GPS Assistance Data 9.1.7 C (note 2) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GPS_ASSIST_DATA].value, GSM_A_PDU_TYPE_BSSMAP, BE_GPS_ASSIST_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_REQUESTED_GPS_ASSISTANCE_DATA, GSM_A_PDU_TYPE_BSSMAP, BE_GPS_ASSIST_DATA, NULL); /* APDU 9.1.8 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_OPT_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); /* LCS Capability 9.1.9 O */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CAPABILITY].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAPABILITY, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CAPABILITY, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAPABILITY, NULL); /* Packet Measurement Report 9.1.10 O*/ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_PACKET_MEAS_REP].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_PACKET_MEAS_REP, NULL); + ELEM_OPT_TLV(BSSMAP_LE_PACKET_MEASUREMENT_REPORT, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_PACKET_MEAS_REP, NULL); /* Measured Cell Identity List 9.1.11 O*/ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_MEAS_CELL_ID].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_MEAS_CELL_ID, NULL); + ELEM_OPT_TLV(BSSMAP_LE_CELL_IDENTITY_LIST, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_MEAS_CELL_ID, NULL); /* IMSI 9.1.12 O (note 4) 5-10 */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_IMSI].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMSI, NULL); + ELEM_OPT_TLV(BSSMAP_LE_IMSI, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMSI, NULL); /* IMEI 9.1.13 O (note 4) 10 (use same decode as IMSI) */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_IMEI].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMEI, NULL); + ELEM_OPT_TLV(BSSMAP_LE_IMEI, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_IMEI, NULL); /* GANSS Location Type 9.1.14 C 3 */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_GANSS_LOC_TYPE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GANSS_LOCATION_TYPE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE, NULL); /* GANSS Assistance Data 9.1.15 C (note 5) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_REQ_GNSS_ASSIST_D].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GNSS_ASSIST_D, NULL); + ELEM_OPT_TLV(BSSMAP_LE_REQUESTED_GANSS_ASSISTANCE_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_REQ_GNSS_ASSIST_D, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); @@ -808,17 +808,17 @@ bssmap_le_perf_loc_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Location Estimate 9.2.1 C (note 1) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LOC_EST].value, BSSAP_PDU_TYPE_BSSMAP, BE_LOC_EST, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GEOGRAPHIC_LOCATION, BSSAP_PDU_TYPE_BSSMAP, BE_LOC_EST, NULL); /* Positioning Data 9.2.2 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_POS_DATA].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_POSITIONING_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA, NULL); /* Deciphering Keys 9.2.3 C (note 2) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_DECIPH_KEYS].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS, NULL); + ELEM_OPT_TLV(BSSMAP_LE_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS, NULL); /* LCS Cause 9.2.4 C (note 3) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_LCS_CAUSE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); + ELEM_OPT_TLV(BSSMAP_LE_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); /* Velocity Estimate 9.2.5 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VEL_EST].value, BSSAP_PDU_TYPE_BSSMAP, BE_VEL_EST, NULL); + ELEM_OPT_TLV(BSSMAP_LE_VELOCITY_DATA, BSSAP_PDU_TYPE_BSSMAP, BE_VEL_EST, NULL); /* GANSS Positioning Data 9.2.6 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_GANSS_POS_DATA].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_POS_DATA, NULL); + ELEM_OPT_TLV(BSSMAP_LE_GANSS_POSITIONING_DATA, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_POS_DATA, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -837,9 +837,9 @@ bssmap_le_connection_oriented(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf curr_len = len; /* APDU 9.8.1 M 3-n */ - ELEM_MAND_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_MAND_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); /* Segmentation 9.8.2 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SEG].value, BSSAP_PDU_TYPE_BSSMAP, BE_SEG, NULL); + ELEM_OPT_TLV(BSSMAP_LE_SEGMENTATION, BSSAP_PDU_TYPE_BSSMAP, BE_SEG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -874,9 +874,9 @@ bssmap_le_perf_loc_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Cell Identifier 9.12.1 M */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BSSMAP_LE_CELL_IDENTIFIER, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* APDU 9.1.8 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_le_elem_strings[DE_BMAPLE_APDU].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); + ELEM_OPT_TLV(BSSMAP_LE_APDU, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_APDU, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 15762ce6df..ed477ef633 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -318,17 +318,17 @@ static value_string_ext security_header_type_vals_ext = VALUE_STRING_EXT_INIT(se const value_string nas_eps_common_elem_strings[] = { { 0x00, "Additional information" }, /* 9.9.2.0 Additional information */ - { 0x00, "Device properties" }, /* 9.9.2.0A Device properties */ - { 0x00, "EPS bearer context status" }, /* 9.9.2.1 EPS bearer context status */ - { 0x00, "Location area identification" }, /* 9.9.2.2 Location area identification */ - { 0x00, "Mobile identity" }, /* 9.9.2.3 Mobile identity */ - { 0x00, "Mobile station classmark 2" }, /* 9.9.2.4 Mobile station classmark 2 */ - { 0x00, "Mobile station classmark 3" }, /* 9.9.2.5 Mobile station classmark 3 */ - { 0x00, "NAS security parameters from E-UTRA" }, /* 9.9.2.6 NAS security parameters from E-UTRA */ - { 0x00, "NAS security parameters to E-UTRA" }, /* 9.9.2.7 NAS security parameters to E-UTRA */ - { 0x00, "PLMN list" }, /* 9.9.2.8 PLMN list */ + { 0x01, "Device properties" }, /* 9.9.2.0A Device properties */ + { 0x02, "EPS bearer context status" }, /* 9.9.2.1 EPS bearer context status */ + { 0x03, "Location area identification" }, /* 9.9.2.2 Location area identification */ + { 0x04, "Mobile identity" }, /* 9.9.2.3 Mobile identity */ + { 0x05, "Mobile station classmark 2" }, /* 9.9.2.4 Mobile station classmark 2 */ + { 0x06, "Mobile station classmark 3" }, /* 9.9.2.5 Mobile station classmark 3 */ + { 0x07, "NAS security parameters from E-UTRA" }, /* 9.9.2.6 NAS security parameters from E-UTRA */ + { 0x08, "NAS security parameters to E-UTRA" }, /* 9.9.2.7 NAS security parameters to E-UTRA */ + { 0x09, "PLMN list" }, /* 9.9.2.8 PLMN list */ /* 9.9.2.9 Spare half octet */ - { 0x00, "Supported codec list" }, /* 9.9.2.10 Supported codec list */ + { 0x0a, "Supported codec list" }, /* 9.9.2.10 Supported codec list */ { 0, NULL } }; @@ -603,57 +603,57 @@ guint16 (*nas_eps_common_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_inf const value_string nas_emm_elem_strings[] = { /* 9.9.3 EPS Mobility Management (EMM) information elements */ { 0x00, "Additional update result" }, /* 9.9.3.0A Additional update result */ - { 0x00, "Additional update type" }, /* 9.9.3.0B Additional update type */ - { 0x00, "Authentication failure parameter" }, /* 9.9.3.1 Authentication failure parameter */ - { 0x00, "Authentication parameter AUTN" }, /* 9.9.3.2 Authentication parameter AUTN */ - { 0x00, "Authentication parameter RAND" }, /* 9.9.3.3 Authentication parameter RAND */ - { 0x00, "Authentication response parameter" }, /* 9.9.3.4 Authentication response parameter */ - { 0x00, "CSFB response" }, /* 9.9.3.5 CSFB response */ - { 0x00, "Daylight saving time" }, /* 9.9.3.6 Daylight saving time */ - { 0x00, "Detach type" }, /* 9.9.3.7 Detach type */ - { 0x00, "DRX parameter" }, /* 9.9.3.8 DRX parameter */ - { 0x00, "EMM cause" }, /* 9.9.3.9 EMM cause */ - { 0x00, "EPS attach result" }, /* 9.9.3.10 EPS attach result */ - { 0x00, "EPS attach type" }, /* 9.9.3.11 EPS attach type */ - { 0x00, "EPS mobile identity" }, /* 9.9.3.12 EPS mobile identity */ - { 0x00, "EPS network feature support" }, /* 9.9.3.12 EPS mobile identity */ - { 0x00, "EPS update result" }, /* 9.9.3.13 EPS update result */ - { 0x00, "EPS update type" }, /* 9.9.3.14 EPS update type */ - { 0x00, "ESM message container" }, /* 9.9.3.15 ESM message conta */ - { 0x00, "GPRS timer" }, /* 9.9.3.16 GPRS timer ,See subclause 10.5.7.3 in 3GPP TS 24.008 [6]. */ - { 0x00, "GPRS timer 2" }, /* 9.9.3.16A GPRS timer 2, See subclause 10.5.7.4 in 3GPP TS 24.008. */ - { 0x00, "GPRS timer 3" }, /* 9.9.3.16B GPRS timer 3, See subclause 10.5.7.4a in 3GPP TS 24.008. */ - { 0x00, "Identity type 2" }, /* 9.9.3.17 Identity type 2 ,See subclause 10.5.5.9 in 3GPP TS 24.008 [6]. */ - { 0x00, "IMEISV request" }, /* 9.9.3.18 IMEISV request ,See subclause 10.5.5.10 in 3GPP TS 24.008 [6]. */ - { 0x00, "KSI and sequence number" }, /* 9.9.3.19 KSI and sequence number */ - { 0x00, "MS network capability" }, /* 9.9.3.20 MS network capability ,See subclause 10.5.5.12 in 3GPP TS 24.008 [6]. */ - { 0x00, "MS network feature support" }, /* 9.9.3.20A MS network feature support, See subclause 10.5.1.15 in 3GPP TS 24.008. */ - { 0x00, "NAS key set identifier" }, /* 9.9.3.21 NAS key set identifier */ - { 0x00, "NAS message container" }, /* 9.9.3.22 NAS message container */ - { 0x00, "NAS security algorithms" }, /* 9.9.3.23 NAS security algorithms */ - { 0x00, "Network name" }, /* 9.9.3.24 Network name, See subclause 10.5.3.5a in 3GPP TS 24.008 [6]. */ - { 0x00, "Nonce" }, /* 9.9.3.25 Nonce */ - { 0x00, "Paging identity" }, /* 9.9.3.25A Paging identity */ - { 0x00, "P-TMSI signature" }, /* 9.9.3.26 P-TMSI signature, See subclause 10.5.5.8 in 3GPP TS 24.008 [6]. */ - { 0x00, "Service type" }, /* 9.9.3.27 Service type ,See subclause 10.5.5.15 in 3GPP TS 24.008 [6]. */ - { 0x00, "Short MAC" }, /* 9.9.3.28 Short MAC */ - { 0x00, "Time zone" }, /* 9.9.3.29 Time zone, See subclause 10.5.3.8 in 3GPP TS 24.008 [6]. */ - { 0x00, "Time zone and time" }, /* 9.9.3.30 Time zone and time, See subclause 10.5.3.9 in 3GPP TS 24.008 [6]. */ - { 0x00, "TMSI status" }, /* 9.9.3.31 TMSI status, See subclause 10.5.5.4 in 3GPP TS 24.008 [6]. */ - { 0x00, "Tracking area identity" }, /* 9.9.3.32 Tracking area identity */ - { 0x00, "Tracking area identity list" }, /* 9.9.3.33 Tracking area identity list */ - { 0x00, "UE network capability" }, /* 9.9.3.34 UE network capability */ - { 0x00, "UE radio capability information update needed" }, /* 9.9.3.35 UE radio capability information update needed */ - { 0x00, "UE security capability" }, /* 9.9.3.36 UE security capability */ - { 0x00, "Emergency Number List" }, /* 9.9.3.37 Emergency Number List */ - { 0x00, "CLI" }, /* 9.9.3.38 CLI */ - { 0x00, "SS Code" }, /* 9.9.3.39 SS Code */ - { 0x00, "LCS indicator" }, /* 9.9.3.40 LCS indicator */ - { 0x00, "LCS client identity" }, /* 9.9.3.41 LCS client identity */ - { 0x00, "Generic message container type" }, /* 9.9.3.42 Generic message container type */ - { 0x00, "Generic message container" }, /* 9.9.3.43 Generic message container */ - { 0x00, "Voice domain preference and UEs usage setting" }, /* 9.9.3.44 Voice domain preference and UEs usage setting */ - { 0x00, "GUTI type" }, /* 9.9.3.45 GUTI type */ + { 0x01, "Additional update type" }, /* 9.9.3.0B Additional update type */ + { 0x02, "Authentication failure parameter" }, /* 9.9.3.1 Authentication failure parameter */ + { 0x03, "Authentication parameter AUTN" }, /* 9.9.3.2 Authentication parameter AUTN */ + { 0x04, "Authentication parameter RAND" }, /* 9.9.3.3 Authentication parameter RAND */ + { 0x05, "Authentication response parameter" }, /* 9.9.3.4 Authentication response parameter */ + { 0x06, "CSFB response" }, /* 9.9.3.5 CSFB response */ + { 0x07, "Daylight saving time" }, /* 9.9.3.6 Daylight saving time */ + { 0x08, "Detach type" }, /* 9.9.3.7 Detach type */ + { 0x09, "DRX parameter" }, /* 9.9.3.8 DRX parameter */ + { 0x0a, "EMM cause" }, /* 9.9.3.9 EMM cause */ + { 0x0b, "EPS attach result" }, /* 9.9.3.10 EPS attach result */ + { 0x0c, "EPS attach type" }, /* 9.9.3.11 EPS attach type */ + { 0x0d, "EPS mobile identity" }, /* 9.9.3.12 EPS mobile identity */ + { 0x0e, "EPS network feature support" }, /* 9.9.3.12 EPS mobile identity */ + { 0x0f, "EPS update result" }, /* 9.9.3.13 EPS update result */ + { 0x10, "EPS update type" }, /* 9.9.3.14 EPS update type */ + { 0x11, "ESM message container" }, /* 9.9.3.15 ESM message conta */ + { 0x12, "GPRS timer" }, /* 9.9.3.16 GPRS timer ,See subclause 10.5.7.3 in 3GPP TS 24.008 [6]. */ + { 0x13, "GPRS timer 2" }, /* 9.9.3.16A GPRS timer 2, See subclause 10.5.7.4 in 3GPP TS 24.008. */ + { 0x14, "GPRS timer 3" }, /* 9.9.3.16B GPRS timer 3, See subclause 10.5.7.4a in 3GPP TS 24.008. */ + { 0x15, "Identity type 2" }, /* 9.9.3.17 Identity type 2 ,See subclause 10.5.5.9 in 3GPP TS 24.008 [6]. */ + { 0x16, "IMEISV request" }, /* 9.9.3.18 IMEISV request ,See subclause 10.5.5.10 in 3GPP TS 24.008 [6]. */ + { 0x17, "KSI and sequence number" }, /* 9.9.3.19 KSI and sequence number */ + { 0x18, "MS network capability" }, /* 9.9.3.20 MS network capability ,See subclause 10.5.5.12 in 3GPP TS 24.008 [6]. */ + { 0x19, "MS network feature support" }, /* 9.9.3.20A MS network feature support, See subclause 10.5.1.15 in 3GPP TS 24.008. */ + { 0x1a, "NAS key set identifier" }, /* 9.9.3.21 NAS key set identifier */ + { 0x1b, "NAS message container" }, /* 9.9.3.22 NAS message container */ + { 0x1c, "NAS security algorithms" }, /* 9.9.3.23 NAS security algorithms */ + { 0x1d, "Network name" }, /* 9.9.3.24 Network name, See subclause 10.5.3.5a in 3GPP TS 24.008 [6]. */ + { 0x1e, "Nonce" }, /* 9.9.3.25 Nonce */ + { 0x1f, "Paging identity" }, /* 9.9.3.25A Paging identity */ + { 0x20, "P-TMSI signature" }, /* 9.9.3.26 P-TMSI signature, See subclause 10.5.5.8 in 3GPP TS 24.008 [6]. */ + { 0x21, "Service type" }, /* 9.9.3.27 Service type ,See subclause 10.5.5.15 in 3GPP TS 24.008 [6]. */ + { 0x22, "Short MAC" }, /* 9.9.3.28 Short MAC */ + { 0x23, "Time zone" }, /* 9.9.3.29 Time zone, See subclause 10.5.3.8 in 3GPP TS 24.008 [6]. */ + { 0x24, "Time zone and time" }, /* 9.9.3.30 Time zone and time, See subclause 10.5.3.9 in 3GPP TS 24.008 [6]. */ + { 0x25, "TMSI status" }, /* 9.9.3.31 TMSI status, See subclause 10.5.5.4 in 3GPP TS 24.008 [6]. */ + { 0x26, "Tracking area identity" }, /* 9.9.3.32 Tracking area identity */ + { 0x27, "Tracking area identity list" }, /* 9.9.3.33 Tracking area identity list */ + { 0x28, "UE network capability" }, /* 9.9.3.34 UE network capability */ + { 0x29, "UE radio capability information update needed" }, /* 9.9.3.35 UE radio capability information update needed */ + { 0x2a, "UE security capability" }, /* 9.9.3.36 UE security capability */ + { 0x2b, "Emergency Number List" }, /* 9.9.3.37 Emergency Number List */ + { 0x2c, "CLI" }, /* 9.9.3.38 CLI */ + { 0x2d, "SS Code" }, /* 9.9.3.39 SS Code */ + { 0x2e, "LCS indicator" }, /* 9.9.3.40 LCS indicator */ + { 0x2f, "LCS client identity" }, /* 9.9.3.41 LCS client identity */ + { 0x30, "Generic message container type" }, /* 9.9.3.42 Generic message container type */ + { 0x31, "Generic message container" }, /* 9.9.3.43 Generic message container */ + { 0x32, "Voice domain preference and UEs usage setting" }, /* 9.9.3.44 Voice domain preference and UEs usage setting */ + { 0x33, "GUTI type" }, /* 9.9.3.45 GUTI type */ { 0, NULL } }; #define NUM_NAS_EMM_ELEM (sizeof(nas_emm_elem_strings)/sizeof(value_string)) @@ -2802,24 +2802,24 @@ guint16 (*emm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U /* 9.9.4 EPS Session Management (ESM) information elements */ const value_string nas_esm_elem_strings[] = { { 0x00, "Access point name" }, /* 9.9.4.1 Access point name */ - { 0x00, "APN aggregate maximum bit rate" }, /* 9.9.4.2 APN aggregate maximum bit rate */ - { 0x00, "Connectivity type" }, /* 9.9.4.2A Connectivity type */ - { 0x00, "EPS quality of service" }, /* 9.9.4.3 EPS quality of service */ - { 0x00, "ESM cause" }, /* 9.9.4.4 ESM cause */ - { 0x00, "ESM information transfer flag" }, /* 9.9.4.5 ESM information transfer flag */ - { 0x00, "Linked EPS bearer identity" }, /* 9.9.4.6 Linked EPS bearer identity */ - { 0x00, "LLC service access point identifier" }, /* 9.9.4.7 LLC service access point identifier */ - { 0x00, "Notification indicator" }, /* 9.9.4.7a Notification indicator */ - { 0x00, "Packet flow identifier" }, /* 9.9.4.8 Packet flow identifier */ - { 0x00, "PDN address" }, /* 9.9.4.9 PDN address */ - { 0x00, "PDN type" }, /* 9.9.4.10 PDN type */ - { 0x00, "Protocol configuration options" }, /* 9.9.4.11 Protocol configuration options */ - { 0x00, "Quality of service" }, /* 9.9.4.12 Quality of service */ - { 0x00, "Radio priority" }, /* 9.9.4.13 Radio priority */ - { 0x00, "Request type" }, /* 9.9.4.14 Request type */ - { 0x00, "Traffic flow aggregate description" }, /* 9.9.4.15 Traffic flow aggregate description */ - { 0x00, "Traffic flow templat" }, /* 9.9.4.16 Traffic flow template */ - { 0x00, "Transaction identifier" }, /* 9.9.4.17 Transaction identifier */ + { 0x01, "APN aggregate maximum bit rate" }, /* 9.9.4.2 APN aggregate maximum bit rate */ + { 0x02, "Connectivity type" }, /* 9.9.4.2A Connectivity type */ + { 0x03, "EPS quality of service" }, /* 9.9.4.3 EPS quality of service */ + { 0x04, "ESM cause" }, /* 9.9.4.4 ESM cause */ + { 0x05, "ESM information transfer flag" }, /* 9.9.4.5 ESM information transfer flag */ + { 0x06, "Linked EPS bearer identity" }, /* 9.9.4.6 Linked EPS bearer identity */ + { 0x07, "LLC service access point identifier" }, /* 9.9.4.7 LLC service access point identifier */ + { 0x08, "Notification indicator" }, /* 9.9.4.7a Notification indicator */ + { 0x09, "Packet flow identifier" }, /* 9.9.4.8 Packet flow identifier */ + { 0x0a, "PDN address" }, /* 9.9.4.9 PDN address */ + { 0x0b, "PDN type" }, /* 9.9.4.10 PDN type */ + { 0x0c, "Protocol configuration options" }, /* 9.9.4.11 Protocol configuration options */ + { 0x0d, "Quality of service" }, /* 9.9.4.12 Quality of service */ + { 0x0e, "Radio priority" }, /* 9.9.4.13 Radio priority */ + { 0x0f, "Request type" }, /* 9.9.4.14 Request type */ + { 0x10, "Traffic flow aggregate description" }, /* 9.9.4.15 Traffic flow aggregate description */ + { 0x11, "Traffic flow template" }, /* 9.9.4.16 Traffic flow template */ + { 0x12, "Transaction identifier" }, /* 9.9.4.17 Transaction identifier */ { 0, NULL } }; diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 1d78093524..9905354abf 100644 --- a/epan/dissectors/packet-sgsap.c +++ b/epan/dissectors/packet-sgsap.c @@ -568,45 +568,45 @@ de_sgsap_vlr_name(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint */ const value_string sgsap_elem_strings[] = { - { 0x01, "IMSI" }, /* 9.4.6 */ - { 0x02, "VLR name" }, /* 9.4.22 */ - { 0x03, "TMSI" }, /* 9.4.20 */ - { 0x04, "Location area identifier" }, /* 9.4.11 */ - { 0x05, "Channel Needed" }, /* 9.4.23 */ - { 0x06, "eMLPP Priority" }, /* 9.4.24 */ - { 0x07, "TMSI status" }, /* 9.4.21 */ - { 0x08, "SGs cause" }, /* 9.4.18 */ - { 0x09, "MME name" }, /* 9.4.13 */ - { 0x0a, "EPS location update type" }, /* 9.4.2 */ - { 0x0b, "Global CN-Id" }, /* 9.4.4 */ + { 0x00, "IMSI" }, /* 9.4.6 */ + { 0x01, "VLR name" }, /* 9.4.22 */ + { 0x02, "TMSI" }, /* 9.4.20 */ + { 0x03, "Location area identifier" }, /* 9.4.11 */ + { 0x04, "Channel Needed" }, /* 9.4.23 */ + { 0x05, "eMLPP Priority" }, /* 9.4.24 */ + { 0x06, "TMSI status" }, /* 9.4.21 */ + { 0x07, "SGs cause" }, /* 9.4.18 */ + { 0x08, "MME name" }, /* 9.4.13 */ + { 0x09, "EPS location update type" }, /* 9.4.2 */ + { 0x0a, "Global CN-Id" }, /* 9.4.4 */ + { 0x0b, "Undefined" }, /* */ { 0x0c, "Undefined" }, /* */ - { 0x0d, "Undefined" }, /* */ - { 0x0e, "Mobile identity" }, /* 9.4.14 */ - { 0x0f, "Reject cause" }, /* 9.4.16 */ - { 0x10, "IMSI detach from EPS service type" }, /* 9.4.7 */ - { 0x11, "IMSI detach from non-EPS service type" }, /* 9.4.8 */ + { 0x0d, "Mobile identity" }, /* 9.4.14 */ + { 0x0e, "Reject cause" }, /* 9.4.16 */ + { 0x0f, "IMSI detach from EPS service type" }, /* 9.4.7 */ + { 0x10, "IMSI detach from non-EPS service type" }, /* 9.4.8 */ - { 0x15, "IMEISV" }, /* 9.4.5 */ - { 0x16, "NAS message container" }, /* 9.4.15 */ - { 0x17, "MM information" }, /* 9.4.12 */ + { 0x11, "IMEISV" }, /* 9.4.5 */ + { 0x12, "NAS message container" }, /* 9.4.15 */ + { 0x13, "MM information" }, /* 9.4.12 */ - { 0x18, "Undefined" }, /* */ - { 0x19, "Undefined" }, /* */ - { 0x1a, "Undefined" }, /* */ + { 0x14, "Undefined" }, /* */ + { 0x15, "Undefined" }, /* */ + { 0x16, "Undefined" }, /* */ - { 0x1b, "Erroneous message" }, /* 9.4.3 */ - { 0x1c, "CLI" }, /* 9.4.1 */ - { 0x1d, "LCS client identity" }, /* 9.4.9 */ - { 0x1e, "LCS indicator" }, /* 9.4.10 */ - { 0x1f, "SS code" }, /* 9.4.19 */ - { 0x20, "Service indicator" }, /* 9.4.17 */ - { 0x21, "UE Time Zone" }, /* 9.4.21b */ - { 0x22, "Mobile Station Classmark 2" }, /* 9.4.14a */ - { 0x23, "Tracking Area Identity" }, /* 9.4.21a */ - { 0x24, "E-UTRAN Cell Global Identity" }, /* 9.4.3a */ - { 0x25, "UE EMM mode" }, /* 9.4.21c */ + { 0x17, "Erroneous message" }, /* 9.4.3 */ + { 0x18, "CLI" }, /* 9.4.1 */ + { 0x19, "LCS client identity" }, /* 9.4.9 */ + { 0x1a, "LCS indicator" }, /* 9.4.10 */ + { 0x1b, "SS code" }, /* 9.4.19 */ + { 0x1c, "Service indicator" }, /* 9.4.17 */ + { 0x1d, "UE Time Zone" }, /* 9.4.21b */ + { 0x1e, "Mobile Station Classmark 2" }, /* 9.4.14a */ + { 0x1f, "Tracking Area Identity" }, /* 9.4.21a */ + { 0x20, "E-UTRAN Cell Global Identity" }, /* 9.4.3a */ + { 0x21, "UE EMM mode" }, /* 9.4.21c */ { 0, NULL } }; @@ -636,8 +636,8 @@ typedef enum DE_SGSAP_EPS_LOC_UPD_TYPE, /. 9.4.2 EPS location update type./ DE_SGSAP_GLOBAL_CN_ID, /. 9.4.4 Global CN-Id./ + DE_SGSAP_UDEF_11, /. Undefined ./ DE_SGSAP_UDEF_12, /. Undefined ./ - DE_SGSAP_UDEF_13, /. Undefined ./ DE_SGSAP_MID, /. 9.4.14 Mobile identity./ DE_SGSAP_REJ_CAUSE, /. 9.4.16 Reject cause ./ @@ -648,9 +648,9 @@ typedef enum DE_SGSAP_NAS_MSG_CONTAINER, /. 9.4.15 NAS message container./ DE_SGSAP_MM_INFO, /. 9.4.12 MM information./ - DE_SGSAP_UDEF_24, /. Undefined ./ - DE_SGSAP_UDEF_25, /. Undefined ./ - DE_SGSAP_UDEF_26, /. Undefined ./ + DE_SGSAP_UDEF_20, /. Undefined ./ + DE_SGSAP_UDEF_21, /. Undefined ./ + DE_SGSAP_UDEF_22, /. Undefined ./ DE_SGSAP_ERR_MSG, /. 9.4.3 Erroneous message./ DE_SGSAP_CLI, /. 9.4.1 CLI ./ @@ -682,8 +682,8 @@ guint16 (*sgsap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo de_sgsap_eps_loc_upd_type, /* 9.4.2 EPS location update type*/ de_sgsap_g_cn_id, /* 9.4.4 Global CN-Id*/ + NULL/*DE_SGSAP_UDEF_11*/, /* Undefined */ NULL/*DE_SGSAP_UDEF_12*/, /* Undefined */ - NULL/*DE_SGSAP_UDEF_13*/, /* Undefined */ NULL/*DE_SGSAP_MID*/, /* 9.4.14 Mobile identity*/ NULL/*DE_SGSAP_REJ_CAUSE*/, /* 9.4.16 Reject cause */ @@ -694,9 +694,9 @@ guint16 (*sgsap_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo de_sgsap_nas_msg_container, /* 9.4.15 NAS message container*/ de_sgsap_mm_info, /* 9.4.12 MM information*/ - NULL/*DE_SGSAP_UDEF_24*/, /* Undefined */ - NULL/*DE_SGSAP_UDEF_25*/, /* Undefined */ - NULL/*DE_SGSAP_UDEF_26*/, /* Undefined */ + NULL/*DE_SGSAP_UDEF_20*/, /* Undefined */ + NULL/*DE_SGSAP_UDEF_21*/, /* Undefined */ + NULL/*DE_SGSAP_UDEF_22*/, /* Undefined */ de_sgsap_err_msg, /* 9.4.3 Erroneous message*/ NULL/*DE_SGSAP_CLI*/, /* 9.4.1 CLI */