osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

use enum values instead of hardcoded values 

(as suggested by Sylvain Munaut in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8487)

svn path=/trunk/; revision=48397
This commit is contained in:
Pascal Quantin 2013-03-18 20:26:47 +00:00
parent 434aae5245
commit 94f330030d
11 changed files with 1095 additions and 1098 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

306
epan/dissectors/packet-bssgp.c
View File

@ -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 */

902
epan/dissectors/packet-gsm_a_bssmap.c
View File

File diff suppressed because it is too large Load Diff

36
epan/dissectors/packet-gsm_a_common.c
View File

@ -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 }
};

162
epan/dissectors/packet-gsm_a_dtap.c
View File

@ -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 }
};

179
epan/dissectors/packet-gsm_a_gm.c
View File

@ -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;

34
epan/dissectors/packet-gsm_a_rp.c
View File

@ -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];

164
epan/dissectors/packet-gsm_a_rr.c
View File

@ -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 }
};

63
epan/dissectors/packet-gsm_bsslap.c
View File

@ -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 },
};

60
epan/dissectors/packet-gsm_bssmap_le.c
View File

@ -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 }
};

219
epan/dissectors/packet-nas_eps.c
View File

@ -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 */

68
epan/dissectors/packet-sgsap.c
View File

@ -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 */
{ 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 */
{ 0x0b, "Undefined" }, /* */
{ 0x0c, "Undefined" }, /* */
{ DE_SGSAP_UDEF_11, "Undefined" }, /* */
{ DE_SGSAP_UDEF_12, "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 */
{ 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 */
{ 0x11, "IMEISV" }, /* 9.4.5 */
{ 0x12, "NAS message container" }, /* 9.4.15 */
{ 0x13, "MM information" }, /* 9.4.12 */
{ 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 */
{ 0x14, "Undefined" }, /* */
{ 0x15, "Undefined" }, /* */
{ 0x16, "Undefined" }, /* */
{ DE_SGSAP_UDEF_20, "Undefined" }, /* */
{ DE_SGSAP_UDEF_21, "Undefined" }, /* */
{ DE_SGSAP_UDEF_22, "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_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 }
};