diff options
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-bssgp.c | 306 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_bssmap.c | 902 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_common.c | 36 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_dtap.c | 162 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_gm.c | 179 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_rp.c | 34 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_a_rr.c | 164 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_bsslap.c | 63 | ||||
| -rw-r--r-- | epan/dissectors/packet-gsm_bssmap_le.c | 60 | ||||
| -rw-r--r-- | epan/dissectors/packet-nas_eps.c | 219 | ||||
| -rw-r--r-- | epan/dissectors/packet-sgsap.c | 78 |
11 files changed, 1100 insertions, 1103 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 62824f0136..2d0511e06c 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -3322,159 +3322,6 @@ de_bssgp_unconfim_send_state_var(tvbuff_t *tvb, proto_tree *tree, packet_info *p return 2; } -const value_string bssgp_elem_strings[] = { - { 0x00, "Alignment Octets" }, /* 11.3.1 Alignment octets */ - { 0x01, "Bmax default MS" }, /* 11.3.2 Bmax default MS */ - { 0x02, "BSS Area Indication" }, /* 11.3.3 BSS Area Indication */ - { 0x03, "Bucket Leak Rate (R)" }, /* 11.3.4 Bucket Leak Rate (R) */ - { 0x04, "BVCI (BSSGP Virtual Connection Identifier)" }, /* 11.3.6 BVCI (BSSGP Virtual Connection Identifier) */ - { 0x05, "BVC Bucket size" }, /* 11.3.5 BVC Bucket Size */ - { 0x06, "BVC Measurement" }, /* 11.3.7 BVC Measurement */ - { 0x07, "Cause" }, /* 11.3.8 Cause */ - { 0x08, "Cell Identifier" }, /* 11.3.9 Cell Identifier */ - { 0x09, "Channel needed" }, /* 11.3.10 Channel needed */ - { 0x0a, "DRX Parameters" }, /* 11.3.11 DRX Parameters */ - { 0x0b, "eMLPP-Priority" }, /* 11.3.12 eMLPP-Priority */ - { 0x0c, "Flush Action" }, /* 11.3.13 Flush Action */ - { 0x0d, "IMSI" }, /* 11.3.14 IMSI */ - { 0x0e, "LLC-PDU" }, /* 11.3.15 LLC-PDU */ - { 0x0f, "LLC Frames Discarded" }, /* 11.3.16 LLC Frames Discarded */ - { 0x10, "Location Area" }, /* 11.3.17 Location Area */ - { 0x11, "Mobile Id" }, /* 11.3.20 Mobile Id */ - { 0x12, "MS Bucket Size" }, /* 11.3.21 MS Bucket Size */ - { 0x13, "MS Radio Access Capability" }, /* 11.3.22 MS Radio Access Capability GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP */ - { 0x14, "OMC Id" }, /* 11.3.23 OMC Id */ - { 0x15, "PDU In Error" }, /* 11.3.24 PDU In Error */ - { 0x16, "PDU Lifetime" }, /* 11.3.25 PDU Lifetime */ - { 0x17, "Priority" }, /* 11.3.27 Priority */ - { 0x18, "QoS Profile" }, /* 11.3.28 QoS Profile */ - { 0x19, "Radio Cause" }, /* 11.3.29 Radio Cause */ - { 0x1a, "RA-Cap-UPD-Cause" }, /* 11.3.30 RA-Cap-UPD-Cause */ - { 0x1b, "Routeing Area" }, /* 11.3.31 Routeing Area */ - { 0x1c, "R_default_MS" }, /* 11.3.32 R_default_MS */ - { 0x1d, "Suspend Reference Number" }, /* 11.3.33 Suspend Reference Number */ - { 0x1e, "Tag" }, /* 11.3.34 Tag */ - { 0x1f, "Temporary logical link Identity (TLLI)" }, /* 11.3.35 Temporary logical link Identity (TLLI) GSM_A_PDU_TYPE_RR, DE_RR_TLLI*/ - { 0x20, "Temporary Mobile Subscriber Identity (TMSI)" }, /* 11.3.36 Temporary Mobile Subscriber Identity (TMSI)GSM_A_PDU_TYPE_RR, DE_RR_TMSI_PTMSI */ - { 0x21, "Trace Reference" }, /* 11.3.37 Trace Reference */ - { 0x22, "Trace Type" }, /* 11.3.38 Trace Type */ - { 0x23, "Transaction Id" }, /* 11.3.39 Transaction Id */ - { 0x24, "Trigger Id" }, /* 11.3.40 Trigger Id */ - { 0x25, "Number of octets affected" }, /* 11.3.41 Number of octets affected */ - { 0x26, "LSA Identifier List" }, /* 11.3.18 LSA Identifier List */ - { 0x27, "LSA Information" }, /* 11.3.19 LSA Information */ - { 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 */ - { 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*/ - /* 11.3.53 Location Type 0x7c, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE*/ - /* 11.3.54 Location Estimate BSSGP_IEI_LOCATION_ESTIMATE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_EST*/ - /* 11.3.55 Positioning Data 0x7d, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA*/ - /* 11.3.56 Deciphering Keys BSSGP_IEI_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS */ - /* 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*/ - { 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 */ - { 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 */ - { 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 */ - { 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 */ - { 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 */ - { 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) */ - { 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 */ - { 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 */ - { 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 */ - { 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);*/ - { 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 */ - { 0x64, "Redirect Attempt Flag"}, /* 11.3.111 Redirect Attempt Flag */ - { 0x65, "Redirection Indication"}, /* 11.3.112 Redirection Indication */ - { 0x66, "Redirection Completed"}, /* 11.3.113 Redirection Completed */ - { 0x67, "Unconfirmed Send State Variable"}, /* 11.3.114 Unconfirmed send state variable */ - - { 0, NULL } -}; - -#define NUM_BSSGP_ELEM (sizeof(bssgp_elem_strings)/sizeof(value_string)) -gint ett_bssgp_elem[NUM_BSSGP_ELEM]; - - typedef enum { DE_BSSGP_ALIGNMENT_OCTETS, /* 11.3.1 0x00 Alignment octets */ @@ -3589,6 +3436,159 @@ typedef enum } bssgp_elem_idx_t; +const value_string bssgp_elem_strings[] = { + { DE_BSSGP_ALIGNMENT_OCTETS, "Alignment Octets" }, /* 11.3.1 Alignment octets */ + { DE_BSSGP_BMAX_DEFAULT_MS, "Bmax default MS" }, /* 11.3.2 Bmax default MS */ + { DE_BSSGP_BSS_AREA_IND, "BSS Area Indication" }, /* 11.3.3 BSS Area Indication */ + { DE_BSSGP_BUCKET_LEAK_RATE, "Bucket Leak Rate (R)" }, /* 11.3.4 Bucket Leak Rate (R) */ + { DE_BSSGP_BVCI, "BVCI (BSSGP Virtual Connection Identifier)" }, /* 11.3.6 BVCI (BSSGP Virtual Connection Identifier) */ + { DE_BSSGP_BVC_BUCKET_SIZE, "BVC Bucket size" }, /* 11.3.5 BVC Bucket Size */ + { DE_BSSGP_BVC_MEAS, "BVC Measurement" }, /* 11.3.7 BVC Measurement */ + { DE_BSSGP_CAUSE, "Cause" }, /* 11.3.8 Cause */ + { DE_BSSGP_CELL_ID, "Cell Identifier" }, /* 11.3.9 Cell Identifier */ + { DE_BSSGP_CHLN_NEEDED, "Channel needed" }, /* 11.3.10 Channel needed */ + { DE_BBSGP_DRX_PARAM, "DRX Parameters" }, /* 11.3.11 DRX Parameters */ + { DE_BBSGP_EMLPP_PRIO, "eMLPP-Priority" }, /* 11.3.12 eMLPP-Priority */ + { DE_BSSGP_FLUSH_ACTION, "Flush Action" }, /* 11.3.13 Flush Action */ + { DE_BSSGP_IMSI, "IMSI" }, /* 11.3.14 IMSI */ + { DE_BSSGP_LLC_PDU, "LLC-PDU" }, /* 11.3.15 LLC-PDU */ + { DE_BSSGP_LLC_FRAMES_DISC, "LLC Frames Discarded" }, /* 11.3.16 LLC Frames Discarded */ + { DE_BSSGP_LAI, "Location Area" }, /* 11.3.17 Location Area */ + { DE_BSSGP_MID, "Mobile Id" }, /* 11.3.20 Mobile Id */ + { DE_BSSGP_MS_BUCKET_SIZE, "MS Bucket Size" }, /* 11.3.21 MS Bucket Size */ + { DE_BSSGP_MS_RAD_ACC_CAP, "MS Radio Access Capability" }, /* 11.3.22 MS Radio Access Capability GSM_A_PDU_TYPE_GM, DE_MS_RAD_ACC_CAP */ + { DE_BSSGP_OMC_ID, "OMC Id" }, /* 11.3.23 OMC Id */ + { DE_BSSGP_PDU_IN_ERROR, "PDU In Error" }, /* 11.3.24 PDU In Error */ + { DE_BSSGP_PDU_LIFETIME, "PDU Lifetime" }, /* 11.3.25 PDU Lifetime */ + { DE_BSSP_PRIORITY, "Priority" }, /* 11.3.27 Priority */ + { DE_BSSGP_QOS_PROFILE, "QoS Profile" }, /* 11.3.28 QoS Profile */ + { DE_BSSGP_RA_CAUSE, "Radio Cause" }, /* 11.3.29 Radio Cause */ + { DE_BSSGP_RA_CAP_UPD_CAUSE, "RA-Cap-UPD-Cause" }, /* 11.3.30 RA-Cap-UPD-Cause */ + { DE_BSSGP_RAI, "Routeing Area" }, /* 11.3.31 Routeing Area */ + { DE_BSSGP_R_DEFAULT_MS, "R_default_MS" }, /* 11.3.32 R_default_MS */ + { DE_BBSGP_SUSPEND_REF_NO, "Suspend Reference Number" }, /* 11.3.33 Suspend Reference Number */ + { DE_BSSGP_TAG, "Tag" }, /* 11.3.34 Tag */ + { DE_BSSGP_TLLI, "Temporary logical link Identity (TLLI)" }, /* 11.3.35 Temporary logical link Identity (TLLI) GSM_A_PDU_TYPE_RR, DE_RR_TLLI*/ + { DE_BSSGP_TMSI_PTMSI, "Temporary Mobile Subscriber Identity (TMSI)" }, /* 11.3.36 Temporary Mobile Subscriber Identity (TMSI)GSM_A_PDU_TYPE_RR, DE_RR_TMSI_PTMSI */ + { DE_BSSGP_TRACE_REF, "Trace Reference" }, /* 11.3.37 Trace Reference */ + { DE_BSSGP_TRACE_TYPE, "Trace Type" }, /* 11.3.38 Trace Type */ + { DE_BSSGP_TRANSACTION_ID, "Transaction Id" }, /* 11.3.39 Transaction Id */ + { DE_BSSGP_TRIGGER_ID, "Trigger Id" }, /* 11.3.40 Trigger Id */ + { DE_BSSGP_NO_OF_OCT_AFFECTED, "Number of octets affected" }, /* 11.3.41 Number of octets affected */ + { DE_BSSGP_LSA_ID_LIST, "LSA Identifier List" }, /* 11.3.18 LSA Identifier List */ + { DE_BSSGP_LSA_INFO, "LSA Information" }, /* 11.3.19 LSA Information */ + { DE_BSSGP_ACKET_FLOW_ID, "Packet Flow Identifier (PFI)" }, /* 11.3.42 Packet Flow Identifier (PFI) GSM_A_PDU_TYPE_GM, DE_PACKET_FLOW_ID*/ + /* 11.3.42a (void) */ + { DE_BSSGP_GPRS_TIMER, "GPRS Timer" }, /* 11.3.44 GPRS Timer */ + { DE_BSSGP_QOS, "Aggregate BSS QoS Profile" }, /* 11.3.43 Aggregate BSS QoS Profile GSM_A_PDU_TYPE_GM, DE_QOS*/ + { DE_BSSGP_FEATURE_BITMAP, "Feature Bitmap" }, /* 11.3.45 Feature Bitmap */ + { DE_BSSGP_BUCKET_FULL_RATIO, "Bucket Full Ratio" }, /* 11.3.46 Bucket Full Ratio */ + { DE_BSSGP_SERV_UTRAN_CCO, "Service UTRAN CCO" }, /* 11.3.47 Service UTRAN CCO */ + { DE_BSSGP_NSEI, "NSEI (Network Service Entity Identifier)" }, /* 11.3.48 NSEI (Network Service Entity Identifier) */ + { DE_BSSGP_RRLP_APDU, "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*/ + /* 11.3.53 Location Type 0x7c, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_GANSS_LOC_TYPE*/ + /* 11.3.54 Location Estimate BSSGP_IEI_LOCATION_ESTIMATE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_EST*/ + /* 11.3.55 Positioning Data 0x7d, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_POS_DATA*/ + /* 11.3.56 Deciphering Keys BSSGP_IEI_DECIPHERING_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS */ + /* 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*/ + { DE_BSSGP_RRLP_FLAGS, "RRLP Flags" }, /* 11.3.60 RRLP Flags */ + { DE_BSSGP_RIM_APP_ID, "RIM Application Identity" }, /* 11.3.61 RIM Application Identity */ + { DE_BSSGP_RIM_SEQ_NO, "RIM Sequence Number" }, /* 11.3.62 RIM Sequence Number */ + /* 11.3.62a RIM Container */ + /* 11.3.62a.0 General */ + { DE_BSSGP_RAN_INF_REQUEST_RIM_CONT, "RAN-INFORMATION-REQUEST RIM Container" }, /* 11.3.62a.1 RAN-INFORMATION-REQUEST RIM Container */ + { DE_BSSGP_RAN_INF_RIM_CONT, "RAN-INFORMATION RIM Container" }, /* 11.3.62a.2 RAN-INFORMATION RIM Container */ + { DE_BSSGP_RAN_INFORMATION_ACK_RIM_CONT, "RAN-INFORMATION-ACK RIM Container" }, /* 11.3.62a.3 RAN-INFORMATION-ACK RIM Container */ + { DE_BSSGP_RAN_INFORMATION_ERROR_RIM_CONT, "RAN-INFORMATION-ERROR RIM Container" }, /* 11.3.62a.4 RAN-INFORMATION-ERROR RIM Container */ + { DE_BSSGP_RAN_INF_APP_ERROR_RIM_CONT, "RAN-INFORMATION-APPLICATION-ERROR RIM Container" }, /* 11.3.62a.5 RAN-INFORMATION-APPLICATION-ERROR RIM Container */ + /* 11.3.63 Application Container */ + { DE_BSSGP_RAN_INFORMATION_REQUEST_APP_CONT, "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 */ + { DE_BSSGP_RAN_INFORMATION_APP_CONT_UNIT, "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 */ + { DE_BSSGP_RAN_APP_ERROR_CONT, "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 */ + { DE_BSSGP_RIM_PDU_INDICATIONS, "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) */ + { DE_BSSGP_RIM_PROTO_VER_NO, "RIM Protocol Version Number" }, /* 11.3.67 RIM Protocol Version Number */ + { DE_BSSGP_PFC_FLOW_CTRL, "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 */ + { DE_BSSGP_RIM_ROUTING_INF, "RIM Routing Information" }, /* 11.3.70 RIM Routing Information */ + { DE_BSSGP_MBMS_SESSION_ID, "MBMS Session Identity" }, /* 11.3.71 MBMS Session Identity */ + { DE_BSSGP_MBMS_SESSION_DUR, "MBMS Session Duration" }, /* 11.3.72 MBMS Session Duration */ + { DE_BSSGP_MBMS_SAI_LIST, "MBMS Service Area Identity List" }, /* 11.3.73 MBMS Service Area Identity List */ + { DE_BSSGP_MBMS_RESPONSE, "MBMS Response" }, /* 11.3.74 MBMS Response */ + { DE_BSSGP_MBMS_RA_LIST, "MBMS Routing Area List" }, /* 11.3.75 MBMS Routing Area List */ + { DE_BSSGP_MBMS_SESSION_INF, "MBMS Session Information" }, /* 11.3.76 MBMS Session Information */ + { DE_BSSGP_TMGI, "TMGI" }, /* 11.3.77 TMGI (Temporary Mobile Group Identity) */ + { DE_BSSGP_MBMS_STOP_CAUSE, "MBMS Stop Cause" }, /* 11.3.78 MBMS Stop Cause */ + { DE_BSSGP_SOURCE_BSS_TO_TARGET_BSS_TRANSP_CONT, "Source BSS to Target BSS Transparent Container" }, /* 11.3.79 Source BSS to Target BSS Transparent Container */ + { DE_BSSGP_TARGET_BSS_TO_SOURCE_BSS_TRANSP_CONT, "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 */ + { DE_BSSGP_PFCS_TO_BE_SET_UP_LIST, "PFCs to be set-up list" }, /* 11.3.82 PFCs to be set-up list */ + { DE_BSSGP_LIST_OF_SETUP_PFCS, "List of set-up PFCs" }, /* 11.3.83 List of set-up PFCs */ + { DE_BSSGP_EXT_FEATURE_BITMAP, "Extended Feature Bitmap" }, /* 11.3.84 Extended Feature Bitmap */ + { DE_BSSGP_SRC_TO_TRG_TRANSP_CONT, "Source to Target Transparent Container" }, /* 11.3.85 Source to Target Transparent Container */ + { DE_BSSGP_TRG_TO_SRC_TRANSP_CONT, "Target to Source Transparent Container" }, /* 11.3.86 Target to Source Transparent Container */ + { BE_BSSGP_RNC_ID, "RNC Identifier" }, /* 11.3.87 RNC Identifier */ + { DE_BSSGP_PAGE_MODE, "Page Mode" }, /* 11.3.88 Page Mode */ + { DE_BSSGP_CONTAINER_ID, "Container ID" }, /* 11.3.89 Container ID */ + { DE_BSSGP_GLOBAL_TFI, "Global TFI" }, /* 11.3.90 Global TFI */ + /* 11.3.91 IMEI */ + { DE_BSSGP_TIME_TO_MBMS_DATA_TRAN, "Time to MBMS Data Transfer" }, /* 11.3.92 Time to MBMS Data Transfer */ + { DE_BSSGP_MBMS_SESSION_REP_NO, "MBMS Session Repetition Number" }, /* 11.3.93 MBMS Session Repetition Number */ + { DE_BSSGP_INTER_RAT_HO_INFO, "Inter RAT Handover Info" }, /* 11.3.94 Inter RAT Handover Info */ + { DE_BSSGP_PS_HO_CMD, "PS Handover Command" }, /* 11.3.95 PS Handover Command */ + { DE_BSSGP_PS_HO_INDICATIONS, "PS Handover Indications" }, /* 11.3.95a PS Handover Indications */ + { DE_BSSGP_SIPSI_CONTAINER, "SI/PSI Container" }, /* 11.3.95b SI/PSI Container */ + { DE_BSSGP_ACTIVE_PFCS_LIST, "Active PFCs List" }, /* 11.3.95c Active PFCs List */ + { DE_BSSGP_VELOCITY_DATA, "Velocity Data" }, /* 11.3.96 Velocity Data */ + { DE_BBSGP_DTM_HO_CMD, "DTM Handover Command" }, /* 11.3.97 DTM Handover Command */ + { DE_BSSGP_CS_INDICATION, "CS Indication" }, /* 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);*/ + { DE_BSSGP_FLOW_CONTROL_GRAN, "Flow Control Granularity" }, /* 11.3.102 Flow Control Granularity */ + { DE_BSSGP_ENB_ID, "eNB Identifier" }, /* 11.3.103 eNB Identifier */ + { DE_BSSGP_E_UTRAN_INTER_RAT_HO_INFO, "E-UTRAN Inter RAT Handover Info" }, /* 11.3.104 E-UTRAN Inter RAT Handover Info */ + { DE_BSSGP_SUB_PROF_ID_F_RAT_FRQ_PRIO, "Subscriber Profile ID for RAT/Frequency priority" }, /* 11.3.105 Subscriber Profile ID for RAT/Frequency priority */ + { DE_BSSGP_REQ_FOR_INTER_RAT_HO_INFO, "Request for Inter-RAT Handover Info" }, /* 11.3.106 Request for Inter-RAT Handover Info */ + { DE_BSSGP_RELIABLE_INTER_RAT_HO_INF, "Reliable Inter-RAT Handover Info" }, /* 11.3.107 Reliable Inter-RAT Handover Info */ + { DE_BSSGP_SON_TRANSFER_APP_ID, "Son transfer application identity" }, /* 11.3.108 SON Transfer Application Identity */ + { DE_BSSGP_CSG_ID, "CSG Identifier" }, /* 11.3.109 CSG Identifier */ + /* 11.3.110 Tracking Area Code */ + { DE_BSSGP_REDIR_ATTEMPT_FLG, "Redirect Attempt Flag"}, /* 11.3.111 Redirect Attempt Flag */ + { DE_BSSGP_REDIR_INDICATION, "Redirection Indication"}, /* 11.3.112 Redirection Indication */ + { DE_BSSGP_REDIR_COMPLETE, "Redirection Completed"}, /* 11.3.113 Redirection Completed */ + { DE_BSSGP_UNCONFIRM_SEND_STATE_VAR, "Unconfirmed Send State Variable"}, /* 11.3.114 Unconfirmed send state variable */ + + { 0, NULL } +}; + +#define NUM_BSSGP_ELEM (sizeof(bssgp_elem_strings)/sizeof(value_string)) +gint ett_bssgp_elem[NUM_BSSGP_ELEM]; + + guint16 (*bssgp_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) = { de_bssgp_aligment_octets, /* 11.3.1 0x00 Alignment octets */ de_bssgp_bmax_default_ms, /* 11.3.2 0x01 Bmax default MS */ diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 1a45780e2f..ccd7a845de 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -199,139 +199,139 @@ 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" }, - { 0x04, "Cause" }, - { 0x05, "Cell Identifier" }, - { 0x06, "Priority" }, - { 0x07, "Layer 3 Header Information" }, - { 0x08, "IMSI" }, - { 0x09, "TMSI" }, - { 0x0a, "Encryption Information" }, - { 0x0b, "Channel Type" }, - { 0x0c, "Periodicity" }, - { 0x0d, "Extended Resource Indicator" }, - { 0x0e, "Number Of MSs" }, - { 0x0f, "Reserved" }, - { 0x10, "Reserved" }, - { 0x11, "Reserved" }, - { 0x12, "Classmark Information Type 2" }, - { 0x13, "Classmark Information Type 3" }, - { 0x14, "Interference Band To Be Used" }, - { 0x15, "RR Cause" }, - { 0x16, "Reserved" }, - { 0x17, "Layer 3 Information" }, - { 0x18, "DLCI" }, - { 0x19, "Downlink DTX Flag" }, - { 0x1a, "Cell Identifier List" }, - { 0x1b, "Response Request" }, - { 0x1c, "Resource Indication Method" }, - { 0x1d, "Classmark Information Type 1" }, - { 0x1e, "Circuit Identity Code List" }, - { 0x1f, "Diagnostic" }, - { 0x20, "Layer 3 Message Contents" }, - { 0x21, "Chosen Channel" }, - { 0x22, "Total Resource Accessible" }, - { 0x23, "Cipher Response Mode" }, - { 0x24, "Channel Needed" }, - { 0x25, "Trace Type" }, - { 0x26, "TriggerID" }, - { 0x27, "Trace Reference" }, - { 0x28, "TransactionID" }, - { 0x29, "Mobile Identity" }, - { 0x2a, "OMCID" }, - { 0x2b, "Forward Indicator" }, - { 0x2c, "Chosen Encryption Algorithm" }, - { 0x2d, "Circuit Pool" }, - { 0x2e, "Circuit Pool List" }, - { 0x2f, "Time Indication" }, - { 0x30, "Resource Situation" }, - { 0x31, "Current Channel Type 1" }, - { 0x32, "Queuing Indicator" }, - { 0x33, "Assignment Requirement" }, - { 0x34, "Undefined" }, - { 0x35, "Talker Flag" }, - { 0x36, "Connection Release Requested" }, - { 0x37, "Group Call Reference" }, - { 0x38, "eMLPP Priority" }, - { 0x39, "Configuration Evolution Indication" }, - { 0x3a, "Old BSS to New BSS Information" }, - { 0x3b, "LSA Identifier" }, - { 0x3c, "LSA Identifier List" }, - { 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" }, - { 0x49, "APDU" }, - { 0x4a, "Network Element Identity" }, - { 0x4b, "GPS Assistance Data" }, - { 0x4c, "Deciphering Keys" }, - { 0x4d, "Return Error Request" }, - { 0x4e, "Return Error Cause" }, - { 0x4f, "Segmentation" }, - { 0x50, "Service Handover" }, - { 0x51, "Source RNC to target RNC transparent information (UMTS)" }, - { 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" }, - { 0x69, "VGCS Feature Flags" }, - { 0x6a, "Talker Priority" }, - { 0x6b, "Emergency Set Indication" }, - { 0x6c, "Talker Identity" }, - { 0x6d, "Cell Identifier List Segment" }, - { 0x6e, "SMS to VGCS" }, - { 0x6f, "VGCS Talker Mode" }, - { 0x70, "VGCS/VBS Cell Status" }, - { 0x71, "Cell Identifier List Segment for established cells" }, - { 0x72, "Cell Identifier List Segment for cells to be established" }, - { 0x73, "Cell Identifier List Segment for released cells - no user present" }, - { 0x74, "Cell Identifier List Segment for not established cells - no establishment possible" }, - { 0x75, "GANSS Assistance Data" }, - { 0x76, "GANSS Positioning Data" }, - { 0x77, "GANSS Location Type" }, - { 0x78, "Application Data" }, - { 0x79, "Data Identity" }, - { 0x7a, "Application Data Information" }, - { 0x7b, "MSISDN" }, - { 0x7c, "AoIP Transport Layer Address" }, - { 0x7d, "Speech Codec List" }, - { 0x7e, "Speech Codec" }, - { 0x7f, "Call Identifier" }, - { 0x80, "Call Identifier List" }, - { 0x81, "A-Interface Selector for RESET" }, - { 0x82, "Undefined" }, - { 0x83, "Kc128" }, - { 0x84, "CSG Identifier" }, + { 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, "Queuing 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, "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_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" }, #if 0 { 0x85, "Redirect Attempt FlagT" }, /* 3.2.2.111 */ { 0x86, "Reroute Reject Cause" }, /* 3.2.2.112 */ @@ -4738,41 +4738,41 @@ bssmap_ass_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Channel Type 3.2.2.11 MSC-BSS M 5-13 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CHAN_TYPE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHAN_TYPE, NULL); + ELEM_MAND_TLV(BE_CHAN_TYPE, GSM_A_PDU_TYPE_BSSMAP, BE_CHAN_TYPE, NULL); /* Layer 3 Header Information 3.2.2.9 MSC-BSS O (note 3) 4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_L3_HEADER_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_HEADER_INFO, NULL); + ELEM_OPT_TLV(BE_L3_HEADER_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_HEADER_INFO, NULL); /* Priority 3.2.2.18 MSC-BSS O 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_PRIO].value, GSM_A_PDU_TYPE_BSSMAP, BE_PRIO, NULL); + ELEM_OPT_TLV(BE_PRIO, GSM_A_PDU_TYPE_BSSMAP, BE_PRIO, NULL); /* Circuit Identity Code 3.2.2.2 MSC-BSS O (note 1, 12 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_OPT_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Downlink DTX Flag 3.2.2.26 MSC-BSS O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_DOWN_DTX_FLAG].value, GSM_A_PDU_TYPE_BSSMAP, BE_DOWN_DTX_FLAG, NULL); + ELEM_OPT_TV(BE_DOWN_DTX_FLAG, GSM_A_PDU_TYPE_BSSMAP, BE_DOWN_DTX_FLAG, NULL); /* Interference Band To Be Used 3.2.2.21 MSC-BSS O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_INT_BAND].value, GSM_A_PDU_TYPE_BSSMAP, BE_INT_BAND, NULL); + ELEM_OPT_TV(BE_INT_BAND, GSM_A_PDU_TYPE_BSSMAP, BE_INT_BAND, NULL); /* Classmark Information 2 3.2.2.19 MSC-BSS O (note 4) 4-5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CM_INFO_2].value, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_2, NULL); + ELEM_OPT_TLV(BE_CM_INFO_2, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_2, NULL); /* Group Call Reference 3.2.2.55 MSC-BSS O (note 5) 7 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GROUP_CALL_REF].value, GSM_A_PDU_TYPE_BSSMAP, BE_GROUP_CALL_REF, NULL); + ELEM_OPT_TLV(BE_GROUP_CALL_REF, GSM_A_PDU_TYPE_BSSMAP, BE_GROUP_CALL_REF, NULL); /* Talker Flag 3.2.2.54 MSC-BSS O (note 6) 1 */ - ELEM_OPT_T(gsm_bssmap_elem_strings[BE_TALKER_FLAG].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_FLAG, NULL); + ELEM_OPT_T(BE_TALKER_FLAG, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_FLAG, NULL); /* Configuration Evolution Indication 3.2.2.57 MSC-BSS O (note 7) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CONF_EVO_IND].value, GSM_A_PDU_TYPE_BSSMAP, BE_CONF_EVO_IND, NULL); + ELEM_OPT_TV(BE_CONF_EVO_IND, GSM_A_PDU_TYPE_BSSMAP, BE_CONF_EVO_IND, NULL); /* LSA Access Control Suppression 3.2.2.61 MSC-BSS O (note 8) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_LSA_ACC_CTRL].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ACC_CTRL, NULL); + ELEM_OPT_TV(BE_LSA_ACC_CTRL, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ACC_CTRL, NULL); /* Service Handover 3.2.2.75 MSC-BSS O (note 9) 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SERV_HO].value, GSM_A_PDU_TYPE_BSSMAP, BE_SERV_HO, NULL); + ELEM_OPT_TLV(BE_SERV_HO, GSM_A_PDU_TYPE_BSSMAP, BE_SERV_HO, NULL); /* Encryption Information 3.2.2.10 MSC-BSS O (note 10) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_ENC_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); + ELEM_OPT_TLV(BE_ENC_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); /* Talker Priority 3.2.2.89 MSC-BSS O (note 11) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* AoIP Transport Layer Address (MGW) 3.2.2.102 MSC-BSS O (note 12) 10-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_AOIP_TRANS_LAY_ADD].value, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); + ELEM_OPT_TLV(BE_AOIP_TRANS_LAY_ADD, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); /* Codec List (MSC Preferred) 3.2.2.103 MSC-BSS O (note 13) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(MSC Preferred)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(MSC Preferred)"); /* Call Identifier 3.2.2.105 MSC-BSS O (note 12) 5 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CALL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID, NULL); + ELEM_OPT_TV(BE_CALL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID, NULL); /* Kc128 3.2.2.109 MSC-BSS C (note 15) 17 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_KC128].value, GSM_A_PDU_TYPE_BSSMAP, BE_KC128, NULL); + ELEM_OPT_TV(BE_KC128, GSM_A_PDU_TYPE_BSSMAP, BE_KC128, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -4791,29 +4791,29 @@ bssmap_ass_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /* RR Cause 3.2.2.22 BSS-MSC O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_RR_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_RR_CAUSE, NULL); + ELEM_OPT_TV(BE_RR_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_RR_CAUSE, NULL); /* Circuit Identity Code 3.2.2.2 BSS-MSC O (note 4) 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_OPT_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Cell Identifier 3.2.2.17 BSS-MSC O (note 1) 3-10 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_OPT_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Chosen Channel 3.2.2.33 BSS-MSC O (note 3) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BE_CHOSEN_CHAN, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); /* Chosen Encryption Algorithm 3.2.2.44 BSS-MSC O (note 5) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_ENC_ALG].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); + ELEM_OPT_TV(BE_CHOSEN_ENC_ALG, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); /* Circuit Pool 3.2.2.45 BSS-MSC O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CCT_POOL].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); + ELEM_OPT_TV(BE_CCT_POOL, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); /* Speech Version (Chosen) 3.2.2.51 BSS-MSC O (note 6) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SPEECH_VER].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Chosen)"); + ELEM_OPT_TV(BE_SPEECH_VER, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Chosen)"); /* LSA Identifier 3.2.2.15 BSS-MSC O (note 7) 5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LSA_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID, NULL); + ELEM_OPT_TLV(BE_LSA_ID, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID, NULL); /* Talker Priority 3.2.2.89 BSS-MSC O (note 8) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* AoIP Transport Layer Address (BSS) 3.2.2.102 BSS-MSC O (note 9) 10-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_AOIP_TRANS_LAY_ADD].value, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); + ELEM_OPT_TLV(BE_AOIP_TRANS_LAY_ADD, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); /* Speech Codec (Chosen) 3.2.2.104 BSS-MSC O (note 10) 3-5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); /* Codec List (BSS supported) 3.2.2.103 MSC-BSS O (note 11) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -4832,17 +4832,17 @@ bssmap_ass_failure(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* RR Cause 3.2.2.22 BSS-MSC O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_RR_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_RR_CAUSE, NULL); + ELEM_OPT_TV(BE_RR_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_RR_CAUSE, NULL); /* Circuit Pool 3.2.2.45 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CCT_POOL].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); + ELEM_OPT_TV(BE_CCT_POOL, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); /* Circuit Pool List 3.2.2.46 BSS-MSC O (note 2) V */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CCT_POOL_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL_LIST, NULL); + ELEM_OPT_TLV(BE_CCT_POOL_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL_LIST, NULL); /* Talker Priority 3.2.2.89 BSS-MSC O (note 3) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* Codec List (BSS Supported) 3.2.2.103 BSS-MSC O (note 4) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -4861,11 +4861,11 @@ bssmap_block(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 of curr_len = len; /* Circuit Identity Code 3.2.2.2 both M 3*/ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Cause 3.2.2.5 both M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Connection Release Requested 3.2.2.3 MSC-BSS O 1 */ - ELEM_OPT_T(gsm_bssmap_elem_strings[BE_CONN_REL_REQ].value, GSM_A_PDU_TYPE_BSSMAP, BE_CONN_REL_REQ, NULL); + ELEM_OPT_T(BE_CONN_REL_REQ, GSM_A_PDU_TYPE_BSSMAP, BE_CONN_REL_REQ, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -4885,7 +4885,7 @@ bssmap_block_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 curr_len = len; /* Circuit Identity Code 3.2.2.2 both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -4904,7 +4904,7 @@ bssmap_unblock(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Circuit Identity Code 3.2.2.2 both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -4923,7 +4923,7 @@ bssmap_unblock_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_len = len; /* Circuit Identity Code 3.2.2.2 both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -4942,71 +4942,71 @@ bssmap_ho_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o curr_len = len; /* Channel Type 3.2.2.11 MSC-BSS M 5-13 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CHAN_TYPE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHAN_TYPE, NULL); + ELEM_MAND_TLV(BE_CHAN_TYPE, GSM_A_PDU_TYPE_BSSMAP, BE_CHAN_TYPE, NULL); /* Encryption Information 3.2.2.10 MSC-BSS M (note 1) 3-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_ENC_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); + ELEM_MAND_TLV(BE_ENC_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); /* Classmark Information 1 3.2.2.30 MSC-BSS M# 2 * or * Classmark Information 2 3.2.2.19 MSC-BSS M (note 6) 4-5 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CM_INFO_1].value, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_1, NULL); + ELEM_OPT_TV(BE_CM_INFO_1, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_1, NULL); - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CM_INFO_2].value, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_2, NULL); + ELEM_OPT_TLV(BE_CM_INFO_2, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_2, NULL); /* Cell Identifier (Serving) 3.2.2.17 MSC-BSS M (note 20) 5-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, " (Serving)"); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, " (Serving)"); /* Priority 3.2.2.18 MSC-BSS O 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_PRIO].value, GSM_A_PDU_TYPE_BSSMAP, BE_PRIO, NULL); + ELEM_OPT_TLV(BE_PRIO, GSM_A_PDU_TYPE_BSSMAP, BE_PRIO, NULL); /* Circuit Identity Code 3.2.2.2 MSC-BSS O (note 7, 28 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_OPT_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Downlink DTX Flag 3.2.2.26 MSC-BSS O (note 3) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_DOWN_DTX_FLAG].value, GSM_A_PDU_TYPE_BSSMAP, BE_DOWN_DTX_FLAG, NULL); + ELEM_OPT_TV(BE_DOWN_DTX_FLAG, GSM_A_PDU_TYPE_BSSMAP, BE_DOWN_DTX_FLAG, NULL); /* Cell Identifier (Target) 3.2.2.17 MSC-BSS M (note 17) 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, " (Target)"); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, " (Target)"); /* Interference Band To Be Used 3.2.2.21 MSC-BSS O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_INT_BAND].value, GSM_A_PDU_TYPE_BSSMAP, BE_INT_BAND, NULL); + ELEM_OPT_TV(BE_INT_BAND, GSM_A_PDU_TYPE_BSSMAP, BE_INT_BAND, NULL); /* Cause 3.2.2.5 MSC-BSS O (note 9) 3-4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_OPT_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Classmark Information 3 3.2.2.20 MSC-BSS O (note 4) 3-34 */ - 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(BE_CM_INFO_3, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); /* Current Channel type 1 3.2.2.49 MSC-BSS O (note 8) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CURR_CHAN_1].value, GSM_A_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, NULL); + ELEM_OPT_TV(BE_CURR_CHAN_1, GSM_A_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, NULL); /* Speech Version (Used) 3.2.2.51 MSC-BSS O (note 10) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SPEECH_VER].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Used)"); + ELEM_OPT_TV(BE_SPEECH_VER, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Used)"); /* Group Call Reference 3.2.2.55 MSC-BSS O (note 5) 7 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GROUP_CALL_REF].value, GSM_A_PDU_TYPE_BSSMAP, BE_GROUP_CALL_REF, NULL); + ELEM_OPT_TLV(BE_GROUP_CALL_REF, GSM_A_PDU_TYPE_BSSMAP, BE_GROUP_CALL_REF, NULL); /* Talker Flag 3.2.2.54 MSC-BSS O (note 11) 1 */ - ELEM_OPT_T(gsm_bssmap_elem_strings[BE_TALKER_FLAG].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_FLAG, NULL); + ELEM_OPT_T(BE_TALKER_FLAG, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_FLAG, NULL); /* Configuration Evolution Indication 3.2.2.57 MSC-BSS O (note 12) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CONF_EVO_IND].value, GSM_A_PDU_TYPE_BSSMAP, BE_CONF_EVO_IND, NULL); + ELEM_OPT_TV(BE_CONF_EVO_IND, GSM_A_PDU_TYPE_BSSMAP, BE_CONF_EVO_IND, NULL); /* Chosen Encryption Algorithm (Serving) 3.2.2.44 MSC-BSS O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_ENC_ALG].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, " (Serving)"); + ELEM_OPT_TV(BE_CHOSEN_ENC_ALG, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, " (Serving)"); /* Old BSS to New BSS Information 3.2.2.58 MSC-BSS O (note 13) 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_OLD2NEW_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_OLD2NEW_INFO, NULL); + ELEM_OPT_TLV(BE_OLD2NEW_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_OLD2NEW_INFO, NULL); /* LSA Information 3.2.2.23 MSC-BSS O (note 14) 3+4n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LSA_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_INFO, NULL); + ELEM_OPT_TLV(BE_LSA_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_INFO, NULL); /* LSA Access Control Suppression 3.2.2.61 MSC-BSS O (note 15) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_LSA_ACC_CTRL].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ACC_CTRL, NULL); + ELEM_OPT_TV(BE_LSA_ACC_CTRL, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ACC_CTRL, NULL); /* Service Handover 3.2.2.75 MSC-BSS O (note 21) 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SERV_HO].value, GSM_A_PDU_TYPE_BSSMAP, BE_SERV_HO, NULL); + ELEM_OPT_TLV(BE_SERV_HO, GSM_A_PDU_TYPE_BSSMAP, BE_SERV_HO, NULL); /* IMSI 3.2.2.6 MSC-BSC O (note 16) 3-10 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_IMSI].value, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); + ELEM_OPT_TLV(BE_IMSI, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); /* Source RNC to target RNC transparent information (UMTS) 3.2.2.76 MSC-BSS O (note 18) n-m */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SRC_RNC_TO_TAR_RNC_UMTS].value, GSM_A_PDU_TYPE_BSSMAP, BE_SRC_RNC_TO_TAR_RNC_UMTS, NULL); + ELEM_OPT_TLV(BE_SRC_RNC_TO_TAR_RNC_UMTS, GSM_A_PDU_TYPE_BSSMAP, BE_SRC_RNC_TO_TAR_RNC_UMTS, NULL); /* Source RNC to target RNC transparent information (cdma2000) 3.2.2.77 MSC-BSS O (note 19) n-m */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SRC_RNC_TO_TAR_RNC_CDMA].value, GSM_A_PDU_TYPE_BSSMAP, BE_SRC_RNC_TO_TAR_RNC_CDMA, NULL); + ELEM_OPT_TLV(BE_SRC_RNC_TO_TAR_RNC_CDMA, GSM_A_PDU_TYPE_BSSMAP, BE_SRC_RNC_TO_TAR_RNC_CDMA, NULL); /* SNA Access Information 3.2.2.82 MSC-BSC O (note 22) 2+n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SNA_ACC_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_SNA_ACC_INF, NULL); + ELEM_OPT_TLV(BE_SNA_ACC_INF, GSM_A_PDU_TYPE_BSSMAP, BE_SNA_ACC_INF, NULL); /* Talker Priority 3.2.2.89 MSC-BSC O (note 23) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* AoIP Transport Layer Address (MGW) 3.2.2.102 MSC-BSS O (note 24) 10-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_AOIP_TRANS_LAY_ADD].value, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); + ELEM_OPT_TLV(BE_AOIP_TRANS_LAY_ADD, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); /* Codec List (MSC Preferred) 3.2.2.103 MSC-BSS O (note 25) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(MSC Preferred)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(MSC Preferred)"); /* Call Identifier 3.2.2.105 MSC-BSS O (note 24) 5 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CALL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID, NULL); + ELEM_OPT_TV(BE_CALL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID, NULL); /* Kc128 3.2.2.109 MSC-BSS C (note 27) 17 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_KC128].value, GSM_A_PDU_TYPE_BSSMAP, BE_KC128, NULL); + ELEM_OPT_TV(BE_KC128, GSM_A_PDU_TYPE_BSSMAP, BE_KC128, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5025,33 +5025,33 @@ bssmap_ho_reqd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Response Request 3.2.2.28 BSS-MSC O (note 8) 1 */ - ELEM_OPT_T(gsm_bssmap_elem_strings[BE_RESP_REQ].value, GSM_A_PDU_TYPE_BSSMAP, BE_RESP_REQ, NULL); + ELEM_OPT_T(BE_RESP_REQ, GSM_A_PDU_TYPE_BSSMAP, BE_RESP_REQ, NULL); /* Cell Identifier List (Preferred) 3.2.2.27 BSS-MSC M (note 4) 2n+3 to 7n+3 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST, " (Preferred)"); + ELEM_MAND_TLV(BE_CELL_ID_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST, " (Preferred)"); /* Circuit Pool List 3.2.2.46 BSS-MSC O (note 1) V */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CCT_POOL_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL_LIST, NULL); + ELEM_OPT_TLV(BE_CCT_POOL_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL_LIST, NULL); /* Current Channel Type 1 3.2.2.49 BSS-MSC O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CURR_CHAN_1].value, GSM_A_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, NULL); + ELEM_OPT_TV(BE_CURR_CHAN_1, GSM_A_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, NULL); /* Speech Version (Used) 3.2.2.51 BSS-MSC O (note 3) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SPEECH_VER].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Used)"); + ELEM_OPT_TV(BE_SPEECH_VER, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Used)"); /* Queueing Indicator 3.2.2.50 BSS-MSC O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_QUE_IND].value, GSM_A_PDU_TYPE_BSSMAP, BE_QUE_IND, NULL); + ELEM_OPT_TV(BE_QUE_IND, GSM_A_PDU_TYPE_BSSMAP, BE_QUE_IND, NULL); /* Old BSS to New BSS Information 3.2.2.58 BSS-MSC O 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_OLD2NEW_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_OLD2NEW_INFO, NULL); + ELEM_OPT_TLV(BE_OLD2NEW_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_OLD2NEW_INFO, NULL); /* Source RNC to target RNC transparent information (UMTS) 3.2.2.76 BSS-MSC O (note 5) 3-m */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SRC_RNC_TO_TAR_RNC_UMTS].value, GSM_A_PDU_TYPE_BSSMAP, BE_SRC_RNC_TO_TAR_RNC_UMTS, NULL); + ELEM_OPT_TLV(BE_SRC_RNC_TO_TAR_RNC_UMTS, GSM_A_PDU_TYPE_BSSMAP, BE_SRC_RNC_TO_TAR_RNC_UMTS, NULL); /* Source RNC to target RNC transparent information (cdma2000) 3.2.2.77 BSS-MSC O (note 6) n-m */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SRC_RNC_TO_TAR_RNC_CDMA].value, GSM_A_PDU_TYPE_BSSMAP, BE_SRC_RNC_TO_TAR_RNC_CDMA, NULL); + ELEM_OPT_TLV(BE_SRC_RNC_TO_TAR_RNC_CDMA, GSM_A_PDU_TYPE_BSSMAP, BE_SRC_RNC_TO_TAR_RNC_CDMA, NULL); /* GERAN Classmark 3.2.2.78 BSS-MSC O (note 7) V */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GERAN_CLS_M].value, GSM_A_PDU_TYPE_BSSMAP, BE_GERAN_CLS_M, NULL); + ELEM_OPT_TLV(BE_GERAN_CLS_M, GSM_A_PDU_TYPE_BSSMAP, BE_GERAN_CLS_M, NULL); /* Talker Priority 3.2.2.89 BSS-MSC O (note 9) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* Speech Codec (Used) 3.2.2.104 BSS-MSC O (note 10) 3-5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Used)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Used)"); /* CSG Identifier 3.2.2.110 BSS-MSC O (note 11) 7 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CSG_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CSG_ID, NULL); + ELEM_OPT_TLV(BE_CSG_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CSG_ID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5070,31 +5070,31 @@ bssmap_ho_req_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_len = len; /* Layer 3 Information 3.2.2.24 BSS-MSC M (note 1) 11-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_L3_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); + ELEM_MAND_TLV(BE_L3_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); /* Chosen Channel 3.2.2.33 BSS-MSC O (note 4) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BE_CHOSEN_CHAN, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); /* Chosen Encryption Algorithm 3.2.2.44 BSS-MSC O (note 5) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_ENC_ALG].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); + ELEM_OPT_TV(BE_CHOSEN_ENC_ALG, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); /* Circuit Pool 3.2.2.45 BSS-MSC O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CCT_POOL].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); + ELEM_OPT_TV(BE_CCT_POOL, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); /* Speech Version (Chosen) 3.2.2.51 BSS-MSC O (note 6) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SPEECH_VER].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Chosen)"); + ELEM_OPT_TV(BE_SPEECH_VER, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Chosen)"); /* Circuit Identity Code 3.2.2.2 BSS-MSC O (note 3) 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_OPT_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* LSA Identifier 3.2.2.15 BSS-MSC O (note 7) 5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LSA_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID, NULL); + ELEM_OPT_TLV(BE_LSA_ID, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID, NULL); /* New BSS to Old BSS Information 3.2.2.80 BSS-MSC O (note 8) 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_NEW_BSS_TO_OLD_BSS_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_NEW_BSS_TO_OLD_BSS_INF, NULL); + ELEM_OPT_TLV(BE_NEW_BSS_TO_OLD_BSS_INF, GSM_A_PDU_TYPE_BSSMAP, BE_NEW_BSS_TO_OLD_BSS_INF, NULL); /* Inter-System Information 3.2.2.81 BSS-MSC O (note 9) 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_INTER_SYS_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_INTER_SYS_INF, NULL); + ELEM_OPT_TLV(BE_INTER_SYS_INF, GSM_A_PDU_TYPE_BSSMAP, BE_INTER_SYS_INF, NULL); /* Talker Priority 3.2.2.89 BSS-MSC O (note 10) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* AoIP Transport Layer Address (BSS) 3.2.2.102 BSS-MSC O (note 11) 10-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_AOIP_TRANS_LAY_ADD].value, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); + ELEM_OPT_TLV(BE_AOIP_TRANS_LAY_ADD, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); /* Codec List (BSS Supported) 3.2.2.103 BSS-MSC O (note 12) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); /* Speech Codec (Chosen) 3.2.2.104 BSS-MSC O (note 12) 3-5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5113,13 +5113,13 @@ bssmap_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o curr_len = len; /* Layer 3 Information 3.2.2.24 MSC-BSS M (note 1) 11-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_L3_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); + ELEM_MAND_TLV(BE_L3_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); /* Cell Identifier 3.2.2.17 MSC-BSS O 3-10 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_OPT_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* New BSS to Old BSS Information 3.2.2.80 MSC-BSS O (note 2) 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_NEW_BSS_TO_OLD_BSS_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_NEW_BSS_TO_OLD_BSS_INF, NULL); + ELEM_OPT_TLV(BE_NEW_BSS_TO_OLD_BSS_INF, GSM_A_PDU_TYPE_BSSMAP, BE_NEW_BSS_TO_OLD_BSS_INF, NULL); /* Talker Priority 3.2.2.89 MSC-BSS O (note 3) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5138,15 +5138,15 @@ bssmap_ho_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_len = len; /* RR Cause 3.2.2.22 BSS-MSC O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_RR_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_RR_CAUSE, NULL); + ELEM_OPT_TV(BE_RR_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_RR_CAUSE, NULL); /* Talker Priority 3.2.2.89 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* Speech Codec (Chosen) 3.2.2.nn BSS-MSC O (note 2) 3-5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); /* Chosen Encryption Algorithm 3.2.2.44 BSS-MSC O (note 4) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_ENC_ALG].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); + ELEM_OPT_TV(BE_CHOSEN_ENC_ALG, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); /* Chosen Channel 3.2.2.33 BSS-MSC O (note 5) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BE_CHOSEN_CHAN, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5165,7 +5165,7 @@ bssmap_ho_succ(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Talker Priority 3.2.2.89 MSC-BSS O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5184,13 +5184,13 @@ bssmap_ho_cand_enq(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_len = len; /* Number Of Mss 3.2.2.8 MSC-BSS M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_NUM_MS].value, GSM_A_PDU_TYPE_BSSMAP, BE_NUM_MS, NULL); + ELEM_MAND_TV(BE_NUM_MS, GSM_A_PDU_TYPE_BSSMAP, BE_NUM_MS, NULL); /* Cell Identifier List 3.2.2.27 MSC-BSS M 2n+3 to 7n+3 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST, NULL); + ELEM_MAND_TLV(BE_CELL_ID_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST, NULL); /* Cell Identifier 3.2.2.17 MSC-BSS M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5209,10 +5209,10 @@ bssmap_ho_cand_resp(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /* Number Of Mss 3.2.2.8 BSS-MSC M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_NUM_MS].value, GSM_A_PDU_TYPE_BSSMAP, BE_NUM_MS, NULL); + ELEM_MAND_TV(BE_NUM_MS, GSM_A_PDU_TYPE_BSSMAP, BE_NUM_MS, NULL); /* Cell Identifier 3.2.2.17 BSS-MSC M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5231,23 +5231,23 @@ bssmap_ho_failure(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* RR Cause 3.2.2.22 BSS-MSC O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_RR_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_RR_CAUSE, NULL); + ELEM_OPT_TV(BE_RR_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_RR_CAUSE, NULL); /* Circuit Pool 3.2.2.45 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CCT_POOL].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); + ELEM_OPT_TV(BE_CCT_POOL, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); /* Circuit Pool List 3.2.2.46 BSS-MSC O (note 2) V */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CCT_POOL_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL_LIST, NULL); + ELEM_OPT_TLV(BE_CCT_POOL_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL_LIST, NULL); /* GERAN Classmark 3.2.2.78 BSS-MSC O (note 3) V */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GERAN_CLS_M].value, GSM_A_PDU_TYPE_BSSMAP, BE_GERAN_CLS_M, NULL); + ELEM_OPT_TLV(BE_GERAN_CLS_M, GSM_A_PDU_TYPE_BSSMAP, BE_GERAN_CLS_M, NULL); /* New BSS to Old BSS Information 3.2.2.80 BSS-MSC O (note 4) 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_NEW_BSS_TO_OLD_BSS_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_NEW_BSS_TO_OLD_BSS_INF, NULL); + ELEM_OPT_TLV(BE_NEW_BSS_TO_OLD_BSS_INF, GSM_A_PDU_TYPE_BSSMAP, BE_NEW_BSS_TO_OLD_BSS_INF, NULL); /* Inter-System Information 3.2.2.81 BSS-MSC O (note 5) 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_INTER_SYS_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_INTER_SYS_INF, NULL); + ELEM_OPT_TLV(BE_INTER_SYS_INF, GSM_A_PDU_TYPE_BSSMAP, BE_INTER_SYS_INF, NULL); /* Talker Priority 3.2.2.89 BSS-MSC O (note 6) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* Codec List (BSS Supported) 3.2.2.103 BSS-MSC O (note 7) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5266,13 +5266,13 @@ bssmap_res_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Periodicity 3.2.2.12 MSC-BSS M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_PERIODICITY].value, GSM_A_PDU_TYPE_BSSMAP, BE_PERIODICITY, NULL); + ELEM_MAND_TV(BE_PERIODICITY, GSM_A_PDU_TYPE_BSSMAP, BE_PERIODICITY, NULL); /* Resource Indication Method 3.2.2.29 MSC-BSS M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_RES_IND_METHOD].value, GSM_A_PDU_TYPE_BSSMAP, BE_RES_IND_METHOD, NULL); + ELEM_MAND_TV(BE_RES_IND_METHOD, GSM_A_PDU_TYPE_BSSMAP, BE_RES_IND_METHOD, NULL); /* Cell Identifier 3.2.2.17 MSC-BSS M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Extended Resource Indicator 3.2.2.13 MSC-BSS O 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_EXT_RES_IND].value, GSM_A_PDU_TYPE_BSSMAP, BE_EXT_RES_IND, NULL); + ELEM_MAND_TV(BE_EXT_RES_IND, GSM_A_PDU_TYPE_BSSMAP, BE_EXT_RES_IND, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5291,13 +5291,13 @@ bssmap_res_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Resource Indication Method 3.2.2.29 BSS-MSC M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_RES_IND_METHOD].value, GSM_A_PDU_TYPE_BSSMAP, BE_RES_IND_METHOD, NULL); + ELEM_MAND_TV(BE_RES_IND_METHOD, GSM_A_PDU_TYPE_BSSMAP, BE_RES_IND_METHOD, NULL); /* Resource Available 3.2.2.4 BSS-MSC O (note 1) 21 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_RES_AVAIL].value, GSM_A_PDU_TYPE_BSSMAP, BE_RES_AVAIL, NULL); + ELEM_MAND_TV(BE_RES_AVAIL, GSM_A_PDU_TYPE_BSSMAP, BE_RES_AVAIL, NULL); /* Cell Identifier 3.2.2.17 BSS-MSC M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Total Resource Accessible 3.2.2.14 BSS-MSC O (note 2) 5 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_TOT_RES_ACC].value, GSM_A_PDU_TYPE_BSSMAP, BE_TOT_RES_ACC, NULL); + ELEM_MAND_TV(BE_TOT_RES_ACC, GSM_A_PDU_TYPE_BSSMAP, BE_TOT_RES_ACC, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5315,17 +5315,17 @@ bssmap_paging(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o curr_len = len; /* IMSI 3.2.2.6 MSC-BSS M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_IMSI].value, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); + ELEM_MAND_TLV(BE_IMSI, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); /* TMSI 3.2.2.7 MSC-BSS O (note 1) 6 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_TMSI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TMSI, NULL); + ELEM_OPT_TLV(BE_TMSI, GSM_A_PDU_TYPE_BSSMAP, BE_TMSI, NULL); /* Cell Identifier List 3.2.2.27 MSC-BSS M 3 to 3+7n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST, NULL); + ELEM_MAND_TLV(BE_CELL_ID_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST, NULL); /* Channel Needed 3.2.2.36 MSC-BSS O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHAN_NEEDED].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHAN_NEEDED, NULL); + ELEM_OPT_TV(BE_CHAN_NEEDED, GSM_A_PDU_TYPE_BSSMAP, BE_CHAN_NEEDED, NULL); /* eMLPP Priority 3.2.2.56 MSC-BSS O (note 3) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_EMLPP_PRIO].value, GSM_A_PDU_TYPE_BSSMAP, BE_EMLPP_PRIO, NULL); + ELEM_OPT_TV(BE_EMLPP_PRIO, GSM_A_PDU_TYPE_BSSMAP, BE_EMLPP_PRIO, NULL); /* Paging Information 3.2.2.85 MSC-BSS O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_PAGING_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_PAGING_INF, NULL); + ELEM_OPT_TV(BE_PAGING_INF, GSM_A_PDU_TYPE_BSSMAP, BE_PAGING_INF, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5344,7 +5344,7 @@ bssmap_clear_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5363,9 +5363,9 @@ bssmap_clear_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 curr_len = len; /* Layer 3 Header Information 3.2.2.9 MSC-BSS O (note) 4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_L3_HEADER_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_HEADER_INFO, NULL); + ELEM_OPT_TLV(BE_L3_HEADER_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_HEADER_INFO, NULL); /* Cause 3.2.2.5 MSC-BSS M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5388,9 +5388,9 @@ bssmap_reset(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 of curr_len = len; /* Cause 3.2.2.5 Both M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* A-Interface Selector for RESET 3.2.2.107 Both O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_A_ITF_SEL_FOR_RESET].value, GSM_A_PDU_TYPE_BSSMAP, BE_A_ITF_SEL_FOR_RESET, NULL); + ELEM_OPT_TV(BE_A_ITF_SEL_FOR_RESET, GSM_A_PDU_TYPE_BSSMAP, BE_A_ITF_SEL_FOR_RESET, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5409,7 +5409,7 @@ bssmap_reset_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 curr_len = len; /* A-Interface Selector for RESET 3.2.2.107 Both O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_A_ITF_SEL_FOR_RESET].value, GSM_A_PDU_TYPE_BSSMAP, BE_A_ITF_SEL_FOR_RESET, NULL); + ELEM_OPT_TV(BE_A_ITF_SEL_FOR_RESET, GSM_A_PDU_TYPE_BSSMAP, BE_A_ITF_SEL_FOR_RESET, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5428,23 +5428,23 @@ bssmap_ho_performed(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Cell Identifier 3.2.2.17 BSS-MSC M (note 5) 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Chosen Channel 3.2.2.33 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BE_CHOSEN_CHAN, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); /* Chosen Encryption Algorithm 3.2.2.44 BSS-MSC O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_ENC_ALG].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); + ELEM_OPT_TV(BE_CHOSEN_ENC_ALG, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); /* Speech Version (Chosen) 3.2.2.51 BSS-MSC O (note 3) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_SPEECH_VER].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Chosen)"); + ELEM_OPT_TV(BE_SPEECH_VER, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_VER, " (Chosen)"); /* LSA Identifier 3.2.2.15 BSS-MSC O (note 4) 5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LSA_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID, NULL); + ELEM_OPT_TLV(BE_LSA_ID, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID, NULL); /* Talker Priority 3.2.2.89 BSS-MSC O (note 6) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* Codec List (BSS Supported) (serving cell) 3.2.2.103 BSS-MSC O (note 7) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); /* Speech Codec (Chosen) 3.2.2.104 BSS-MSC O (note 8) 3-5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5463,9 +5463,9 @@ bssmap_overload(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Cause 3.2.2.5 Both M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Cell Identifier 3.2.2.17 BSS-MSC O 3-10 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_OPT_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5483,17 +5483,17 @@ bssmap_msc_invoke_trace(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Trace Type 3.2.2.37 MSC-BSS M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_TRACE_TYPE].value, GSM_A_PDU_TYPE_BSSMAP, BE_TRACE_TYPE, NULL); + ELEM_MAND_TV(BE_TRACE_TYPE, GSM_A_PDU_TYPE_BSSMAP, BE_TRACE_TYPE, NULL); /* Triggerid 3.2.2.38 MSC-BSS O 3-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_TRIGGERID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TRIGGERID, NULL); + ELEM_OPT_TLV(BE_TRIGGERID, GSM_A_PDU_TYPE_BSSMAP, BE_TRIGGERID, NULL); /* Trace Reference 3.2.2.39 MSC-BSS M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_TRACE_REF].value, GSM_A_PDU_TYPE_BSSMAP, BE_TRACE_REF, NULL); + ELEM_MAND_TV(BE_TRACE_REF, GSM_A_PDU_TYPE_BSSMAP, BE_TRACE_REF, NULL); /* Transactionid 3.2.2.40 MSC-BSS O 4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_TRANSID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TRANSID, NULL); + ELEM_OPT_TLV(BE_TRANSID, GSM_A_PDU_TYPE_BSSMAP, BE_TRANSID, NULL); /* Mobile Identity 3.2.2.41 MSC-BSS O 3-10 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_MID].value, GSM_A_PDU_TYPE_BSSMAP, BE_MID, NULL); + ELEM_OPT_TLV(BE_MID, GSM_A_PDU_TYPE_BSSMAP, BE_MID, NULL); /* OMCId 3.2.2.42 MSC-BSS O 3-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_OMCID].value, GSM_A_PDU_TYPE_BSSMAP, BE_OMCID, NULL); + ELEM_OPT_TLV(BE_OMCID, GSM_A_PDU_TYPE_BSSMAP, BE_OMCID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5512,17 +5512,17 @@ bssmap_bss_invoke_trace(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Trace Type 3.2.2.37 Both M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_TRACE_TYPE].value, GSM_A_PDU_TYPE_BSSMAP, BE_TRACE_TYPE, NULL); + ELEM_MAND_TV(BE_TRACE_TYPE, GSM_A_PDU_TYPE_BSSMAP, BE_TRACE_TYPE, NULL); /* Forward Indicator 3.2.2.43 Both O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_FOR_IND].value, GSM_A_PDU_TYPE_BSSMAP, BE_FOR_IND, NULL); + ELEM_OPT_TV(BE_FOR_IND, GSM_A_PDU_TYPE_BSSMAP, BE_FOR_IND, NULL); /* Triggerid 3.2.2.38 Both O 3-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_TRIGGERID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TRIGGERID, NULL); + ELEM_OPT_TLV(BE_TRIGGERID, GSM_A_PDU_TYPE_BSSMAP, BE_TRIGGERID, NULL); /* Trace Reference 3.2.2.39 Both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_TRACE_REF].value, GSM_A_PDU_TYPE_BSSMAP, BE_TRACE_REF, NULL); + ELEM_MAND_TV(BE_TRACE_REF, GSM_A_PDU_TYPE_BSSMAP, BE_TRACE_REF, NULL); /* TransactionId 3.2.2.40 Both O 4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_TRANSID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TRANSID, NULL); + ELEM_OPT_TLV(BE_TRANSID, GSM_A_PDU_TYPE_BSSMAP, BE_TRANSID, NULL); /* OMCId 3.2.2.42 Both O 3-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_OMCID].value, GSM_A_PDU_TYPE_BSSMAP, BE_OMCID, NULL); + ELEM_OPT_TLV(BE_OMCID, GSM_A_PDU_TYPE_BSSMAP, BE_OMCID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5541,11 +5541,11 @@ bssmap_cm_upd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o curr_len = len; /* Classmark Information Type 2 3.2.2.19 Both M 4-5 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CM_INFO_2].value, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_2, NULL); + ELEM_MAND_TLV(BE_CM_INFO_2, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_2, NULL); /* Classmark Information Type 3 3.2.2.20 Both O (note 1) 3-34 */ - 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(BE_CM_INFO_3, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); /* Talker Priority 3.2.2.89 Both O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5564,13 +5564,13 @@ bssmap_ciph_mode_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu curr_len = len; /* Layer 3 Header Information 3.2.2.9 MSC-BSS O (note) 4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_L3_HEADER_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_HEADER_INFO, NULL); + ELEM_OPT_TLV(BE_L3_HEADER_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_HEADER_INFO, NULL); /* Encryption Information 3.2.2.10 MSC-BSS M 3-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_ENC_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); + ELEM_MAND_TLV(BE_ENC_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); /* Cipher Response Mode 3.2.2.34 MSC-BSS O 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CIPH_RESP_MODE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIPH_RESP_MODE, NULL); + ELEM_OPT_TV(BE_CIPH_RESP_MODE, GSM_A_PDU_TYPE_BSSMAP, BE_CIPH_RESP_MODE, NULL); /* Kc128 3.2.2.109 MSC-BSS C (note 2) 17 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_KC128].value, GSM_A_PDU_TYPE_BSSMAP, BE_KC128, NULL); + ELEM_OPT_TV(BE_KC128, GSM_A_PDU_TYPE_BSSMAP, BE_KC128, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5589,9 +5589,9 @@ bssmap_ciph_mode_complete(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U curr_len = len; /* Layer 3 Message Contents 3.2.2.35 BSS-MSC O 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_L3_MSG].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_MSG, NULL); + ELEM_OPT_TLV(BE_L3_MSG, GSM_A_PDU_TYPE_BSSMAP, BE_L3_MSG, NULL); /* Chosen Encryption Algorithm 3.2.2.44 BSS-MSC O (note) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_ENC_ALG].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); + ELEM_OPT_TV(BE_CHOSEN_ENC_ALG, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_ENC_ALG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5610,17 +5610,17 @@ bssmap_cl3_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Cell Identifier 3.2.2.17 BSS-MSC M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Layer 3 Information 3.2.2.24 BSS-MSC M 3-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_L3_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); + ELEM_MAND_TLV(BE_L3_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); /* Chosen Channel 3.2.2.33 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BE_CHOSEN_CHAN, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); /* LSA Identifier List 3.2.2.16 BSS-MSC O (note 2) 3+3n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LSA_ID_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID_LIST, NULL); + ELEM_OPT_TLV(BE_LSA_ID_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID_LIST, NULL); /* APDU 3.2.2.68 BSS-MSC O (note 3) 3-n */ - ELEM_OPT_TLV_E(gsm_bssmap_elem_strings[BE_APDU].value, GSM_A_PDU_TYPE_BSSMAP, BE_APDU, NULL); + ELEM_OPT_TLV_E(BE_APDU, GSM_A_PDU_TYPE_BSSMAP, BE_APDU, NULL); /* Codec List (BSS Supported) 3.2.2.103 BSS-MSC O (note 4) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5643,9 +5643,9 @@ bssmap_sapi_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* DLCI 3.2.2.25 BSS-MSC M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_DLCI].value, GSM_A_PDU_TYPE_BSSMAP, BE_DLCI, NULL); + ELEM_MAND_TV(BE_DLCI, GSM_A_PDU_TYPE_BSSMAP, BE_DLCI, NULL); /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5666,11 +5666,11 @@ bssmap_ho_reqd_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guin curr_len = len; /* Cause 3.2.2.5 MSC-BSS M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* New BSS to Old BSS Information 3.2.2.78 MSC-BSS O (note 1) 2-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_NEW_BSS_TO_OLD_BSS_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_NEW_BSS_TO_OLD_BSS_INF, NULL); + ELEM_OPT_TLV(BE_NEW_BSS_TO_OLD_BSS_INF, GSM_A_PDU_TYPE_BSSMAP, BE_NEW_BSS_TO_OLD_BSS_INF, NULL); /* Talker Priority 3.2.2.89 MSC-BSS O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5689,9 +5689,9 @@ bssmap_reset_cct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 curr_len = len; /* Circuit Identity Code 3.2.2.2 Both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Cause 3.2.2.5 Both M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5710,7 +5710,7 @@ bssmap_reset_cct_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu curr_len = len; /* Circuit Identity 3.2.2.2 Both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5729,7 +5729,7 @@ bssmap_ho_det(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 o curr_len = len; /* Talker Priority 3.2.2.89 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5747,11 +5747,11 @@ bssmap_cct_group_block(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Cause 3.2.2.5 Both M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Circuit Identity Code 3.2.2.2 Both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Circuit Identity Code List 3.2.2.31 Both M 4-35 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CIC_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); + ELEM_MAND_TLV(BE_CIC_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5770,9 +5770,9 @@ bssmap_cct_group_block_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ curr_len = len; /* Circuit Identity Code 3.2.2.2 Both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Circuit Identity Code List 3.2.2.31 Both M 4-35 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CIC_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); + ELEM_MAND_TLV(BE_CIC_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5791,9 +5791,9 @@ bssmap_cct_group_unblock(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ curr_len = len; /* Circuit Identity Code 3.2.2.2 Both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Circuit Identity Code List 3.2.2.31 Both M 4-35 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CIC_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); + ELEM_MAND_TLV(BE_CIC_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5812,9 +5812,9 @@ bssmap_cct_group_unblock_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo curr_len = len; /* Circuit Identity Code 3.2.2.2 Both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Circuit Identity Code List 3.2.2.31 Both M 4-35 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CIC_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); + ELEM_MAND_TLV(BE_CIC_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5833,9 +5833,9 @@ bssmap_confusion(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 curr_len = len; /* Cause 3.2.2.5 Both M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Diagnostics 3.2.2.32 Both M 4-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_DIAG].value, GSM_A_PDU_TYPE_BSSMAP, BE_DIAG, NULL); + ELEM_MAND_TLV(BE_DIAG, GSM_A_PDU_TYPE_BSSMAP, BE_DIAG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5853,7 +5853,7 @@ bssmap_cls_m_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 curr_len = len; /* Talker Priority 3.2.2.89 MSC-BSS O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5871,9 +5871,9 @@ bssmap_unequipped_cct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_len = len; /* Circuit Identity Code 3.2.2.2 Both M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Circuit Identity Code List 3.2.2.31 Both O 4-35 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CIC_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); + ELEM_OPT_TLV(BE_CIC_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CIC_LIST, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5892,7 +5892,7 @@ bssmap_ciph_mode_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5911,15 +5911,15 @@ bssmap_load_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Time Indication 3.2.2.47 Both M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_TIME_IND].value, GSM_A_PDU_TYPE_BSSMAP, BE_TIME_IND, NULL); + ELEM_MAND_TV(BE_TIME_IND, GSM_A_PDU_TYPE_BSSMAP, BE_TIME_IND, NULL); /* Cell Identifier 3.2.2.17 Both M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Cell Identifier List (Target) 3.2.2.27 Both M 3 to 3+7n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST, " (Target)"); + ELEM_MAND_TLV(BE_CELL_ID_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST, " (Target)"); /* Resource Situation 3.2.2.48 Both O (note 1) 4-N */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_RES_SIT].value, GSM_A_PDU_TYPE_BSSMAP, BE_RES_SIT, NULL); + ELEM_OPT_TLV(BE_RES_SIT, GSM_A_PDU_TYPE_BSSMAP, BE_RES_SIT, NULL); /* Cause 3.2.2.5 Both O (note 2) 4-5 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_OPT_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5937,11 +5937,11 @@ bssmap_load_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* Group Call Reference 3.2.2.55 MSC-BSS M 7 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_GROUP_CALL_REF].value, GSM_A_PDU_TYPE_BSSMAP, BE_GROUP_CALL_REF, NULL); + ELEM_MAND_TLV(BE_GROUP_CALL_REF, GSM_A_PDU_TYPE_BSSMAP, BE_GROUP_CALL_REF, NULL); /* Priority 3.2.2.18 MSC-BSS O 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_PRIO].value, GSM_A_PDU_TYPE_BSSMAP, BE_PRIO, NULL); + ELEM_OPT_TLV(BE_PRIO, GSM_A_PDU_TYPE_BSSMAP, BE_PRIO, NULL); /* VGCS Feature Flags 3.2.2.88 MSC-BSS O 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VGCS_FEAT_FLG].value, GSM_A_PDU_TYPE_BSSMAP, BE_VGCS_FEAT_FLG, NULL); + ELEM_OPT_TLV(BE_VGCS_FEAT_FLG, GSM_A_PDU_TYPE_BSSMAP, BE_VGCS_FEAT_FLG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5960,7 +5960,7 @@ bssmap_vgcs_vbs_setup_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U curr_len = len; /* VGCS Feature Flags 3.2.2.88 BSS-MSC O(note 1) 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VGCS_FEAT_FLG].value, GSM_A_PDU_TYPE_BSSMAP, BE_VGCS_FEAT_FLG, NULL); + ELEM_OPT_TLV(BE_VGCS_FEAT_FLG, GSM_A_PDU_TYPE_BSSMAP, BE_VGCS_FEAT_FLG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5979,7 +5979,7 @@ bssmap_vgcs_vbs_setup_refuse(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -5998,27 +5998,27 @@ bssmap_vgcs_vbs_ass_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Channel Type 3.2.2.11 MSC-BSS M (note 2) 5-13 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CURR_CHAN_1].value, GSM_A_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, NULL); + ELEM_MAND_TV(BE_CURR_CHAN_1, GSM_A_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, NULL); /* Assignment Requirement 3.2.2.52 MSC-BSS M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_ASS_REQ].value, GSM_A_PDU_TYPE_BSSMAP, BE_ASS_REQ, NULL); + ELEM_MAND_TV(BE_ASS_REQ, GSM_A_PDU_TYPE_BSSMAP, BE_ASS_REQ, NULL); /* Cell Identifier 3.2.2.17 MSC-BSS M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Group Call Reference 3.2.2.55 MSC-BSS M 7 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_GROUP_CALL_REF].value, GSM_A_PDU_TYPE_BSSMAP, BE_GROUP_CALL_REF, NULL); + ELEM_MAND_TLV(BE_GROUP_CALL_REF, GSM_A_PDU_TYPE_BSSMAP, BE_GROUP_CALL_REF, NULL); /* Priority 3.2.2.18 MSC-BSS O 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_PRIO].value, GSM_A_PDU_TYPE_BSSMAP, BE_PRIO, NULL); + ELEM_OPT_TLV(BE_PRIO, GSM_A_PDU_TYPE_BSSMAP, BE_PRIO, NULL); /* Circuit Identity Code 3.2.2.2 MSC-BSS O (note 4, 5) 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_OPT_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Downlink DTX Flag 3.2.2.26 MSC-BSS O (note 2, 4) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_DOWN_DTX_FLAG].value, GSM_A_PDU_TYPE_BSSMAP, BE_DOWN_DTX_FLAG, NULL); + ELEM_OPT_TV(BE_DOWN_DTX_FLAG, GSM_A_PDU_TYPE_BSSMAP, BE_DOWN_DTX_FLAG, NULL); /* Encryption Information 3.2.2.10 MSC-BSS O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_ENC_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); + ELEM_OPT_TLV(BE_ENC_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_ENC_INFO, NULL); /* VSTK_RAND 3.2.2.83 MSC-BSS O (note 1) 7 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VSTK_RAND_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_VSTK_RAND_INF, NULL); + ELEM_OPT_TLV(BE_VSTK_RAND_INF, GSM_A_PDU_TYPE_BSSMAP, BE_VSTK_RAND_INF, NULL); /* VSTK 3.2.2.84 MSC-BSS O (note 1) 18 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VSTK_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_VSTK_INF, NULL); + ELEM_OPT_TLV(BE_VSTK_INF, GSM_A_PDU_TYPE_BSSMAP, BE_VSTK_INF, NULL); /* Cell Identifier List Segment 3.2.2.27a MSC-BSS O (note 3) 4-? */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LIST_SEG].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST_SEG, NULL); + ELEM_OPT_TLV(BE_CELL_ID_LIST_SEG, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST_SEG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6036,15 +6036,15 @@ bssmap_vgcs_vbs_ass_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Channel Type 3.2.2.11 BSS-MSC M (note 3, 4) 5 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CURR_CHAN_1].value, GSM_A_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, NULL); + ELEM_OPT_TV(BE_CURR_CHAN_1, GSM_A_PDU_TYPE_BSSMAP, BE_CURR_CHAN_1, NULL); /* Cell Identifier 3.2.2.17 BSS-MSC M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Chosen Channel 3.2.2.33 BSS-MSC O (note 2) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CHOSEN_CHAN].value, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); + ELEM_OPT_TV(BE_CHOSEN_CHAN, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); /* Circuit Identity Code 3.2.2.2 BSS-MSC O (note 5) 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_OPT_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* Circuit Pool 3.2.2.45 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CCT_POOL].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); + ELEM_OPT_TV(BE_CCT_POOL, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6062,11 +6062,11 @@ bssmap_vgcs_vbs_ass_fail(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_OPT_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Circuit Pool 3.2.2.45 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CCT_POOL].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); + ELEM_OPT_TV(BE_CCT_POOL, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL, NULL); /* Circuit Pool List 3.2.2.46 BSS-MSC O (note 2) V */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CCT_POOL_LIST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL_LIST, NULL); + ELEM_OPT_TLV(BE_CCT_POOL_LIST, GSM_A_PDU_TYPE_BSSMAP, BE_CCT_POOL_LIST, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6088,13 +6088,13 @@ bssmap_uplink_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_len = len; /* Talker Priority 3.2.2.89 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* Cell Identifier 3.2.2.17 BSS-MSC O (note 1) 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Layer 3 Information 3.2.2.24 BSS-MSC O (note 1,3) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_L3_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); + ELEM_OPT_TLV(BE_L3_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); /* Mobile Identity 3.2.2.41 BSS-MSC O (note 1,2) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_MID].value, GSM_A_PDU_TYPE_COMMON, DE_MID, NULL); + ELEM_OPT_TLV(BE_MID, GSM_A_PDU_TYPE_COMMON, DE_MID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6112,11 +6112,11 @@ bssmap_uplink_req_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_len = len; /* Talker Priority 3.2.2.89 MSC-BSS O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* Emergency set indication 3.2.2.90 MSC-BSS O (note 1) 1 */ - ELEM_OPT_T(gsm_bssmap_elem_strings[BE_EMRG_SET_IND].value, GSM_A_PDU_TYPE_BSSMAP, BE_EMRG_SET_IND, NULL); + ELEM_OPT_T(BE_EMRG_SET_IND, GSM_A_PDU_TYPE_BSSMAP, BE_EMRG_SET_IND, NULL); /* Talker Identity 3.2.2.91 MSC-BSS O 3-20 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_TALKER_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); + ELEM_MAND_TLV(BE_TALKER_ID, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6134,11 +6134,11 @@ bssmap_uplink_req_conf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Cell Identifier 3.2.2.17 BSS-MSC M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Talker Identity 3.2.2.91 BSS-MSC O 3-20 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_TALKER_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); + ELEM_OPT_TLV(BE_TALKER_ID, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); /* Layer 3 Information 3.2.2.24 BSS-MSC M 3-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_L3_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); + ELEM_MAND_TLV(BE_L3_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6156,11 +6156,11 @@ bssmap_uplink_app_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Cell Identifier 3.2.2.17 BSS-MSC M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Layer 3 Information 3.2.2.24 BSS-MSC M 3-n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_L3_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); + ELEM_MAND_TLV(BE_L3_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); /* Application Data information 3.2.2.100 BSS-MSC M 3 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_APP_DATA_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_APP_DATA_INF, NULL); + ELEM_MAND_TLV(BE_APP_DATA_INF, GSM_A_PDU_TYPE_BSSMAP, BE_APP_DATA_INF, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6178,9 +6178,9 @@ bssmap_uplink_rel_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Talker Priority 3.2.2.89 BSS-MSC O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); @@ -6199,13 +6199,13 @@ bssmap_uplink_rej_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_len = len; /* Cause 3.2.2.5 MSC-BSS M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Current Talker Priority 3.2.2.89 MSC-BSS O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, "Current"); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, "Current"); /* Rejected Talker Priority 3.2.2.89 MSC-BSS O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, "Rejected"); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, "Rejected"); /* Talker Identity 3.2.2.91 MSC-BSS O 3-20 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_TALKER_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); + ELEM_OPT_TLV(BE_TALKER_ID, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6223,7 +6223,7 @@ bssmap_uplink_rel_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_len = len; /* Cause 3.2.2.5 MSC-BSS M 3-4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_OPT_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6242,13 +6242,13 @@ bssmap_uplink_seized_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ curr_len = len; /* Cause 3.2.2.5 MSC-BSS M 3-4 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_OPT_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Talker Priority 3.2.2.89 MSC-BSS O (note 1) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_TALKER_PRI].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); + ELEM_OPT_TV(BE_TALKER_PRI, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_PRI, NULL); /* Emergency set indication 3.2.2.90 MSC-BSS O (note 1) 1 */ - ELEM_OPT_T(gsm_bssmap_elem_strings[BE_EMRG_SET_IND].value, GSM_A_PDU_TYPE_BSSMAP, BE_EMRG_SET_IND, NULL); + ELEM_OPT_T(BE_EMRG_SET_IND, GSM_A_PDU_TYPE_BSSMAP, BE_EMRG_SET_IND, NULL); /* Talker Identity 3.2.2.91 MSC-BSS O 3-20 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_TALKER_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); + ELEM_MAND_TLV(BE_TALKER_ID, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6266,7 +6266,7 @@ bssmap_sus(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs curr_len = len; /* DLCI 3.2.2.25 BSS-MSC M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_DLCI].value, GSM_A_PDU_TYPE_BSSMAP, BE_DLCI, NULL); + ELEM_MAND_TV(BE_DLCI, GSM_A_PDU_TYPE_BSSMAP, BE_DLCI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6284,7 +6284,7 @@ bssmap_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs curr_len = len; /* DLCI 3.2.2.25 BSS-MSC M 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_DLCI].value, GSM_A_PDU_TYPE_BSSMAP, BE_DLCI, NULL); + ELEM_MAND_TV(BE_DLCI, GSM_A_PDU_TYPE_BSSMAP, BE_DLCI, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6302,7 +6302,7 @@ bssmap_change_cct(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_len = len; /* Cause 3.2.2.5 MSC-BSS M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6321,7 +6321,7 @@ bssmap_change_cct_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_len = len; /* Circuit identity 3.2.2.2 BSS-MSC M 3 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_MAND_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6340,9 +6340,9 @@ bssmap_common_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint3 curr_len = len; /* IMSI 3.2.2.6 MSC-BSS M 3-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_IMSI].value, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); + ELEM_MAND_TLV(BE_IMSI, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); /* SNA Access Information 3.2.2.82 MSC-BSC O (note) 2+n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SNA_ACC_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_SNA_ACC_INF, NULL); + ELEM_OPT_TLV(BE_SNA_ACC_INF, GSM_A_PDU_TYPE_BSSMAP, BE_SNA_ACC_INF, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6361,7 +6361,7 @@ bssmap_lsa_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* LSA Information 3.2.2.23 MSC-BSS M 3+4n */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_LSA_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_INFO, NULL); + ELEM_MAND_TLV(BE_LSA_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_INFO, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6379,9 +6379,9 @@ bssmap_conn_oriented(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gu curr_offset = offset; curr_len = len; - ELEM_MAND_TLV_E(gsm_bssmap_elem_strings[BE_APDU].value, GSM_A_PDU_TYPE_BSSMAP, BE_APDU, NULL); + ELEM_MAND_TLV_E(BE_APDU, GSM_A_PDU_TYPE_BSSMAP, BE_APDU, NULL); - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SEG].value, GSM_A_PDU_TYPE_BSSMAP, BE_SEG, NULL); + ELEM_OPT_TLV(BE_SEG, GSM_A_PDU_TYPE_BSSMAP, BE_SEG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6400,31 +6400,31 @@ bssmap_perf_loc_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /* Location Type 3.2.2.63 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(BE_LOC_TYPE, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_TYPE , NULL); /* Cell Identifier 3.2.2.17 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(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* Classmark Information Type 3 3.2.2.20 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(BE_CM_INFO_3, GSM_A_PDU_TYPE_BSSMAP, BE_CM_INFO_3, NULL); /* LCS Client Type 3.2.2.67 C (note 3) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LCS_CLIENT].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE, NULL); + ELEM_OPT_TLV(BE_LCS_CLIENT, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CLIENT_TYPE, NULL); /* Chosen Channel 3.2.2.33 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(BE_CHOSEN_CHAN, GSM_A_PDU_TYPE_BSSMAP, BE_CHOSEN_CHAN, NULL); /* LCS Priority 3.2.2.62 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(BE_LCS_PRIO, GSM_A_PDU_TYPE_BSSMAP, BE_LCS_PRIO, NULL); /* LCS QoS 3.2.2.60 C (note 1) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LCS_QOS].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS, NULL); + ELEM_OPT_TLV(BE_LCS_QOS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCSQOS, NULL); /* GPS Assistance Data 3.2.2.70 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(BE_GPS_ASSIST_DATA, GSM_A_PDU_TYPE_BSSMAP, BE_GPS_ASSIST_DATA, NULL); /* APDU 3.2.2.68 O 3-n */ - ELEM_OPT_TLV_E(gsm_bssmap_elem_strings[BE_APDU].value, GSM_A_PDU_TYPE_BSSMAP, BE_APDU, NULL); + ELEM_OPT_TLV_E(BE_APDU, GSM_A_PDU_TYPE_BSSMAP, BE_APDU, NULL); /* IMSI 3.2.2.6 O (note 4) 5-10 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_IMSI].value, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); + ELEM_OPT_TLV(BE_IMSI, GSM_A_PDU_TYPE_BSSMAP, BE_IMSI, NULL); /* IMEI 3.2.2.86 O (note 4) 10 (use same decode as IMSI) */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_IMEI].value, GSM_A_PDU_TYPE_BSSMAP, BE_IMEI, NULL); + ELEM_OPT_TLV(BE_IMEI, GSM_A_PDU_TYPE_BSSMAP, BE_IMEI, NULL); /* GANSS Location Type 3.2.2.97 C 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GANSS_LOC_TYP].value, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_LOC_TYP, NULL); + ELEM_OPT_TLV(BE_GANSS_LOC_TYP, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_LOC_TYP, NULL); /* GANSS Assistance Data 3.2.2.95 C (note 5) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GANSS_ASS_DTA].value, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_ASS_DTA, NULL); + ELEM_OPT_TLV(BE_GANSS_ASS_DTA, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_ASS_DTA, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6442,17 +6442,17 @@ bssmap_perf_loc_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /* Location Estimate 3.2.2.64 C (note 1) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LOC_EST].value, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_EST, NULL); + ELEM_OPT_TLV(BE_LOC_EST, GSM_A_PDU_TYPE_BSSMAP, BE_LOC_EST, NULL); /* Positioning Data 3.2.2.65 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_POS_DATA].value, GSM_A_PDU_TYPE_BSSMAP, BE_POS_DATA, NULL); + ELEM_OPT_TLV(BE_POS_DATA, GSM_A_PDU_TYPE_BSSMAP, BE_POS_DATA, NULL); /* Deciphering Keys 3.2.2.71 C (note 2) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_DECIPH_KEYS].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS, NULL); + ELEM_OPT_TLV(BE_DECIPH_KEYS, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_DECIPH_KEYS, NULL); /* LCS Cause 3.2.2.66 C (note 3) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LCS_CAUSE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); + ELEM_OPT_TLV(BE_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); /* Velocity Estimate 3.2.2.87 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VEL_EST].value, GSM_A_PDU_TYPE_BSSMAP, BE_VEL_EST, NULL); + ELEM_OPT_TLV(BE_VEL_EST, GSM_A_PDU_TYPE_BSSMAP, BE_VEL_EST, NULL); /* GANSS Positioning Data 3.2.2.96 O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_GANSS_POS_DTA].value, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_POS_DTA, NULL); + ELEM_OPT_TLV(BE_GANSS_POS_DTA, GSM_A_PDU_TYPE_BSSMAP, BE_GANSS_POS_DTA, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6470,7 +6470,7 @@ bssmap_perf_loc_abort(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_len = len; /* LCS Cause 3.2.2.66 M 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_LCS_CAUSE].value, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); + ELEM_OPT_TLV(BE_LCS_CAUSE, GSM_PDU_TYPE_BSSMAP_LE, DE_BMAPLE_LCS_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6501,7 +6501,7 @@ bssmap_chan_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6510,9 +6510,9 @@ bssmap_chan_mod_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui */ /* Cell Identifier 3.2.2.17 BSS-MSC O 3-10 -ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); +ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); Layer 3 Information 3.2.2.24 BSS-MSC O (note 2) 3-n - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_L3_INFO].value, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); + ELEM_OPT_TLV(BE_L3_INFO, GSM_A_PDU_TYPE_BSSMAP, BE_L3_INFO, NULL); Mobile Identity 3.2.2.41 BSS-MSC O (note 1) 3-n */ /* @@ -6533,7 +6533,7 @@ bssmap_vgcs_add_inf(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /* Talker Identity 3.2.2.91 MSC-BSS M 3-20 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_TALKER_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); + ELEM_MAND_TLV(BE_TALKER_ID, GSM_A_PDU_TYPE_BSSMAP, BE_TALKER_ID, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6551,9 +6551,9 @@ bssmap_vgcs_vbs_area_cell_info(tvbuff_t *tvb, proto_tree *tree, packet_info *pin curr_len = len; /* Cell Identifier List Segment 3.2.2.27a MSC-BSS M 4-? */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LIST_SEG].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST_SEG, NULL); + ELEM_OPT_TLV(BE_CELL_ID_LIST_SEG, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LIST_SEG, NULL); /* Assignment Requirement 3.2.2.52 MSC-BSS O 2 */ - ELEM_MAND_TV(gsm_bssmap_elem_strings[BE_ASS_REQ].value, GSM_A_PDU_TYPE_BSSMAP, BE_ASS_REQ, NULL); + ELEM_MAND_TV(BE_ASS_REQ, GSM_A_PDU_TYPE_BSSMAP, BE_ASS_REQ, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6571,15 +6571,15 @@ bssmap_vgcs_vbs_assign_status(tvbuff_t *tvb, proto_tree *tree, packet_info *pinf curr_len = len; /* Cell Identifier List Segment for established cells 3.2.2.27b BSS-MSC O (note 1) 3-? */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LST_SEG_F_EST_CELLS].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LST_SEG_F_EST_CELLS, NULL); + ELEM_OPT_TLV(BE_CELL_ID_LST_SEG_F_EST_CELLS, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LST_SEG_F_EST_CELLS, NULL); /* Cell Identifier List Segment for cells to be established 3.2.2.27c BSS-MSC O (note 1) 3-? */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LST_SEG_F_CELL_TB_EST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LST_SEG_F_CELL_TB_EST, NULL); + ELEM_OPT_TLV(BE_CELL_ID_LST_SEG_F_CELL_TB_EST, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LST_SEG_F_CELL_TB_EST, NULL); /* Cell Identifier List Segment for released cells - no user present 3.2.2.27e BSS-MSC O (note 1) 3-? */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LST_SEG_F_REL_CELL].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LST_SEG_F_REL_CELL, NULL); + ELEM_OPT_TLV(BE_CELL_ID_LST_SEG_F_REL_CELL, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LST_SEG_F_REL_CELL, NULL); /* Cell Identifier List Segment for not established cells - no establishment possible 3.2.2.27f BSS-MSC O (note 1) 3-? */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CELL_ID_LST_SEG_F_NOT_EST_CELL].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, NULL); + ELEM_OPT_TLV(BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID_LST_SEG_F_NOT_EST_CELL, NULL); /* VGCS/VBS Cell Status 3.2.2.94 BSS-MSC O (note 2) 3 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_VGS_VBS_CELL_STAT].value, GSM_A_PDU_TYPE_BSSMAP, BE_VGS_VBS_CELL_STAT, NULL); + ELEM_OPT_TLV(BE_VGS_VBS_CELL_STAT, GSM_A_PDU_TYPE_BSSMAP, BE_VGS_VBS_CELL_STAT, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6597,7 +6597,7 @@ bssmap_vgcs_sms(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 curr_len = len; /* SMS to VGCS 3.2.2.92 MSC-BSS M 2-250 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_SMS_TO_VGCS].value, GSM_A_PDU_TYPE_BSSMAP, BE_SMS_TO_VGCS, NULL); + ELEM_MAND_TLV(BE_SMS_TO_VGCS, GSM_A_PDU_TYPE_BSSMAP, BE_SMS_TO_VGCS, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6615,11 +6615,11 @@ bssmap_notification_data(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_ curr_len = len; /* Application Data 3.2.2.98 MSC-BSS M 11 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_APP_DATA_INF].value, GSM_A_PDU_TYPE_BSSMAP, BE_APP_DATA_INF, NULL); + ELEM_MAND_TLV(BE_APP_DATA_INF, GSM_A_PDU_TYPE_BSSMAP, BE_APP_DATA_INF, NULL); /* Data Identity 3.2.2.99 MSC-BSS M 3 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_DATA_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_DATA_ID, NULL); + ELEM_MAND_TLV(BE_DATA_ID, GSM_A_PDU_TYPE_BSSMAP, BE_DATA_ID, NULL); /* MSISDN 3.2.2.101 MSC-BSS O 2-12 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_MSISDN].value, GSM_A_PDU_TYPE_BSSMAP, BE_MSISDN, NULL); + ELEM_MAND_TLV(BE_MSISDN, GSM_A_PDU_TYPE_BSSMAP, BE_MSISDN, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6637,13 +6637,13 @@ bssmap_int_ho_req(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_len = len; /* Cause 3.2.2.5 BSS-MSC M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Cell Identifier 3.2.2.17 BSS-MSC M 4-10 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CELL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); + ELEM_MAND_TLV(BE_CELL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CELL_ID, NULL); /* AoIP Transport Layer Address (BSS) 3.2.2.nn BSS-MSC C (Note 1) 10-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_AOIP_TRANS_LAY_ADD].value, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); + ELEM_OPT_TLV(BE_AOIP_TRANS_LAY_ADD, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); /* Codec List (BSS Supported) 3.2.2.103 BSS-MSC M 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6661,9 +6661,9 @@ bssmap_int_ho_req_rej(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, g curr_len = len; /* Cause 3.2.2.5 MSC-BSS M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Codec List (MSC Preferred) 3.2.2.nn MSC-BSS O 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC_LST, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC_LST, "(BSS Supported)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6682,15 +6682,15 @@ bssmap_int_ho_cmd(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_len = len; /* Speech Codec (MSC Chosen) 3.2.2.nn MSC-BSS M (note 1) 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); /* Circuit Identity Code 3.2.2.2 MSC-BSS C (note 2) 3 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CIC].value, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); + ELEM_OPT_TV(BE_CIC, GSM_A_PDU_TYPE_BSSMAP, BE_CIC, NULL); /* AoIP Transport Layer Address (MGW) 3.2.2.102 MSC-BSS C (note 2) 10-22 */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_AOIP_TRANS_LAY_ADD].value, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); + ELEM_OPT_TLV(BE_AOIP_TRANS_LAY_ADD, GSM_A_PDU_TYPE_BSSMAP, BE_AOIP_TRANS_LAY_ADD, NULL); /* Call Identifier 3.2.2.105 MSC-BSS C (note 4) 5 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_CALL_ID].value, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID, NULL); + ELEM_OPT_TV(BE_CALL_ID, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID, NULL); /* Downlink DTX Flag 3.2.2.26 MSC-BSS O (note 5) 2 */ - ELEM_OPT_TV(gsm_bssmap_elem_strings[BE_DOWN_DTX_FLAG].value, GSM_A_PDU_TYPE_BSSMAP, BE_DOWN_DTX_FLAG, NULL); + ELEM_OPT_TV(BE_DOWN_DTX_FLAG, GSM_A_PDU_TYPE_BSSMAP, BE_DOWN_DTX_FLAG, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6709,7 +6709,7 @@ bssmap_int_ho_enq(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint curr_len = len; /* Speech Codec (MSC Chosen) 3.2.2.104 MSC-BSS M 3-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_SPEECH_CODEC].value, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); + ELEM_OPT_TLV(BE_SPEECH_CODEC, GSM_A_PDU_TYPE_BSSMAP, BE_SPEECH_CODEC, "(Chosen)"); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6727,9 +6727,9 @@ bssmap_reset_ip_res(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, gui curr_len = len; /* Cause 3.2.2.5 Both M 3-4 */ - ELEM_MAND_TLV(gsm_bssmap_elem_strings[BE_CAUSE].value, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); + ELEM_MAND_TLV(BE_CAUSE, GSM_A_PDU_TYPE_BSSMAP, BE_CAUSE, NULL); /* Call Identifier List 3.2.2.106 Both M 6-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CALL_ID_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID_LST, NULL); + ELEM_OPT_TLV(BE_CALL_ID_LST, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID_LST, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } @@ -6747,7 +6747,7 @@ bssmap_reset_ip_res_ack(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, curr_len = len; /* Call Identifier List 3.2.2.106 Both M 6-n */ - ELEM_OPT_TLV(gsm_bssmap_elem_strings[BE_CALL_ID_LST].value, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID_LST, NULL); + ELEM_OPT_TLV(BE_CALL_ID_LST, GSM_A_PDU_TYPE_BSSMAP, BE_CALL_ID_LST, NULL); EXTRANEOUS_DATA_CHECK(curr_len, 0); } diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index 1f304ed6e9..4406b96b42 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -46,24 +46,24 @@ const value_string gsm_common_elem_strings[] = { /* Common Information Elements 10.5.1 */ - { 0x00, "Cell Identity" }, - { 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" }, + { DE_CELL_ID, "Cell Identity" }, + { DE_CIPH_KEY_SEQ_NUM, "Ciphering Key Sequence Number" }, + { DE_LAI, "Location Area Identification (LAI)" }, + { DE_MID, "Mobile Identity" }, + { DE_MS_CM_1, "Mobile Station Classmark 1" }, + { DE_MS_CM_2, "Mobile Station Classmark 2" }, + { DE_MS_CM_3, "Mobile Station Classmark 3" }, + { DE_SPARE_NIBBLE, "Spare Half Octet" }, + { DE_D_GB_CALL_REF, "Descriptive group or broadcast call reference" }, + { DE_G_CIPH_KEY_NUM, "Group Cipher Key Number" }, + { DE_PD_SAPI, "PD and SAPI $(CCBS)$" }, + { DE_PRIO, "Priority Level" }, + { DE_CN_COMMON_GSM_MAP_NAS_SYS_INFO, "CN Common GSM-MAP NAS system information" }, + { DE_CS_DOMAIN_SPEC_SYS_INFO, "CS domain specific system information" }, + { DE_PS_DOMAIN_SPEC_SYS_INFO, "PS domain specific system information" }, + { DE_PLMN_LIST, "PLMN List" }, + { DE_NAS_CONT_FOR_PS_HO, "NAS container for PS HO" }, + { DE_MS_NET_FEAT_SUP, "MS network feature support" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 49482b4414..0c41641358 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -245,92 +245,92 @@ 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" }, - { 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" }, + { DE_AUTH_PARAM_RAND, "Authentication Parameter RAND" }, + { DE_AUTH_PARAM_AUTN, "Authentication Parameter AUTN (UMTS and EPS authentication challenge)" }, + { DE_AUTH_RESP_PARAM, "Authentication Response Parameter" }, + { DE_AUTH_RESP_PARAM_EXT, "Authentication Response Parameter (extension) (UMTS authentication challenge only)" }, + { DE_AUTH_FAIL_PARAM, "Authentication Failure Parameter (UMTS and EPS authentication challenge)" }, + { DE_CM_SRVC_TYPE, "CM Service Type" }, + { DE_ID_TYPE, "Identity Type" }, + { DE_LOC_UPD_TYPE, "Location Updating Type" }, + { DE_NETWORK_NAME, "Network Name" }, + { DE_REJ_CAUSE, "Reject Cause" }, + { DE_FOP, "Follow-on Proceed" }, + { DE_TIME_ZONE, "Time Zone" }, + { DE_TIME_ZONE_TIME, "Time Zone and Time" }, + { DE_CTS_PERM, "CTS Permission" }, + { DE_LSA_ID, "LSA Identifier" }, + { DE_DAY_SAVING_TIME, "Daylight Saving Time" }, + { DE_EMERGENCY_NUM_LIST, "Emergency Number List" }, + { DE_ADD_UPD_PARAMS, "Additional update parameters" }, + { DE_MM_TIMER, "MM Timer" }, /* Call Control Information Elements 10.5.4 */ - { 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 */ + { DE_AUX_STATES, "Auxiliary States" }, /* 10.5.4.4 Auxiliary states */ + { DE_BEARER_CAP, "Bearer Capability" }, /* 10.5.4.4a Backup bearer capability */ + { DE_CC_CAP, "Call Control Capabilities" }, + { DE_CALL_STATE, "Call State" }, + { DE_CLD_PARTY_BCD_NUM, "Called Party BCD Number" }, + { DE_CLD_PARTY_SUB_ADDR, "Called Party Subaddress" }, + { DE_CLG_PARTY_BCD_NUM, "Calling Party BCD Number" }, + { DE_CLG_PARTY_SUB_ADDR, "Calling Party Subaddress" }, + { DE_CAUSE, "Cause" }, + { DE_CLIR_SUP, "CLIR Suppression" }, + { DE_CLIR_INV, "CLIR Invocation" }, + { DE_CONGESTION, "Congestion Level" }, + { DE_CONN_NUM, "Connected Number" }, + { DE_CONN_SUB_ADDR, "Connected Subaddress" }, + { DE_FACILITY, "Facility" }, + { DE_HLC, "High Layer Compatibility" }, + { DE_KEYPAD_FACILITY, "Keypad Facility" }, + { DE_LLC, "Low Layer Compatibility" }, + { DE_MORE_DATA, "More Data" }, + { DE_NOT_IND, "Notification Indicator" }, + { DE_PROG_IND, "Progress Indicator" }, + { DE_RECALL_TYPE, "Recall type $(CCBS)$" }, + { DE_RED_PARTY_BCD_NUM, "Redirecting Party BCD Number" }, + { DE_RED_PARTY_SUB_ADDR, "Redirecting Party Subaddress" }, + { DE_REPEAT_IND, "Repeat Indicator" }, + { DE_REV_CALL_SETUP_DIR, "Reverse Call Setup Direction" }, + { DE_SETUP_CONTAINER, "SETUP Container $(CCBS)$" }, + { DE_SIGNAL, "Signal" }, + { DE_SS_VER_IND, "SS Version Indicator" }, + { DE_USER_USER, "User-user" }, + { DE_ALERT_PATTERN, "Alerting Pattern $(NIA)$" }, /* 10.5.4.26 Alerting Pattern $(NIA)$ */ + { DE_ALLOWED_ACTIONS, "Allowed Actions $(CCBS)$" }, + { DE_SI, "Stream Identifier" }, + { DE_NET_CC_CAP, "Network Call Control Capabilities" }, + { DE_CAUSE_NO_CLI, "Cause of No CLI" }, /* 10.5.4.30 Cause of No CLI */ /* 10.5.4.31 Void */ - { 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" }, + { DE_SUP_CODEC_LIST, "Supported Codec List" }, /* 10.5.4.32 Supported codec list */ + { DE_SERV_CAT, "Service Category" }, /* 10.5.4.33 Service category */ + { DE_REDIAL, "Redial" }, /* 10.5.4.34 Redial */ + { DE_NET_INIT_SERV_UPG, "Network-initiated Service Upgrade indicator" }, /* 10.5.4.35 Network-initiated Service Upgrade indicator */ /* Short Message Service Information Elements [5] 8.1.4 */ - { 0x3a, "CP-User Data" }, - { 0x3b, "CP-Cause" }, + { DE_CP_USER_DATA, "CP-User Data" }, + { DE_CP_CAUSE, "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*/ - { 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"}, + { DE_TP_SUB_CHANNEL, "Close TCH Loop Cmd Sub-channel"}, + { DE_TP_ACK, "Open Loop Cmd Ack"}, + { DE_TP_LOOP_TYPE, "Close Multi-slot Loop Cmd Loop type"}, + { DE_TP_LOOP_ACK, "Close Multi-slot Loop Ack Result"}, + { DE_TP_TESTED_DEVICE, "Test Interface Tested device"}, + { DE_TP_PDU_DESCRIPTION, "GPRS Test Mode Cmd PDU description"}, + { DE_TP_MODE_FLAG, "GPRS Test Mode Cmd Mode flag"}, + { DE_TP_EGPRS_MODE_FLAG, "EGPRS Start Radio Block Loopback Cmd Mode flag"}, + { DE_TP_MS_POSITIONING_TECHNOLOGY, "MS Positioning Technology"}, + { DE_TP_UE_TEST_LOOP_MODE, "Close UE Test Loop Mode"}, + { DE_TP_UE_POSITIONING_TECHNOLOGY, "UE Positioning Technology"}, + { DE_TP_RLC_SDU_COUNTER_VALUE, "RLC SDU Counter Value"}, + { DE_TP_EPC_UE_TEST_LOOP_MODE, "UE Test Loop Mode"}, + { DE_TP_EPC_UE_TL_A_LB_SETUP, "UE Test Loop Mode A LB Setup"}, + { DE_TP_EPC_UE_TL_B_LB_SETUP, "UE Test Loop Mode B LB Setup"}, + { DE_TP_EPC_UE_TL_C_SETUP, "UE Test Loop Mode C Setup"}, + { DE_TP_EPC_UE_POSITIONING_TECHNOLOGY, "UE Positioning Technology"}, + { DE_TP_EPC_MBMS_PACKET_COUNTER_VALUE, "MBMS Packet Counter Value"}, + { DE_TP_EPC_ELLIPSOID_POINT_WITH_ALT, "Ellipsoid Point With Altitude"}, + { DE_TP_EPC_HORIZONTAL_VELOCITY, "Horizontal Velocity"}, + { DE_TP_EPC_GNSS_TOD_MSEC, "GNSS-TOD-msec"}, { 0, NULL } }; diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c index cf1b07a4cf..857fb293d2 100644 --- a/epan/dissectors/packet-gsm_a_gm.c +++ b/epan/dissectors/packet-gsm_a_gm.c @@ -151,73 +151,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" }, - { 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" }, + { DE_ADD_UPD_TYPE, "Additional Update Type" }, + { DE_ATTACH_RES, "Attach Result" }, + { DE_ATTACH_TYPE, "Attach Type" }, + { DE_CIPH_ALG, "Cipher Algorithm" }, + { DE_TMSI_STAT, "TMSI Status" }, + { DE_DETACH_TYPE, "Detach Type" }, + { DE_DRX_PARAM, "DRX Parameter" }, + { DE_FORCE_TO_STAND, "Force to Standby" }, + { DE_FORCE_TO_STAND_H, "Force to Standby" }, + { DE_P_TMSI_SIG, "P-TMSI Signature" }, + { DE_P_TMSI_SIG_2, "P-TMSI Signature 2" }, + { DE_ID_TYPE_2, "Identity Type 2" }, + { DE_IMEISV_REQ, "IMEISV Request" }, + { DE_REC_N_PDU_NUM_LIST, "Receive N-PDU Numbers List" }, + { DE_MS_NET_CAP, "MS Network Capability" }, + { DE_MS_RAD_ACC_CAP, "MS Radio Access Capability" }, + { DE_GMM_CAUSE, "GMM Cause" }, + { DE_RAI, "Routing Area Identification" }, + { DE_RAI_2, "Routing Area Identification 2" }, + { DE_UPD_RES, "Update Result" }, + { DE_UPD_TYPE, "Update Type" }, + { DE_AC_REF_NUM, "A&C Reference Number" }, + { DE_AC_REF_NUM_H, "A&C Reference Number" }, + { DE_SRVC_TYPE, "Service Type" }, + { DE_CELL_NOT, "Cell Notification" }, + { DE_PS_LCS_CAP, "PS LCS Capability" }, + { DE_NET_FEAT_SUP, "Network Feature Support" }, + { DE_ADD_NET_FEAT_SUP, "Additional Network Feature Support" }, + { DE_RAT_INFO_CONTAINER, "Inter RAT information container" }, + { DE_REQ_MS_INFO, "Requested MS information" }, + { DE_UE_NETWORK_CAP, "UE network capability" }, + { DE_EUTRAN_IRAT_INFO_CONTAINER, "E-UTRAN inter RAT information container" }, + { DE_VOICE_DOMAIN_PREF, "Voice domain preference and UE's usage setting" }, + { DE_PTMSI_TYPE, "P-TMSI type" }, + { DE_LAI_2, "Location Area Identification 2" }, + { DE_NET_RES_ID_CONT, "Network resource identifier container" }, /* Session Management Information Elements 10.5.6 */ - { 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" }, + { DE_ACC_POINT_NAME, "Access Point Name" }, + { DE_NET_SAPI, "Network Service Access Point Identifier" }, + { DE_PRO_CONF_OPT, "Protocol Configuration Options" }, + { DE_PD_PRO_ADDR, "Packet Data Protocol Address" }, + { DE_QOS, "Quality Of Service" }, + { DE_SM_CAUSE, "SM Cause" }, + { DE_SM_CAUSE_2, "SM Cause 2" }, + { DE_LINKED_TI, "Linked TI" }, + { DE_LLC_SAPI, "LLC Service Access Point Identifier" }, + { DE_TEAR_DOWN_IND, "Tear Down Indicator" }, + { DE_PACKET_FLOW_ID, "Packet Flow Identifier" }, + { DE_TRAFFIC_FLOW_TEMPLATE, "Traffic Flow Template" }, + { DE_TMGI, "Temporary Mobile Group Identity (TMGI)" }, + { DE_MBMS_BEARER_CAP, "MBMS bearer capabilities" }, + { DE_MBMS_PROT_CONF_OPT, "MBMS protocol configuration options" }, + { DE_ENH_NSAPI, "Enhanced network service access point identifier" }, + { DE_REQ_TYPE, "Request type" }, + { DE_SM_NOTIF_IND, "Notification indicator" }, + { DE_SM_CONNECTIVITY_TYPE, "Connectivity type" }, /* GPRS Common Information Elements 10.5.7 */ - { 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"}, + { DE_PDP_CONTEXT_STAT, "PDP Context Status" }, + { DE_RAD_PRIO, "Radio Priority" }, + { DE_GPRS_TIMER, "GPRS Timer" }, + { DE_GPRS_TIMER_2, "GPRS Timer 2" }, + { DE_GPRS_TIMER_3, "GPRS Timer 3" }, + { DE_RAD_PRIO_2, "Radio Priority 2"}, + { DE_MBMS_CTX_STATUS, "MBMS context status"}, + { DE_UPLINK_DATA_STATUS, "Uplink data status"}, + { DE_DEVICE_PROPERTIES, "Device properties"}, { 0, NULL } }; @@ -1151,13 +1150,13 @@ de_gmm_ms_net_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o curr_len--; \ curr_offset++; \ if (bits_in_oct != 0) \ - add_ocetets = 1; \ + add_octets = 1; \ else \ - add_ocetets = 0; \ + add_octets = 0; \ bits_in_oct += 8; \ } \ else \ - add_ocetets = 0; + add_octets = 0; /* Access Technology Type */ @@ -1345,7 +1344,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui guchar bits_in_oct; guchar bits_needed; guint bits_length; - guint add_ocetets; /* octets which are covered by one element -1 */ + guint add_octets; /* octets which are covered by one element -1 */ guint curr_bits_length; guchar acc_type; guint value; @@ -1457,7 +1456,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui } proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "Presence: %s (%u)", str, oct>>(32-bits_needed)); bit_offset++; curr_bits_length -= bits_needed; @@ -1554,7 +1553,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui /* decode_bits_in_field(gint bit_offset, gint no_of_bits, guint64 value)*/ proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "%s RF Power Capability, GMSK Power Class: %s (%u)", decode_bits_in_field(bit_offset, 3, value), str, value); bit_offset += 3; curr_bits_length -= bits_needed; @@ -1579,7 +1578,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui } proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "8PSK Power Class: %s (%u)", str, value); bit_offset += 2; curr_bits_length -= bits_needed; @@ -1634,7 +1633,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui str = "Not specified??"; proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "%s RF Power Capability, GMSK Power Class: %s (%u)", decode_bits_in_field(bit_offset, 3, value), str, value); bit_offset += 3; @@ -1652,7 +1651,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "A5 Bits: Same values apply for parameters as in the immediately preceding Access capabilities field within this IE (%u)", oct>>(32-bits_needed)); bit_offset++; @@ -1665,7 +1664,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui int i; proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "A5 Bits: A5 bits follow (%u)", oct>>(32-bits_needed)); bit_offset++; @@ -1690,7 +1689,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui } proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "A5/%d: %s (%u)", i, str, oct>>(32-bits_needed)); bit_offset++; curr_bits_length -= bits_needed; @@ -1776,7 +1775,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(mc_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "HSCSD multislot class: Bits are not available (%u)", oct>>(32-bits_needed)); bit_offset++; curr_bits_length -= bits_needed; @@ -1813,7 +1812,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(mc_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "GPRS multislot class: Bits are not available (%u)", oct>>(32-bits_needed)); bit_offset++; curr_bits_length -= bits_needed; @@ -1862,7 +1861,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(mc_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "SMS/SM values: Bits are not available (%u)", oct>>(32-bits_needed)); bit_offset++; curr_bits_length -= bits_needed; @@ -1913,7 +1912,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(mc_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "ECSD multislot class: Bits are not available (%u)", oct>>(32-bits_needed)); bit_offset++; curr_bits_length -= bits_needed; @@ -1950,7 +1949,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(mc_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "EGPRS multislot class: Bits are not available (%u)", oct>>(32-bits_needed)); curr_bits_length -= bits_needed; oct <<= bits_needed; @@ -1999,7 +1998,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(mc_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "DTM GPRS Multi Slot Class: Bits are not available (%u)", oct>>(32-bits_needed)); bit_offset++; curr_bits_length -= bits_needed; @@ -2103,7 +2102,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui } proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "8PSK Power Capability: %s (%u)", str, oct>>(32-bits_needed)); bit_offset += 2; curr_bits_length -= bits_needed; @@ -2206,7 +2205,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "Extended DTM (E)GPRS Multi Slot Class: Bits are not available (%u)", oct>>(32-bits_needed)); curr_bits_length -= bits_needed; oct <<= bits_needed; @@ -2249,7 +2248,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui } proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "Extended DTM GPRS Multi Slot Class: %s (%u)", str, oct>>(32-bits_needed)); bit_offset += 2; curr_bits_length -= bits_needed; @@ -2287,7 +2286,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui } proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "Extended DTM EGPRS Multi Slot Class: %s (%u)", str, oct>>(32-bits_needed)); bit_offset += 2; curr_bits_length -= bits_needed; @@ -2318,7 +2317,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui if ((oct>>(32-bits_needed)) == 0) { proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "High Multislot Capability: Bits are not available (%u)", oct>>(32-bits_needed)); bit_offset++; curr_bits_length -= bits_needed; @@ -2340,7 +2339,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui /* analyse bits */ proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "High Multislot Capability: 0x%02x (%u)" " - This field effect all other multislot fields." " To understand the value please read TS 24.008 5.6.0" @@ -2414,7 +2413,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui } proto_tree_add_text(tf_tree, - tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + tvb, curr_offset-1-add_octets, 1+add_octets, "GMSK Multislot Power Profile: %s (%u)", str, oct>>(32-bits_needed)); bit_offset += 2; curr_bits_length -= bits_needed; @@ -2437,7 +2436,7 @@ de_gmm_ms_radio_acc_cap(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gui default: str = "This should not happen"; } - proto_tree_add_text(tf_tree, tvb, curr_offset-1-add_ocetets, 1+add_ocetets, + proto_tree_add_text(tf_tree, tvb, curr_offset-1-add_octets, 1+add_octets, "8-PSK Multislot Power Profile: %s (%u)", str, oct>>(32-bits_needed)); bit_offset += 2; curr_bits_length -= bits_needed; diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c index 7c3ab70754..04d0e48f2b 100644 --- a/epan/dissectors/packet-gsm_a_rp.c +++ b/epan/dissectors/packet-gsm_a_rp.c @@ -55,13 +55,25 @@ static const value_string gsm_rp_msg_strings[] = { { 0, NULL } }; +typedef enum +{ + /* Short Message Service Information Elements [5] 8.2 */ + DE_RP_MESSAGE_REF, /* RP-Message Reference */ + DE_RP_ORIG_ADDR, /* RP-Originator Address */ + DE_RP_DEST_ADDR, /* RP-Destination Address */ + DE_RP_USER_DATA, /* RP-User Data */ + DE_RP_CAUSE, /* RP-Cause */ + DE_RP_NONE /* NONE */ +} +rp_elem_idx_t; + const value_string gsm_rp_elem_strings[] = { /* Short Message Service RP Information Elements [5] 8.2 */ - { 0x00, "RP-Message Reference" }, - { 0x01, "RP-Originator Address" }, - { 0x02, "RP-Destination Address" }, - { 0x03, "RP-User Data" }, - { 0x04, "RP-Cause" }, + { DE_RP_MESSAGE_REF, "RP-Message Reference" }, + { DE_RP_ORIG_ADDR, "RP-Originator Address" }, + { DE_RP_DEST_ADDR, "RP-Destination Address" }, + { DE_RP_USER_DATA, "RP-User Data" }, + { DE_RP_CAUSE, "RP-Cause" }, { 0, NULL } }; @@ -80,18 +92,6 @@ static dissector_table_t sms_dissector_table; /* SMS TPDU */ static proto_tree *g_tree; -typedef enum -{ - /* Short Message Service Information Elements [5] 8.2 */ - DE_RP_MESSAGE_REF, /* RP-Message Reference */ - DE_RP_ORIG_ADDR, /* RP-Originator Address */ - DE_RP_DEST_ADDR, /* RP-Destination Address */ - DE_RP_USER_DATA, /* RP-User Data */ - DE_RP_CAUSE, /* RP-Cause */ - DE_RP_NONE /* NONE */ -} -rp_elem_idx_t; - #define NUM_GSM_RP_ELEM (sizeof(gsm_rp_elem_strings)/sizeof(value_string)) gint ett_gsm_rp_elem[NUM_GSM_RP_ELEM]; diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 5a017abff5..f62e4b450d 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -174,92 +174,92 @@ 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 */ - { 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 */ + { DE_RR_BA_RANGE, "BA Range" }, /* [3] 10.5.2.1a BA Range */ + { DE_RR_CELL_CH_DSC, "Cell Channel Description" }, /* [3] 10.5.2.1b */ + { DE_RR_BA_LIST_PREF, "BA List Pref" }, /* [3] 10.5.2.1c BA List Pref */ + { DE_RR_UTRAN_FREQ_LIST, "UTRAN Frequency List" }, /* [3] 10.5.2.1d UTRAN Frequency List */ + { DE_RR_CELL_SELECT_INDIC, "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 */ + { DE_RR_CELL_DSC, "Cell Description" }, /* 10.5.2.2 */ + { DE_RR_CELL_OPT_BCCH, "Cell Options (BCCH)" }, /* [3] 10.5.2.3 Cell Options (BCCH) */ + { DE_RR_CELL_OPT_SACCH, "Cell Options (SACCH)" }, /* [3] 10.5.2.3a Cell Options (SACCH) */ + { DE_RR_CELL_SEL_PARAM, "Cell Selection Parameters" }, /* [3] 10.5.2.4 Cell Selection Parameters */ /* [3] 10.5.2.4a (void) */ - { 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 */ + { DE_RR_CH_DSC, "Channel Description" }, /* 10.5.2.5 */ + { DE_RR_CH_DSC2, "Channel Description 2" }, /* 10.5.2.5a */ + { DE_RR_CH_DSC3, "Channel Description 3" }, /* 10.5.2.5c */ + { DE_RR_CH_MODE, "Channel Mode" }, /* [3] 10.5.2.6 */ + { DE_RR_CH_MODE2, "Channel Mode 2" }, /* [3] 10.5.2.7 */ + { DE_RR_UTRAN_CM, "UTRAN Classmark" }, /* [3] 10.5.2.7a */ /* [3] 10.5.2.7b (void) */ - { 0x0f, "Classmark Enquiry Mask" }, /* [3] 10.5.2.7c */ + { DE_RR_CM_ENQ_MASK, "Classmark Enquiry Mask" }, /* [3] 10.5.2.7c */ /* [3] 10.5.2.7d GERAN Iu Mode Classmark information element */ - { 0x10, "Channel Needed"}, /* [3] 10.5.2.8 */ + { DE_RR_CHNL_NEEDED, "Channel Needed"}, /* [3] 10.5.2.8 */ /* [3] 10.5.2.8a (void) */ - { 0x11, "Channel Request Description 2"}, /* [3] 10.5.2.8b Channel Request Description 2 */ + { DE_RR_CHNL_REQ_DESC2, "Channel Request Description 2"}, /* [3] 10.5.2.8b Channel Request Description 2 */ /* Pos 20 */ - { 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 */ + { DE_RR_CIP_MODE_SET, "Cipher Mode Setting" }, /* [3] 10.5.2.9 */ + { DE_RR_CIP_MODE_RESP, "Cipher Mode Response" }, /* [3] 10.5.2.10 */ + { DE_RR_CTRL_CH_DESC, "Control Channel Description" }, /* [3] 10.5.2.11 Control Channel Description */ + { DE_RR_DTM_INFO_DETAILS, "DTM Information Details" }, /* [3] 10.5.2.11a DTM Information Details */ + { DE_RR_DYN_ARFCN_MAP, "Dynamic ARFCN Mapping" }, /* [3] 10.5.2.11b */ + { DE_RR_FREQ_CH_SEQ, "Frequency Channel Sequence" }, /* [3] 10.5.2.12 */ + { DE_RR_FREQ_LIST, "Frequency List" }, /* 10.5.2.13 */ + { DE_RR_FREQ_SHORT_LIST, "Frequency Short List" }, /* 10.5.2.14 */ + { DE_RR_FREQ_SHORT_LIST2, "Frequency Short List 2" }, /* 10.5.2.14a */ /* [3] 10.5.2.14b Group Channel Description */ - { 0x1b, "GPRS Resumption" }, /* [3] 10.5.2.14c GPRS Resumption */ - { 0x1c, "GPRS Broadcast Information" }, /* [3] 10.5.2.14d GPRS broadcast information */ + { DE_RR_GPRS_RESUMPTION, "GPRS Resumption" }, /* [3] 10.5.2.14c GPRS Resumption */ + { DE_RR_GPRS_BROADCAST_INFORMATION, "GPRS Broadcast Information" }, /* [3] 10.5.2.14d GPRS broadcast information */ /* [3] 10.5.2.14e Enhanced DTM CS Release Indication */ - { 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 */ + { DE_RR_HO_REF, "Handover Reference" }, /* 10.5.2.15 */ + { DE_RR_IA_REST_OCT, "IA Rest Octets" }, /* [3] 10.5.2.16 */ + { DE_RR_IAR_REST_OCT, "IAR Rest Octets" }, /* [3] 10.5.2.17 IAR Rest Octets */ + { DE_RR_IAX_REST_OCT, "IAX Rest Octets" }, /* [3] 10.5.2.18 IAX Rest Octets */ + { DE_RR_L2_PSEUDO_LEN, "L2 Pseudo Length" }, /* [3] 10.5.2.19 */ + { DE_RR_MEAS_RES, "Measurement Results" }, /* [3] 10.5.2.20 Measurement Results */ /* * [3] 10.5.2.20a GPRS Measurement Results */ - { 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 */ + { DE_RR_MOB_ALL, "Mobile Allocation" }, /* [3] 10.5.2.21 */ + { DE_RR_MOB_TIME_DIFF, "Mobile Time Difference" }, /* [3] 10.5.2.21a */ + { DE_RR_MULTIRATE_CONF, "MultiRate configuration" }, /* [3] 10.5.2.21aa */ /* Pos 30 */ - { 0x26, "Multislot Allocation" }, /* [3] 10.5.2.21b */ + { DE_RR_MULT_ALL, "Multislot Allocation" }, /* [3] 10.5.2.21b */ /* * [3] 10.5.2.21c NC mode */ - { 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 */ + { DE_RR_NEIGH_CELL_DESC, "Neighbour Cell Description" }, /* [3] 10.5.2.22 Neighbour Cell Description */ + { DE_RR_NEIGH_CELL_DESC2, "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 */ - { 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 */ + { DE_RR_P1_REST_OCT, "P1 Rest Octets" }, /* [3] 10.5.2.23 P1 Rest Octets */ + { DE_RR_P2_REST_OCT, "P2 Rest Octets" }, /* [3] 10.5.2.24 P2 Rest Octets */ + { DE_RR_P3_REST_OCT, "P3 Rest Octets" }, /* [3] 10.5.2.25 P3 Rest Octets */ + { DE_RR_PACKET_CH_DESC, "Packet Channel Description" }, /* [3] 10.5.2.25a */ + { DE_RR_DED_MOD_OR_TBF, "Dedicated mode or TBF" }, /* [3] 10.5.2.25b */ + { DE_RR_PKT_UL_ASS, "Packet Uplink Assignment" }, /* [3] 10.5.2.25c RR Packet Uplink Assignment */ + { DE_RR_PKT_DL_ASS, "Packet Downlink Assignment" }, /* [3] 10.5.2.25d RR Packet Downlink Assignment */ + { DE_RR_PKT_DL_ASS_TYPE2, "Packet Downlink Assignment Type 2" }, /* [3] 110.5.2.25e RR Packet Downlink Assignment Type 2 */ + { DE_RR_PAGE_MODE, "Page Mode" }, /* [3] 10.5.2.26 */ + { DE_RR_NCC_PERM, "NCC Permitted" }, /* [3] 10.5.2.27 NCC Permitted */ + { DE_RR_POW_CMD, "Power Command" }, /* 10.5.2.28 */ + { DE_RR_POW_CMD_AND_ACC_TYPE, "Power Command and access type" }, /* 10.5.2.28a */ + { DE_RR_RACH_CTRL_PARAM, "RACH Control Parameters" }, /* [3] 10.5.2.29 RACH Control Parameters */ + { DE_RR_REQ_REF, "Request Reference" }, /* [3] 10.5.2.30 Request Reference */ + { DE_RR_CAUSE, "RR Cause" }, /* 10.5.2.31 */ + { DE_RR_SYNC_IND, "Synchronization Indication" }, /* 10.5.2.39 */ + { DE_RR_SI1_REST_OCT, "SI 1 Rest Octets" }, /* [3] 10.5.2.32 */ /* [3] 10.5.2.33 SI 2bis Rest Octets */ - { 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 */ + { DE_RR_SI2TER_REST_OCT, "SI 2ter Rest Octets" }, /* [3] 10.5.2.33a */ + { DE_RR_SI2QUATER_REST_OCT, "SI 2quater Rest Octets" }, /* [3] 10.5.2.33b */ + { DE_RR_SI3_REST_OCT, "SI 3 Rest Octets" }, /* [3] 10.5.2.34 */ + { DE_RR_SI4_REST_OCT, "SI 4 Rest Octets" }, /* [3] 10.5.2.35 */ + { DE_RR_SI6_REST_OCT, "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 */ - { 0x3f, "SI 13 Rest Octets" }, /* [3] 10.5.2.37b */ + { DE_RR_SI13_REST_OCT, "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 */ - { 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 */ + { DE_RR_STARTING_TIME, "Starting Time" }, /* [3] 10.5.2.38 Starting Time */ + { DE_RR_TIMING_ADV, "Timing Advance" }, /* [3] 10.5.2.40 Timing Advance */ + { DE_RR_TIME_DIFF, "Time Difference" }, /* [3] 10.5.2.41 Time Difference */ + { DE_RR_TLLI, "TLLI" }, /* [3] 10.5.2.41a TLLI */ + { DE_RR_TMSI_PTMSI, "TMSI/P-TMSI" }, /* [3] 10.5.2.42 TMSI/P-TMSI */ + { DE_RR_VGCS_TAR_MODE_IND, "VGCS target mode Indication" }, /* [3] 10.5.2.42a */ /* Pos 40 */ - { 0x46, "VGCS Ciphering Parameters" }, /* [3] 10.5.2.42b */ - { 0x47, "Wait Indication" }, /* [3] 10.5.2.43 Wait Indication */ + { DE_RR_VGCS_CIP_PAR, "VGCS Ciphering Parameters" }, /* [3] 10.5.2.42b */ + { DE_RR_WAIT_IND, "Wait Indication" }, /* [3] 10.5.2.43 Wait Indication */ /* [3] 10.5.2.44 SI10 rest octets $(ASCI)$ */ - { 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 */ + { DE_RR_EXT_MEAS_RESULT, "Extended Measurement Results" }, /* [3] 10.5.2.45 Extended Measurement Results */ + { DE_RR_EXT_MEAS_FREQ_LIST, "Extended Measurement Frequency List" },/* [3] 10.5.2.46 Extended Measurement Frequency List */ + { DE_RR_SUS_CAU, "Suspension Cause" }, /* [3] 10.5.2.47 */ + { DE_RR_APDU_ID, "APDU ID" }, /* [3] 10.5.2.48 APDU ID */ + { DE_RR_APDU_FLAGS, "APDU Flags" }, /* [3] 10.5.2.49 APDU Flags */ + { DE_RR_APDU_DATA, "APDU Data" }, /* [3] 10.5.2.50 APDU Data */ + { DE_RR_HO_TO_UTRAN_CMD, "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 */ - { 0x4f, "Service Support" }, /* [3] 10.5.2.57 */ + { DE_RR_SERV_SUP, "Service Support" }, /* [3] 10.5.2.57 */ /* 10.5.2.58 MBMS p-t-m Channel Description */ - { 0x50, "Dedicated Service Information" }, /* [3] 10.5.2.59 */ + { DE_RR_DED_SERV_INF, "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 */ - { 0x51, "Carrier Indication" }, /* 10.5.2.69 Carrier Indication */ + { DE_RR_CARRIER_IND, "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 c5002b27ba..5bb463ea0d 100644 --- a/epan/dissectors/packet-gsm_bsslap.c +++ b/epan/dissectors/packet-gsm_bsslap.c @@ -87,38 +87,37 @@ static int ett_bsslap_cell_list = -1; #define BSSLAP_PARAM_STARTING_TIME 0x2D const value_string gsm_bsslap_elem_strings[] = { - { 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" }, + { DE_BLAP_RES1, "Reserved" }, + { DE_BLAP_TA, "Timing Advance" }, + { DE_BLAP_RES3, "Reserved" }, /* (note) */ + { DE_BLAP_RES4, "Cell Identity" }, + { DE_BLAP_RES5, "Reserved" }, /* (note) */ + { DE_BLAP_RES6, "Reserved" }, /* (note) */ + { DE_BLAP_RES7, "Reserved" }, /* (note) */ + { DE_BLAP_CH_DESC, "Channel Description" }, + { DE_BLAP_RES9, "Reserved" }, /* (note) */ + { DE_BLAP_RES10, "Reserved" }, /* (note) */ + { DE_BLAP_RES11, "Reserved" }, /* (note) */ + { DE_BLAP_MEAS_REP, "Measurement Report" }, + { DE_BLAP_RES13, "Reserved" }, /* (note) */ + { DE_BLAP_CAUSE, "Cause" }, + { DE_BLAP_RRLP_FLG, "RRLP Flag" }, + { DE_BLAP_RRLP_IE, "RRLP IE" }, + { DE_BLAP_CELL_ID_LIST, "Cell Identity List" }, + { DE_BLAP_ENH_MEAS_REP, "Enhanced Measurement Report" }, + { DE_BLAP_LAC, "Location Area Code" }, + { DE_BLAP_FREQ_LIST, "Frequency List" }, + { DE_BLAP_MS_POW, "MS Power" }, + { DE_BLAP_DELTA_TIME, "Delta Timer" }, + { DE_BLAP_SERV_CELL_ID, "Serving Cell Identifier" }, + { DE_BLAP_ENC_KEY, "Encryption Key (Kc)" }, + { DE_BLAP_CIP_M_SET, "Cipher Mode Setting" }, + { DE_BLAP_CH_MODE, "Channel Mode" }, + { DE_BLAP_POLL_REP, "Polling Repetition" }, + { DE_BLAP_PKT_CH_DESC, "Packet Channel Description" }, + { DE_BLAP_TLLI, "TLLI" }, + { DE_BLAP_TFI, "TFI" }, + { DE_BLAP_START_TIME, "Starting Time" }, { 0, NULL }, }; diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c index f2fc5ad2d6..7ad3bcf7d4 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[] = { - { 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" }, + { DE_BMAPLE_LCSQOS, "LCS QoS" }, + { DE_BMAPLE_LCS_PRIO, "LCS Priority" }, + { DE_BMAPLE_LOC_TYPE, "Location Type" }, + { DE_BMAPLE_GANSS_LOC_TYPE, "GANSS Location Type" }, + { DE_BMAPLE_GEO_LOC, "Geographic Location" }, + { DE_BMAPLE_POS_DATA, "Positioning Data" }, + { DE_BMAPLE_GANSS_POS_DATA, "GANSS Positioning Data" }, + { DE_BMAPLE_VELOC_DATA, "Velocity Data" }, + { DE_BMAPLE_LCS_CAUSE, "LCS Cause" }, + { DE_BMAPLE_LCS_CLIENT_TYPE, "LCS Client Type" }, + { DE_BMAPLE_APDU, "APDU" }, + { DE_BMAPLE_NETWORK_ELEM_ID, "Network Element Identity" }, + { DE_BMAPLE_REQ_GPS_ASSIST_D, "Requested GPS Assistance Data" }, + { DE_BMAPLE_REQ_GNSS_ASSIST_D, "Requested GANSS Assistance Data" }, + { DE_BMAPLE_DECIPH_KEYS, "Deciphering Keys" }, + { DE_BMAPLE_RETURN_ERROR_REQ, "Return Error Request" }, + { DE_BMAPLE_RETURN_ERROR_CAUSE, "Return Error Cause" }, + { DE_BMAPLE_SEGMENTATION, "Segmentation" }, + { DE_BMAPLE_CLASSMARK_TYPE_3, "Classmark Information Type 3" }, + { DE_BMAPLE_CAUSE, "Cause" }, + { DE_BMAPLE_CELL_IDENTIFIER, "Cell Identifier" }, + { DE_BMAPLE_CHOSEN_CHANNEL, "Chosen Channel" }, + { DE_BMAPLE_IMSI, "IMSI" }, + { DE_BMAPLE_RES1, "Reserved" }, + { DE_BMAPLE_RES2, "Reserved" }, + { DE_BMAPLE_RES3, "Reserved" }, + { DE_BMAPLE_LCS_CAPABILITY, "LCS Capability" }, + { DE_BMAPLE_PACKET_MEAS_REP, "Packet Measurement Report" }, + { DE_BMAPLE_MEAS_CELL_ID, "Cell Identity List" }, + { DE_BMAPLE_IMEI, "IMEI" }, { 0, NULL } }; diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index ed477ef633..4d3a5fae46 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -316,19 +316,37 @@ static const value_string security_header_type_vals[] = { }; static value_string_ext security_header_type_vals_ext = VALUE_STRING_EXT_INIT(security_header_type_vals); +typedef enum +{ + DE_EPS_CMN_ADD_INFO, /* 9.9.2.0 Additional information */ + DE_EPS_CMN_DEVICE_PROPERTIES, /* 9.9.2.0A Device properties */ + DE_EPS_CMN_EPS_BE_CTX_STATUS, /* 9.9.2.1 EPS bearer context status */ + DE_EPS_CMN_LOC_AREA_ID, /* 9.9.2.2 Location area identification */ + DE_EPS_CMN_MOB_ID, /* 9.9.2.3 Mobile identity */ + DE_EPS_MS_CM_2, /* 9.9.2.4 Mobile station classmark 2 */ + DE_EPS_MS_CM_3, /* 9.9.2.5 Mobile station classmark 3 */ + DE_EPS_NAS_SEC_PAR_FROM_EUTRA, /* 9.9.2.6 NAS security parameters from E-UTRA */ + DE_EPS_NAS_SEC_PAR_TO_EUTRA, /* 9.9.2.7 NAS security parameters to E-UTRA */ + + DE_EPS_CMN_PLM_LST, /* 9.9.2.8 PLMN list */ + DE_EPS_CMN_SUP_CODEC_LST, /* 9.9.2.6 9.9.2.10 Supported codec list */ + DE_EPS_COMMON_NONE /* NONE */ +} +nas_eps_common_elem_idx_t; + const value_string nas_eps_common_elem_strings[] = { - { 0x00, "Additional information" }, /* 9.9.2.0 Additional information */ - { 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 */ - { 0x0a, "Supported codec list" }, /* 9.9.2.10 Supported codec list */ + { DE_EPS_CMN_ADD_INFO, "Additional information" }, /* 9.9.2.0 Additional information */ + { DE_EPS_CMN_DEVICE_PROPERTIES, "Device properties" }, /* 9.9.2.0A Device properties */ + { DE_EPS_CMN_EPS_BE_CTX_STATUS, "EPS bearer context status" }, /* 9.9.2.1 EPS bearer context status */ + { DE_EPS_CMN_LOC_AREA_ID, "Location area identification" }, /* 9.9.2.2 Location area identification */ + { DE_EPS_CMN_MOB_ID, "Mobile identity" }, /* 9.9.2.3 Mobile identity */ + { DE_EPS_MS_CM_2, "Mobile station classmark 2" }, /* 9.9.2.4 Mobile station classmark 2 */ + { DE_EPS_MS_CM_3, "Mobile station classmark 3" }, /* 9.9.2.5 Mobile station classmark 3 */ + { DE_EPS_NAS_SEC_PAR_FROM_EUTRA, "NAS security parameters from E-UTRA" },/* 9.9.2.6 NAS security parameters from E-UTRA */ + { DE_EPS_NAS_SEC_PAR_TO_EUTRA, "NAS security parameters to E-UTRA" }, /* 9.9.2.7 NAS security parameters to E-UTRA */ + { DE_EPS_CMN_PLM_LST, "PLMN list" }, /* 9.9.2.8 PLMN list */ + /* 9.9.2.9 Spare half octet */ + { DE_EPS_CMN_SUP_CODEC_LST, "Supported codec list" }, /* 9.9.2.10 Supported codec list */ { 0, NULL } }; @@ -390,24 +408,6 @@ calc_bitrate_ext2(guint8 value) { #define NUM_NAS_EPS_COMMON_ELEM (sizeof(nas_eps_common_elem_strings)/sizeof(value_string)) gint ett_nas_eps_common_elem[NUM_NAS_EPS_COMMON_ELEM]; -typedef enum -{ - DE_EPS_CMN_ADD_INFO, /* 9.9.2.0 Additional information */ - DE_EPS_CMN_DEVICE_PROPERTIES, /* 9.9.2.0A Device properties */ - DE_EPS_CMN_EPS_BE_CTX_STATUS, /* 9.9.2.1 EPS bearer context status */ - DE_EPS_CMN_LOC_AREA_ID, /* 9.9.2.2 Location area identification */ - DE_EPS_CMN_MOB_ID, /* 9.9.2.3 Mobile identity */ - DE_EPS_MS_CM_2, /* 9.9.2.4 Mobile station classmark 2 */ - DE_EPS_MS_CM_3, /* 9.9.2.5 Mobile station classmark 3 */ - DE_EPS_NAS_SEC_PAR_FROM_EUTRA, /* 9.9.2.6 NAS security parameters from E-UTRA */ - DE_EPS_NAS_SEC_PAR_TO_EUTRA, /* 9.9.2.7 NAS security parameters to E-UTRA */ - - DE_EPS_CMN_PLM_LST, /* 9.9.2.8 PLMN list */ - DE_EPS_CMN_SUP_CODEC_LST, /* 9.9.2.6 9.9.2.10 Supported codec list */ - DE_EPS_COMMON_NONE /* NONE */ -} -nas_eps_common_elem_idx_t; - /* * 9.9.2 Common information elements */ @@ -602,58 +602,58 @@ 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 */ - { 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 */ + { DE_EMM_ADD_UPD_RES, "Additional update result" }, /* 9.9.3.0A Additional update result */ + { DE_EMM_ADD_UPD_TYPE, "Additional update type" }, /* 9.9.3.0B Additional update type */ + { DE_EMM_AUTH_FAIL_PAR, "Authentication failure parameter" }, /* 9.9.3.1 Authentication failure parameter */ + { DE_EMM_AUTN, "Authentication parameter AUTN" }, /* 9.9.3.2 Authentication parameter AUTN */ + { DE_EMM_AUTH_PAR_RAND, "Authentication parameter RAND" }, /* 9.9.3.3 Authentication parameter RAND */ + { DE_EMM_AUTH_RESP_PAR, "Authentication response parameter" }, /* 9.9.3.4 Authentication response parameter */ + { DE_EMM_CSFB_RESP, "CSFB response" }, /* 9.9.3.5 CSFB response */ + { DE_EMM_DAYL_SAV_T, "Daylight saving time" }, /* 9.9.3.6 Daylight saving time */ + { DE_EMM_DET_TYPE, "Detach type" }, /* 9.9.3.7 Detach type */ + { DE_EMM_DRX_PAR, "DRX parameter" }, /* 9.9.3.8 DRX parameter */ + { DE_EMM_CAUSE, "EMM cause" }, /* 9.9.3.9 EMM cause */ + { DE_EMM_ATT_RES, "EPS attach result" }, /* 9.9.3.10 EPS attach result */ + { DE_EMM_ATT_TYPE, "EPS attach type" }, /* 9.9.3.11 EPS attach type */ + { DE_EMM_EPS_MID, "EPS mobile identity" }, /* 9.9.3.12 EPS mobile identity */ + { DE_EMM_EPS_NET_FEATURE_SUP, "EPS network feature support" }, /* 9.9.3.12A EPS network feature support */ + { DE_EMM_EPS_UPD_RES, "EPS update result" }, /* 9.9.3.13 EPS update result */ + { DE_EMM_EPS_UPD_TYPE, "EPS update type" }, /* 9.9.3.14 EPS update type */ + { DE_EMM_ESM_MSG_CONT, "ESM message container" }, /* 9.9.3.15 ESM message conta */ + { DE_EMM_GPRS_TIMER, "GPRS timer" }, /* 9.9.3.16 GPRS timer ,See subclause 10.5.7.3 in 3GPP TS 24.008 [6]. */ + { DE_EMM_GPRS_TIMER_2, "GPRS timer 2" }, /* 9.9.3.16A GPRS timer 2, See subclause 10.5.7.4 in 3GPP TS 24.008. */ + { DE_EMM_GPRS_TIMER_3, "GPRS timer 3" }, /* 9.9.3.16B GPRS timer 3, See subclause 10.5.7.4a in 3GPP TS 24.008. */ + { DE_EMM_ID_TYPE_2, "Identity type 2" }, /* 9.9.3.17 Identity type 2 ,See subclause 10.5.5.9 in 3GPP TS 24.008 [6]. */ + { DE_EMM_IMEISV_REQ, "IMEISV request" }, /* 9.9.3.18 IMEISV request ,See subclause 10.5.5.10 in 3GPP TS 24.008 [6]. */ + { DE_EMM_KSI_AND_SEQ_NO, "KSI and sequence number" }, /* 9.9.3.19 KSI and sequence number */ + { DE_EMM_MS_NET_CAP, "MS network capability" }, /* 9.9.3.20 MS network capability ,See subclause 10.5.5.12 in 3GPP TS 24.008 [6]. */ + { DE_EMM_MS_NET_FEAT_SUP, "MS network feature support" }, /* 9.9.3.20A MS network feature support, See subclause 10.5.1.15 in 3GPP TS 24.008. */ + { DE_EMM_NAS_KEY_SET_ID, "NAS key set identifier" }, /* 9.9.3.21 NAS key set identifier */ + { DE_EMM_NAS_MSG_CONT, "NAS message container" }, /* 9.9.3.22 NAS message container */ + { DE_EMM_NAS_SEC_ALGS, "NAS security algorithms" }, /* 9.9.3.23 NAS security algorithms */ + { DE_EMM_NET_NAME, "Network name" }, /* 9.9.3.24 Network name, See subclause 10.5.3.5a in 3GPP TS 24.008 [6]. */ + { DE_EMM_NONCE, "Nonce" }, /* 9.9.3.25 Nonce */ + { DE_EMM_PAGING_ID, "Paging identity" }, /* 9.9.3.25A Paging identity */ + { DE_EMM_P_TMSI_SIGN, "P-TMSI signature" }, /* 9.9.3.26 P-TMSI signature, See subclause 10.5.5.8 in 3GPP TS 24.008 [6]. */ + { DE_EMM_SERV_TYPE, "Service type" }, /* 9.9.3.27 Service type ,See subclause 10.5.5.15 in 3GPP TS 24.008 [6]. */ + { DE_EMM_SHORT_MAC, "Short MAC" }, /* 9.9.3.28 Short MAC */ + { DE_EMM_TZ, "Time zone" }, /* 9.9.3.29 Time zone, See subclause 10.5.3.8 in 3GPP TS 24.008 [6]. */ + { DE_EMM_TZ_AND_T, "Time zone and time" }, /* 9.9.3.30 Time zone and time, See subclause 10.5.3.9 in 3GPP TS 24.008 [6]. */ + { DE_EMM_TMSI_STAT, "TMSI status" }, /* 9.9.3.31 TMSI status, See subclause 10.5.5.4 in 3GPP TS 24.008 [6]. */ + { DE_EMM_TRAC_AREA_ID, "Tracking area identity" }, /* 9.9.3.32 Tracking area identity */ + { DE_EMM_TRAC_AREA_ID_LST, "Tracking area identity list" }, /* 9.9.3.33 Tracking area identity list */ + { DE_EMM_UE_NET_CAP, "UE network capability" }, /* 9.9.3.34 UE network capability */ + { DE_EMM_UE_RA_CAP_INF_UPD_NEED, "UE radio capability information update needed" },/* 9.9.3.35 UE radio capability information update needed */ + { DE_EMM_UE_SEC_CAP, "UE security capability" }, /* 9.9.3.36 UE security capability */ + { DE_EMM_EMERG_NUM_LST, "Emergency Number List" }, /* 9.9.3.37 Emergency Number List */ + { DE_EMM_CLI, "CLI" }, /* 9.9.3.38 CLI */ + { DE_EMM_SS_CODE, "SS Code" }, /* 9.9.3.39 SS Code */ + { DE_EMM_LCS_IND, "LCS indicator" }, /* 9.9.3.40 LCS indicator */ + { DE_EMM_LCS_CLIENT_ID, "LCS client identity" }, /* 9.9.3.41 LCS client identity */ + { DE_EMM_GEN_MSG_CONT_TYPE, "Generic message container type" }, /* 9.9.3.42 Generic message container type */ + { DE_EMM_GEN_MSG_CONT, "Generic message container" }, /* 9.9.3.43 Generic message container */ + { DE_EMM_VOICE_DMN_PREF, "Voice domain preference and UEs usage setting" },/* 9.9.3.44 Voice domain preference and UEs usage setting */ + { DE_EMM_GUTI_TYPE, "GUTI type" }, /* 9.9.3.45 GUTI type */ { 0, NULL } }; #define NUM_NAS_EMM_ELEM (sizeof(nas_emm_elem_strings)/sizeof(value_string)) @@ -2800,33 +2800,6 @@ 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 */ - { 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 } -}; - - -#define NUM_NAS_ESM_ELEM (sizeof(nas_esm_elem_strings)/sizeof(value_string)) -gint ett_nas_eps_esm_elem[NUM_NAS_ESM_ELEM]; - typedef enum { DE_ESM_APN, /* 9.9.4.1 Access point name */ @@ -2850,9 +2823,35 @@ typedef enum DE_ESM_TID, /* 9.9.4.17 Transaction identifier */ DE_ESM_NONE /* NONE */ } - nas_esm_elem_idx_t; +const value_string nas_esm_elem_strings[] = { + { DE_ESM_APN, "Access point name" }, /* 9.9.4.1 Access point name */ + { DE_ESM_APN_AGR_MAX_BR, "APN aggregate maximum bit rate" }, /* 9.9.4.2 APN aggregate maximum bit rate */ + { DE_ESM_CONNECTIVITY_TYPE, "Connectivity type" }, /* 9.9.4.2A Connectivity type */ + { DE_ESM_EPS_QOS, "EPS quality of service" }, /* 9.9.4.3 EPS quality of service */ + { DE_ESM_CAUSE, "ESM cause" }, /* 9.9.4.4 ESM cause */ + { DE_ESM_INF_TRF_FLG, "ESM information transfer flag" }, /* 9.9.4.5 ESM information transfer flag */ + { DE_ESM_LNKED_EPS_B_ID, "Linked EPS bearer identity" }, /* 9.9.4.6 Linked EPS bearer identity */ + { DE_ESM_LLC_SAPI, "LLC service access point identifier" }, /* 9.9.4.7 LLC service access point identifier */ + { DE_ESM_NOTIF_IND, "Notification indicator" }, /* 9.9.4.7a Notification indicator */ + { DE_ESM_P_FLW_ID, "Packet flow identifier" }, /* 9.9.4.8 Packet flow identifier */ + { DE_ESM_PDN_ADDR, "PDN address" }, /* 9.9.4.9 PDN address */ + { DE_ESM_PDN_TYPE, "PDN type" }, /* 9.9.4.10 PDN type */ + { DE_ESM_PROT_CONF_OPT, "Protocol configuration options" }, /* 9.9.4.11 Protocol configuration options */ + { DE_ESM_QOS, "Quality of service" }, /* 9.9.4.12 Quality of service */ + { DE_ESM_RA_PRI, "Radio priority" }, /* 9.9.4.13 Radio priority */ + { DE_ESM_REQ_TYPE, "Request type" }, /* 9.9.4.14 Request type */ + { DE_ESM_TRAF_FLOW_AGR_DESC, "Traffic flow aggregate description" },/* 9.9.4.15 Traffic flow aggregate description */ + { DE_ESM_TRAF_FLOW_TEMPL, "Traffic flow template" }, /* 9.9.4.16 Traffic flow template */ + { DE_ESM_TID, "Transaction identifier" }, /* 9.9.4.17 Transaction identifier */ + { 0, NULL } +}; + + +#define NUM_NAS_ESM_ELEM (sizeof(nas_esm_elem_strings)/sizeof(value_string)) +gint ett_nas_eps_esm_elem[NUM_NAS_ESM_ELEM]; + guint16 (*esm_elem_fcn[])(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len, gchar *add_string, int string_len) = { NULL, /* 9.9.4.1 Access point name */ de_esm_apn_aggr_max_br, /* 9.9.4.2 APN aggregate maximum bit rate */ diff --git a/epan/dissectors/packet-sgsap.c b/epan/dissectors/packet-sgsap.c index 9905354abf..721226fcf5 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[] = { - { 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, "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 */ - - { 0x11, "IMEISV" }, /* 9.4.5 */ - { 0x12, "NAS message container" }, /* 9.4.15 */ - { 0x13, "MM information" }, /* 9.4.12 */ - - { 0x14, "Undefined" }, /* */ - { 0x15, "Undefined" }, /* */ - { 0x16, "Undefined" }, /* */ - - { 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 */ + { DE_SGSAP_IMSI, "IMSI" }, /* 9.4.6 */ + { DE_SGSAP_VLR_NAME, "VLR name" }, /* 9.4.22 */ + { DE_SGSAP_TMSI, "TMSI" }, /* 9.4.20 */ + { DE_SGSAP_LOC_AREA_ID, "Location area identifier" }, /* 9.4.11 */ + { DE_SGSAP_CH_NEEDED, "Channel Needed" }, /* 9.4.23 */ + { DE_SGSAP_EMLPP_PRIO, "eMLPP Priority" }, /* 9.4.24 */ + { DE_SGSAP_TMSI_STATUS, "TMSI status" }, /* 9.4.21 */ + { DE_SGSAP_SGS_CAUSE, "SGs cause" }, /* 9.4.18 */ + { DE_SGSAP_MME_NAME, "MME name" }, /* 9.4.13 */ + { DE_SGSAP_EPS_LOC_UPD_TYPE, "EPS location update type" }, /* 9.4.2 */ + { DE_SGSAP_GLOBAL_CN_ID, "Global CN-Id" }, /* 9.4.4 */ + + { DE_SGSAP_UDEF_11, "Undefined" }, /* */ + { DE_SGSAP_UDEF_12, "Undefined" }, /* */ + + { DE_SGSAP_MID, "Mobile identity" }, /* 9.4.14 */ + { DE_SGSAP_REJ_CAUSE, "Reject cause" }, /* 9.4.16 */ + { DE_SGSAP_IMSI_DET_EPS, "IMSI detach from EPS service type" }, /* 9.4.7 */ + { DE_SGSAP_IMSI_DET_NON_EPS, "IMSI detach from non-EPS service type" }, /* 9.4.8 */ + + { DE_SGSAP_IMEISV, "IMEISV" }, /* 9.4.5 */ + { DE_SGSAP_NAS_MSG_CONTAINER, "NAS message container" }, /* 9.4.15 */ + { DE_SGSAP_MM_INFO, "MM information" }, /* 9.4.12 */ + + { DE_SGSAP_UDEF_20, "Undefined" }, /* */ + { DE_SGSAP_UDEF_21, "Undefined" }, /* */ + { DE_SGSAP_UDEF_22, "Undefined" }, /* */ + + { DE_SGSAP_ERR_MSG, "Erroneous message" }, /* 9.4.3 */ + { DE_SGSAP_CLI, "CLI" }, /* 9.4.1 */ + { DE_SGSAP_LCS_CLIENT_ID, "LCS client identity" }, /* 9.4.9 */ + { DE_SGSAP_LCS_INDIC, "LCS indicator" }, /* 9.4.10 */ + { DE_SGSAP_SS_CODE, "SS code" }, /* 9.4.19 */ + { DE_SGSAP_SERV_INDIC, "Service indicator" }, /* 9.4.17 */ + { DE_SGSAP_UE_TZ, "UE Time Zone" }, /* 9.4.21b */ + { DE_SGSAP_MSC_2, "Mobile Station Classmark 2" }, /* 9.4.14a */ + { DE_SGSAP_TAID, "Tracking Area Identity" }, /* 9.4.21a */ + { DE_SGSAP_ECGI, "E-UTRAN Cell Global Identity" }, /* 9.4.3a */ + { DE_SGSAP_UE_EMM_MODE, "UE EMM mode" }, /* 9.4.21c */ { 0, NULL } }; |