diff options
author | Bill Meier <wmeier@newsguy.com> | 2014-10-05 22:14:57 -0400 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2014-10-06 02:55:49 +0000 |
commit | 07698d536b72f5267ebe654b0b0cbc394b713ce1 (patch) | |
tree | 1ae72c69e7e2ac830cf3ac3752da6c9fe067ee15 /epan/dissectors | |
parent | 0111e461938d47efd1eb8dc17f135b93b253ab52 (diff) |
Adjust some whitespace to match editor modelines.
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3
Reviewed-on: https://code.wireshark.org/review/4489
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-bssgp.c | 334 | ||||
-rw-r--r-- | epan/dissectors/packet-dcerpc-krb5rpc.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-gsm_a_bssmap.c | 564 | ||||
-rw-r--r-- | epan/dissectors/packet-gtpv2.c | 64 | ||||
-rw-r--r-- | epan/dissectors/packet-null.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ripng.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-rtacser.c | 21 | ||||
-rw-r--r-- | epan/dissectors/packet-s7comm_szl_ids.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-tnef.c | 104 |
9 files changed, 558 insertions, 559 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 6744ea17d2..653ef8acb9 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -3256,25 +3256,25 @@ de_bssgp_redir_attempt_flg(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _ * 11.3.112 Redirection Indication */ static const value_string bssgp_redir_indiction_reroute_reject_cause_vals[] = { - {0x00, "Reserved"}, - {0x01, "Reserved"}, - {0x02, "Reserved"}, - {0x03, "Reserved"}, - {0x04, "Reserved"}, - {0x05, "Reserved"}, - {0x06, "Reserved"}, - {0x07, "Reserved"}, - {0x08, "Reserved"}, - {0x09, "Reserved"}, - {0x0A, "Reserved"}, - {0x0B, "PLMN not allowed"}, - {0x0C, "Location area not allowed"}, - {0x0D, "Roaming not allowed in this location area"}, - {0x0E, "GPRS services not allowed in this PLMN"}, - {0x0F, "No suitable cell in location area"}, - {0x10, "CS/PS domain registration coordination required"}, - /* {0x11~0xFF, "Reserved"} */ - { 0, NULL }, + {0x00, "Reserved"}, + {0x01, "Reserved"}, + {0x02, "Reserved"}, + {0x03, "Reserved"}, + {0x04, "Reserved"}, + {0x05, "Reserved"}, + {0x06, "Reserved"}, + {0x07, "Reserved"}, + {0x08, "Reserved"}, + {0x09, "Reserved"}, + {0x0A, "Reserved"}, + {0x0B, "PLMN not allowed"}, + {0x0C, "Location area not allowed"}, + {0x0D, "Roaming not allowed in this location area"}, + {0x0E, "GPRS services not allowed in this PLMN"}, + {0x0F, "No suitable cell in location area"}, + {0x10, "CS/PS domain registration coordination required"}, + /* {0x11~0xFF, "Reserved"} */ + { 0, NULL }, }; static guint16 @@ -3451,152 +3451,152 @@ typedef enum bssgp_elem_idx_t; static 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_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 */ - - { DE_BSSGP_SELECTED_PLMN_ID, "Selected PLMN ID"}, /* 11.3.118 Selected PLMN ID */ + /* 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 */ + + { DE_BSSGP_SELECTED_PLMN_ID, "Selected PLMN ID"}, /* 11.3.118 Selected PLMN ID */ { 0, NULL } }; @@ -4030,12 +4030,12 @@ bssgp_ul_unitdata(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 o ELEM_OPT_TELV(0x26, GSM_A_PDU_TYPE_BSSMAP, BE_LSA_ID_LIST, NULL); /* Redirect Attempt Flag (Note 3) Redirect Attempt Flag/11.3.111 O TLV 3 */ ELEM_OPT_TELV(BSSGP_IEI_REDIR_ATTEMP_FLG, BSSGP_PDU_TYPE, DE_BSSGP_REDIR_ATTEMPT_FLG, NULL); - /* IMSI (note 2) IMSI/11.3.14 O TLV 5-10 */ - ELEM_OPT_TELV(BSSGP_IEI_IMSI, BSSGP_PDU_TYPE, DE_BSSGP_IMSI , NULL); + /* IMSI (note 2) IMSI/11.3.14 O TLV 5-10 */ + ELEM_OPT_TELV(BSSGP_IEI_IMSI, BSSGP_PDU_TYPE, DE_BSSGP_IMSI , NULL); /* Unconfirmed send state variable (note 4) Unconfirmed send state variable/11.3.114 O TLV 4 */ ELEM_OPT_TELV(BSSGP_IEI_UNCONFIRM_SEND_STATE_VAR, BSSGP_PDU_TYPE, DE_BSSGP_UNCONFIRM_SEND_STATE_VAR, NULL); - /* Selected PLMN ID (note 5) Selected PLMN ID/11.3.118 O TLV 5 */ - ELEM_OPT_TELV(BSSGP_IEI_SELECTED_PLMN_ID, BSSGP_PDU_TYPE, DE_BSSGP_SELECTED_PLMN_ID, NULL); + /* Selected PLMN ID (note 5) Selected PLMN ID/11.3.118 O TLV 5 */ + ELEM_OPT_TELV(BSSGP_IEI_SELECTED_PLMN_ID, BSSGP_PDU_TYPE, DE_BSSGP_SELECTED_PLMN_ID, NULL); /* Alignment octets Alignment octets/11.3.1 O TLV 2-5 */ ELEM_OPT_TELV(0x00, BSSGP_PDU_TYPE, DE_BSSGP_ALIGNMENT_OCTETS, NULL); /* LLC-PDU (note) LLC-PDU/11.3.15 M TLV 2-? */ diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c index 8f9625d7ac..1f64a807b0 100644 --- a/epan/dissectors/packet-dcerpc-krb5rpc.c +++ b/epan/dissectors/packet-dcerpc-krb5rpc.c @@ -117,7 +117,7 @@ krb5rpc_dissect_sendto_kdc_resp (tvbuff_t * tvb, int offset, offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, - hf_krb5rpc_sendto_kdc_resp_len, &resp_len); + hf_krb5rpc_sendto_kdc_resp_len, &resp_len); offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_krb5rpc_sendto_kdc_resp_max, &maxsize); diff --git a/epan/dissectors/packet-gsm_a_bssmap.c b/epan/dissectors/packet-gsm_a_bssmap.c index 54cd39e55c..61f0ec933b 100644 --- a/epan/dissectors/packet-gsm_a_bssmap.c +++ b/epan/dissectors/packet-gsm_a_bssmap.c @@ -203,157 +203,157 @@ 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); static const value_string gsm_bssmap_elem_strings[] = { - { 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_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" }, - { BE_REDIR_ATT_FLG, "Redirect Attempt Flag" }, /* 3.2.2.111 */ - { BE_REROUTE_REJ_CAUSE, "Reroute Reject Cause" }, /* 3.2.2.112 */ - { BE_SEND_SEQN, "Send Sequence Number" }, /* 3.2.2.113 */ - { BE_REROUTE_OUTCOME, "Reroute complete outcome" }, /* 3.2.2.114 */ - { BE_GLOBAL_CALL_REF, "Global Call Reference" }, /* 3.2.2.115 */ - { BE_LCLS_CONF, "LCLS-Configuration" }, /* 3.2.2.116 */ - { BE_LCLS_CON_STATUS_CONTROL, "LCLS-Connection-Status-Control" }, /* 3.2.2.117 */ - { BE_LCLS_CORR_NOT_NEEDED, "LCLS-Correlation-Not-Needed" }, /* 3.2.2.118 */ - { BE_LCLS_BSS_STATUS, "LCLS-BSS-Status" }, /* 3.2.2.119 */ - { BE_LCLS_BREAK_REQ, "LCLS-Break-Request" }, /* 3.2.2.120 */ - { BE_CSFB_IND, "CSFB Indication" }, /* 3.2.2.121 */ + { BE_GANSS_ASS_DTA, "GANSS Assistance Data" }, + { BE_GANSS_POS_DTA, "GANSS Positioning Data" }, + { BE_GANSS_LOC_TYP, "GANSS Location Type" }, + { BE_APP_DATA, "Application Data" }, + { BE_DATA_ID, "Data Identity" }, + { BE_APP_DATA_INF, "Application Data Information" }, + { BE_MSISDN, "MSISDN" }, + { BE_AOIP_TRANS_LAY_ADD, "AoIP Transport Layer Address" }, + { BE_SPEECH_CODEC_LST, "Speech Codec List" }, + { BE_SPEECH_CODEC, "Speech Codec" }, + { BE_CALL_ID, "Call Identifier" }, + { BE_CALL_ID_LST, "Call Identifier List" }, + { BE_A_ITF_SEL_FOR_RESET, "A-Interface Selector for RESET" }, + { BE_UDEF_130, "Undefined" }, + { BE_KC128, "Kc128" }, + { BE_CSG_ID, "CSG Identifier" }, + { BE_REDIR_ATT_FLG, "Redirect Attempt Flag" }, /* 3.2.2.111 */ + { BE_REROUTE_REJ_CAUSE, "Reroute Reject Cause" }, /* 3.2.2.112 */ + { BE_SEND_SEQN, "Send Sequence Number" }, /* 3.2.2.113 */ + { BE_REROUTE_OUTCOME, "Reroute complete outcome" }, /* 3.2.2.114 */ + { BE_GLOBAL_CALL_REF, "Global Call Reference" }, /* 3.2.2.115 */ + { BE_LCLS_CONF, "LCLS-Configuration" }, /* 3.2.2.116 */ + { BE_LCLS_CON_STATUS_CONTROL, "LCLS-Connection-Status-Control" }, /* 3.2.2.117 */ + { BE_LCLS_CORR_NOT_NEEDED, "LCLS-Correlation-Not-Needed" }, /* 3.2.2.118 */ + { BE_LCLS_BSS_STATUS, "LCLS-BSS-Status" }, /* 3.2.2.119 */ + { BE_LCLS_BREAK_REQ, "LCLS-Break-Request" }, /* 3.2.2.120 */ + { BE_CSFB_IND, "CSFB Indication" }, /* 3.2.2.121 */ #if 0 - { BE_CS_TO_PS_SRVCC, "CS to PS SRVCC" }, /* 3.2.2.122 */ - { BE_SRC_ENB_2_TGT_ENB_TRANSP_INF, "Source eNB to target eNB transparent information (E-UTRAN)" }, /*3.2.2.123 */ - { BE_CS_TO_PS_SRVCC_IND, "CS to PS SRVCC Indication" }, /* 3.2.2.124 */ - { BE_CN_TO_MS_TRANSP, "CN to MS transparent information" }, /* 3.2.2.125 */ + { BE_CS_TO_PS_SRVCC, "CS to PS SRVCC" }, /* 3.2.2.122 */ + { BE_SRC_ENB_2_TGT_ENB_TRANSP_INF, "Source eNB to target eNB transparent information (E-UTRAN)" }, /*3.2.2.123 */ + { BE_CS_TO_PS_SRVCC_IND, "CS to PS SRVCC Indication" }, /* 3.2.2.124 */ + { BE_CN_TO_MS_TRANSP, "CN to MS transparent information" }, /* 3.2.2.125 */ #endif - { BE_SELECTED_PLMN_ID, "Selected PLMN ID" }, /* 3.2.2.126 */ + { BE_SELECTED_PLMN_ID, "Selected PLMN ID" }, /* 3.2.2.126 */ { 0, NULL } }; value_string_ext gsm_bssmap_elem_strings_ext = VALUE_STRING_EXT_INIT(gsm_bssmap_elem_strings); @@ -960,81 +960,81 @@ static const value_string cause_class_vals[] = { }; static const range_string gsm_a_bssap_cause_rvals[] = { - { 0x00, 0x00, "Radio interface message failure" }, - { 0x01, 0x01, "Radio interface failure" }, - { 0x02, 0x02, "Uplink quality" }, - { 0x03, 0x03, "Uplink strength" }, - { 0x04, 0x04, "Downlink quality" }, - { 0x05, 0x05, "Downlink strength" }, - { 0x06, 0x06, "Distance" }, - { 0x07, 0x07, "O and M intervention" }, - { 0x08, 0x08, "Response to MSC invocation" }, - { 0x09, 0x09, "Call control" }, - { 0x0a, 0x0a, "Radio interface failure, reversion to old channel" }, - { 0x0b, 0x0b, "Handover successful" }, - { 0x0c, 0x0c, "Better Cell" }, - { 0x0d, 0x0d, "Directed Retry" }, - { 0x0e, 0x0e, "Joined group call channel" }, - { 0x0f, 0x0f, "Traffic" }, - { 0x10, 0x10, "Reduce load in serving cell" }, - { 0x11, 0x11, "Traffic load in target cell higher than in source cell" }, - { 0x12, 0x12, "Relocation triggered" }, - { 0x14, 0x14, "Requested option not authorised" }, - { 0x15, 0x15, "Alternative channel configuration requested " }, - { 0x16, 0x16, "Call Identifier already allocated" }, - { 0x17, 0x17, "INTERNAL HANDOVER ENQUIRY reject" }, - { 0x18, 0x18, "Redundancy Level not adequate" }, - { 0x19, 0x1f, "Reserved for national use" }, - { 0x20, 0x20, "Equipment failure" }, - { 0x21, 0x21, "No radio resource available" }, - { 0x22, 0x22, "Requested terrestrial resource unavailable" }, - { 0x23, 0x23, "CCCH overload" }, - { 0x24, 0x24, "Processor overload" }, - { 0x25, 0x25, "BSS not equipped" }, - { 0x26, 0x26, "MS not equipped" }, - { 0x27, 0x27, "Invalid cell" }, - { 0x28, 0x28, "Traffic Load" }, - { 0x29, 0x29, "Preemption" }, - { 0x2a, 0x2a, "DTM Handover - SGSN Failure" }, - { 0x2b, 0x2b, "DTM Handover - PS Allocation failure" }, - { 0x2c, 0x2f, "Reserved for national use" }, - { 0x30, 0x30, "Requested transcoding/rate adaption unavailable" }, - { 0x31, 0x31, "Circuit pool mismatch" }, - { 0x32, 0x32, "Switch circuit pool" }, - { 0x33, 0x33, "Requested speech version unavailable" }, - { 0x34, 0x34, "LSA not allowed" }, - { 0x35, 0x35, "Requested Codec Type or Codec Configuration unavailable" }, - { 0x36, 0x36, "Requested A-Interface Type unavailable" }, - { 0x37, 0x37, "Invalid CSG cell" }, - { 0x38, 0x3e, "Reserved for international use" }, - { 0x3f, 0x3f, "Requested Redundancy Level not available" }, - { 0x40, 0x40, "Ciphering algorithm not supported" }, - { 0x41, 0x41, "GERAN Iu-mode failure" }, - { 0x42, 0x42, "Incoming Relocation Not Supported Due To PUESBINE Feature" }, - { 0x43, 0x43, "Access Restricted Due to Shared Networks" }, - { 0x44, 0x44, "Requested Codec Type or Codec Configuration not supported" }, - { 0x45, 0x45, "Requested A-Interface Type not supported" }, - { 0x46, 0x46, "Requested Redundancy Level not supported" }, - { 0x47, 0x47, "Reserved for international use" }, - { 0x48, 0x4f, "Reserved for national use" }, - { 0x50, 0x50, "Terrestrial circuit already allocated" }, - { 0x51, 0x51, "Invalid message contents" }, - { 0x52, 0x52, "Information element or field missing" }, - { 0x53, 0x53, "Incorrect value" }, - { 0x54, 0x54, "Unknown Message type" }, - { 0x55, 0x55, "Unknown Information Element" }, - { 0x56, 0x56, "DTM Handover - Invalid PS Indication" }, - { 0x57, 0x57, "Call Identifier already allocated" }, - { 0x58, 0x5f, "Reserved for national use" }, - { 0x60, 0x60, "Protocol Error between BSS and MSC" }, - { 0x61, 0x61, "VGCS/VBS call non existent" }, - { 0x62, 0x62, "DTM Handover - Timer Expiry" }, - { 0x63, 0x67, "Reserved for international use" }, - { 0x68, 0x6f, "Reserved for national use" }, - { 0x70, 0x77, "Reserved for international use" }, - { 0x78, 0x7f, "Reserved for national use" }, - - { 0, 0, NULL }, + { 0x00, 0x00, "Radio interface message failure" }, + { 0x01, 0x01, "Radio interface failure" }, + { 0x02, 0x02, "Uplink quality" }, + { 0x03, 0x03, "Uplink strength" }, + { 0x04, 0x04, "Downlink quality" }, + { 0x05, 0x05, "Downlink strength" }, + { 0x06, 0x06, "Distance" }, + { 0x07, 0x07, "O and M intervention" }, + { 0x08, 0x08, "Response to MSC invocation" }, + { 0x09, 0x09, "Call control" }, + { 0x0a, 0x0a, "Radio interface failure, reversion to old channel" }, + { 0x0b, 0x0b, "Handover successful" }, + { 0x0c, 0x0c, "Better Cell" }, + { 0x0d, 0x0d, "Directed Retry" }, + { 0x0e, 0x0e, "Joined group call channel" }, + { 0x0f, 0x0f, "Traffic" }, + { 0x10, 0x10, "Reduce load in serving cell" }, + { 0x11, 0x11, "Traffic load in target cell higher than in source cell" }, + { 0x12, 0x12, "Relocation triggered" }, + { 0x14, 0x14, "Requested option not authorised" }, + { 0x15, 0x15, "Alternative channel configuration requested " }, + { 0x16, 0x16, "Call Identifier already allocated" }, + { 0x17, 0x17, "INTERNAL HANDOVER ENQUIRY reject" }, + { 0x18, 0x18, "Redundancy Level not adequate" }, + { 0x19, 0x1f, "Reserved for national use" }, + { 0x20, 0x20, "Equipment failure" }, + { 0x21, 0x21, "No radio resource available" }, + { 0x22, 0x22, "Requested terrestrial resource unavailable" }, + { 0x23, 0x23, "CCCH overload" }, + { 0x24, 0x24, "Processor overload" }, + { 0x25, 0x25, "BSS not equipped" }, + { 0x26, 0x26, "MS not equipped" }, + { 0x27, 0x27, "Invalid cell" }, + { 0x28, 0x28, "Traffic Load" }, + { 0x29, 0x29, "Preemption" }, + { 0x2a, 0x2a, "DTM Handover - SGSN Failure" }, + { 0x2b, 0x2b, "DTM Handover - PS Allocation failure" }, + { 0x2c, 0x2f, "Reserved for national use" }, + { 0x30, 0x30, "Requested transcoding/rate adaption unavailable" }, + { 0x31, 0x31, "Circuit pool mismatch" }, + { 0x32, 0x32, "Switch circuit pool" }, + { 0x33, 0x33, "Requested speech version unavailable" }, + { 0x34, 0x34, "LSA not allowed" }, + { 0x35, 0x35, "Requested Codec Type or Codec Configuration unavailable" }, + { 0x36, 0x36, "Requested A-Interface Type unavailable" }, + { 0x37, 0x37, "Invalid CSG cell" }, + { 0x38, 0x3e, "Reserved for international use" }, + { 0x3f, 0x3f, "Requested Redundancy Level not available" }, + { 0x40, 0x40, "Ciphering algorithm not supported" }, + { 0x41, 0x41, "GERAN Iu-mode failure" }, + { 0x42, 0x42, "Incoming Relocation Not Supported Due To PUESBINE Feature" }, + { 0x43, 0x43, "Access Restricted Due to Shared Networks" }, + { 0x44, 0x44, "Requested Codec Type or Codec Configuration not supported" }, + { 0x45, 0x45, "Requested A-Interface Type not supported" }, + { 0x46, 0x46, "Requested Redundancy Level not supported" }, + { 0x47, 0x47, "Reserved for international use" }, + { 0x48, 0x4f, "Reserved for national use" }, + { 0x50, 0x50, "Terrestrial circuit already allocated" }, + { 0x51, 0x51, "Invalid message contents" }, + { 0x52, 0x52, "Information element or field missing" }, + { 0x53, 0x53, "Incorrect value" }, + { 0x54, 0x54, "Unknown Message type" }, + { 0x55, 0x55, "Unknown Information Element" }, + { 0x56, 0x56, "DTM Handover - Invalid PS Indication" }, + { 0x57, 0x57, "Call Identifier already allocated" }, + { 0x58, 0x5f, "Reserved for national use" }, + { 0x60, 0x60, "Protocol Error between BSS and MSC" }, + { 0x61, 0x61, "VGCS/VBS call non existent" }, + { 0x62, 0x62, "DTM Handover - Timer Expiry" }, + { 0x63, 0x67, "Reserved for international use" }, + { 0x68, 0x6f, "Reserved for national use" }, + { 0x70, 0x77, "Reserved for international use" }, + { 0x78, 0x7f, "Reserved for national use" }, + + { 0, 0, NULL }, }; static guint16 @@ -1237,24 +1237,24 @@ static const value_string gsm_a_bssap_channel_rate_and_type_vals[] = { }; static const range_string gsm_a_bssap_channel_rate_and_type_rvals[] = { - { 0x00, 0x00, "SDCCH or Full rate TCH channel Bm or Half rate TCH channel Lm" }, - { 0x01, 0x01, "SDCCH" }, - { 0x02, 0x02, "SDCCH or Full rate TCH channel Bm" }, - { 0x03, 0x03, "Half rate TCH channel Lm" }, - { 0x04, 0x07, "Reserved" }, - { 0x08, 0x08, "Full rate TCH channel Bm" }, - { 0x09, 0x09, "Half rate TCH channel Lm" }, - { 0x0a, 0x0a, "Full or Half rate TCH channel, Full rate preferred, changes allowed also after first channel allocation as a result of the request" }, - { 0x0b, 0x0b, "Full or Half rate TCH channel, Half rate preferred, changes allowed also after first channel allocation as a result of the request" }, - { 0x0c, 0x19, "Reserved" }, - { 0x1a, 0x1a, "Full or Half rate TCH channel, Full rate preferred, changes allowed also after first channel allocation as a result of the request" }, - { 0x1b, 0x1b, "Full or Half rate TCH channel, Half rate preferred, changes allowed also after first channel allocation as a result of the request" }, - { 0x1c, 0x1f, "Reserved" }, - { 0x20, 0x27, "Full rate TCH channels in a multislot configuration, changes by the BSS of the the number of TCHs and if applicable the used radio interface rate per channel allowed after first channel allocation as a result of the request" }, - { 0x28, 0x2f, "Reserved" }, - { 0x30, 0x37, "Full rate TCH channels in a multislot configuration, changes by the BSS of the number of TCHs or the used radio interface rate per channel not allowed after first channel allocation as a result of the request" }, - { 0x38, 0xff, "Reserved" }, - { 0, 0, NULL }, + { 0x00, 0x00, "SDCCH or Full rate TCH channel Bm or Half rate TCH channel Lm" }, + { 0x01, 0x01, "SDCCH" }, + { 0x02, 0x02, "SDCCH or Full rate TCH channel Bm" }, + { 0x03, 0x03, "Half rate TCH channel Lm" }, + { 0x04, 0x07, "Reserved" }, + { 0x08, 0x08, "Full rate TCH channel Bm" }, + { 0x09, 0x09, "Half rate TCH channel Lm" }, + { 0x0a, 0x0a, "Full or Half rate TCH channel, Full rate preferred, changes allowed also after first channel allocation as a result of the request" }, + { 0x0b, 0x0b, "Full or Half rate TCH channel, Half rate preferred, changes allowed also after first channel allocation as a result of the request" }, + { 0x0c, 0x19, "Reserved" }, + { 0x1a, 0x1a, "Full or Half rate TCH channel, Full rate preferred, changes allowed also after first channel allocation as a result of the request" }, + { 0x1b, 0x1b, "Full or Half rate TCH channel, Half rate preferred, changes allowed also after first channel allocation as a result of the request" }, + { 0x1c, 0x1f, "Reserved" }, + { 0x20, 0x27, "Full rate TCH channels in a multislot configuration, changes by the BSS of the the number of TCHs and if applicable the used radio interface rate per channel allowed after first channel allocation as a result of the request" }, + { 0x28, 0x2f, "Reserved" }, + { 0x30, 0x37, "Full rate TCH channels in a multislot configuration, changes by the BSS of the number of TCHs or the used radio interface rate per channel not allowed after first channel allocation as a result of the request" }, + { 0x38, 0xff, "Reserved" }, + { 0, 0, NULL }, }; static const true_false_string tfs_non_transparent_transparent = {"Non-Transparent", "Transparent"}; @@ -1744,10 +1744,10 @@ static const true_false_string bssmap_pvi_value = { }; static const range_string bssmap_prio_rvals[] = { - { 0x00, 0x00, "Spare" }, - { 0x01, 0x0E, "1 is highest" }, - { 0x0F, 0x0f, "priority not used" }, - { 0, 0, NULL }, + { 0x00, 0x00, "Spare" }, + { 0x01, 0x0E, "1 is highest" }, + { 0x0F, 0x0f, "priority not used" }, + { 0, 0, NULL }, }; guint16 @@ -2466,11 +2466,11 @@ be_trace_omc_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 * [2] 3.2.2.43 Forward Indicator */ static const range_string forward_indicator_rvals[] = { - { 0x00, 0x00, "Reserved" }, - { 0x01, 0x01, "forward to subsequent BSS, no trace at MSC" }, - { 0x02, 0x02, "forward to subsequent BSS, and trace at MSC" }, - { 0x03, 0x0F, "Reserved" }, - { 0, 0, NULL }, + { 0x00, 0x00, "Reserved" }, + { 0x01, 0x01, "forward to subsequent BSS, no trace at MSC" }, + { 0x02, 0x02, "forward to subsequent BSS, and trace at MSC" }, + { 0x03, 0x0F, "Reserved" }, + { 0, 0, NULL }, }; static guint16 @@ -2612,41 +2612,41 @@ be_que_ind(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offs * [2] 3.2.2.51 Speech Version */ static const range_string speech_version_id_rvals[] = { - { 0x01, 0x01, "GSM speech full rate version 1" }, - { 0x02, 0x04, "Reserved" }, - { 0x05, 0x05, "GSM speech half rate version 1" }, - { 0x06, 0x10, "Reserved" }, - { 0x11, 0x11, "GSM speech full rate version 1" }, - { 0x12, 0x14, "Reserved" }, - { 0x15, 0x15, "GSM speech half rate version 2" }, - { 0x16, 0x20, "Reserved" }, - { 0x21, 0x21, "GSM speech full rate version 3 (AMR)" }, - { 0x22, 0x24, "Reserved" }, - { 0x25, 0x25, "GSM speech half rate version 3 (AMR)" }, - { 0x26, 0x40, "Reserved" }, - { 0x41, 0x41, "GSM speech full rate version 4" }, - { 0x42, 0x42, "GSM speech full rate version 5" }, - { 0x43, 0x44, "Reserved" }, - { 0x45, 0x45, "GSM speech half rate version 6" }, - { 0x46, 0x46, "GSM speech half rate version 4" }, - { 0x47, 0x7f, "Reserved" }, - - { 0, 0, NULL }, + { 0x01, 0x01, "GSM speech full rate version 1" }, + { 0x02, 0x04, "Reserved" }, + { 0x05, 0x05, "GSM speech half rate version 1" }, + { 0x06, 0x10, "Reserved" }, + { 0x11, 0x11, "GSM speech full rate version 1" }, + { 0x12, 0x14, "Reserved" }, + { 0x15, 0x15, "GSM speech half rate version 2" }, + { 0x16, 0x20, "Reserved" }, + { 0x21, 0x21, "GSM speech full rate version 3 (AMR)" }, + { 0x22, 0x24, "Reserved" }, + { 0x25, 0x25, "GSM speech half rate version 3 (AMR)" }, + { 0x26, 0x40, "Reserved" }, + { 0x41, 0x41, "GSM speech full rate version 4" }, + { 0x42, 0x42, "GSM speech full rate version 5" }, + { 0x43, 0x44, "Reserved" }, + { 0x45, 0x45, "GSM speech half rate version 6" }, + { 0x46, 0x46, "GSM speech half rate version 4" }, + { 0x47, 0x7f, "Reserved" }, + + { 0, 0, NULL }, }; static const range_string speech_version_id_short_rvals[] = { - { 0x01, 0x01, "FR1" }, - { 0x05, 0x05, "HR1" }, - { 0x11, 0x11, "FR12" }, - { 0x15, 0x15, "HR2" }, - { 0x21, 0x21, "FR3 (AMR)" }, - { 0x25, 0x25, "HR3 (AMR)" }, - { 0x41, 0x41, "OFR AMR-WB" }, - { 0x42, 0x42, "FR AMR-WB" }, - { 0x45, 0x45, "OHR AMR" }, - { 0x46, 0x46, "OHR AMR-WB" }, - - { 0, 0, NULL }, + { 0x01, 0x01, "FR1" }, + { 0x05, 0x05, "HR1" }, + { 0x11, 0x11, "FR12" }, + { 0x15, 0x15, "HR2" }, + { 0x21, 0x21, "FR3 (AMR)" }, + { 0x25, 0x25, "HR3 (AMR)" }, + { 0x41, 0x41, "OFR AMR-WB" }, + { 0x42, 0x42, "FR AMR-WB" }, + { 0x45, 0x45, "OHR AMR" }, + { 0x46, 0x46, "OHR AMR-WB" }, + + { 0, 0, NULL }, }; static guint16 diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index 8f672e65ce..afb2e7475a 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -901,7 +901,7 @@ static const value_string gtpv2_element_type_vals[] = { {183, "Sequence Number"}, /* Fixed Length / 8.114 */ {184, "APN and Relative Capacity"}, /* Extendable / 8.115 */ - /* 185 to 254 Spare. For future use. */ + /* 185 to 254 Spare. For future use. */ {255, "Private Extension"}, /* Variable Length / 8.67 */ {0, NULL} @@ -5089,7 +5089,7 @@ dissect_gtpv2_action_indication(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre } /* - * 8.100 TWAN Identifier + * 8.100 TWAN Identifier */ static void dissect_gtpv2_twan_Identifier(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5097,7 +5097,7 @@ dissect_gtpv2_twan_Identifier(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.101 ULI Timestamp + * 8.101 ULI Timestamp */ static void dissect_gtpv2_uli_timestamp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5105,7 +5105,7 @@ dissect_gtpv2_uli_timestamp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.102 MBMS Flags + * 8.102 MBMS Flags */ static void dissect_gtpv2_mbms_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5113,7 +5113,7 @@ dissect_gtpv2_mbms_flags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.103 RAN/NAS Cause + * 8.103 RAN/NAS Cause */ static void dissect_gtpv2_ran_nas_cause(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5121,7 +5121,7 @@ dissect_gtpv2_ran_nas_cause(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *t proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.104 CN Operator Selection Entity + * 8.104 CN Operator Selection Entity */ static void dissect_gtpv2_cn_operator_selection_entity(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5129,7 +5129,7 @@ dissect_gtpv2_cn_operator_selection_entity(tvbuff_t *tvb, packet_info *pinfo _U_ proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.105 Trusted WLAN Mode Indication + * 8.105 Trusted WLAN Mode Indication */ static void dissect_gtpv2_trust_wlan_mode_ind(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5137,7 +5137,7 @@ dissect_gtpv2_trust_wlan_mode_ind(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.106 Node Number + * 8.106 Node Number */ static void dissect_gtpv2_node_number(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5145,7 +5145,7 @@ dissect_gtpv2_node_number(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tre proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.107 Node Identifier + * 8.107 Node Identifier */ static void dissect_gtpv2_node_identifier(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5153,7 +5153,7 @@ dissect_gtpv2_node_identifier(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.108 Presence Reporting Area Action + * 8.108 Presence Reporting Area Action */ @@ -5169,40 +5169,40 @@ dissect_gtpv2_pres_rep_area_action(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ int offset = 0, i; guint8 oct, no_tai/*, no_rai*/; - /* Octet 5 Spare Action */ + /* Octet 5 Spare Action */ proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_action, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; if (length == 1) return; - /* Octet 6 to 8 Presence Reporting Area Identifier */ + /* Octet 6 to 8 Presence Reporting Area Identifier */ proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_id, tvb, offset, 2, ENC_BIG_ENDIAN); offset+=2; if (length == 3) return; - /* Octet 9 Number of TAI Number of RAI */ + /* Octet 9 Number of TAI Number of RAI */ oct = tvb_get_guint8(tvb,offset); no_tai = oct >> 4; /*no_rai = oct & 0x0f;*/ proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_act_no_tai, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_act_no_rai, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* Octet 10 Spare Number of Macro eNodeB */ + /* Octet 10 Spare Number of Macro eNodeB */ proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_act_no_m_enodeb, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* Octet 11 Spare Number of Home eNodeB */ + /* Octet 11 Spare Number of Home eNodeB */ proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_act_no_h_enodeb, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* Octet 12 Spare Number of ECGI */ + /* Octet 12 Spare Number of ECGI */ proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_act_no_ecgi, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* Octet 13 Spare Number of SAI */ + /* Octet 13 Spare Number of SAI */ proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_act_no_sai, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* Octet 14 Spare Number of CGI */ + /* Octet 14 Spare Number of CGI */ proto_tree_add_item(tree, hf_gtpv2_pres_rep_area_act_no_cgi, tvb, offset, 1, ENC_BIG_ENDIAN); offset++; - /* Octet 15 to k TAIs [1..15] */ + /* Octet 15 to k TAIs [1..15] */ if(no_tai > 0){ i = 1; while (no_tai > 0){ @@ -5212,17 +5212,17 @@ dissect_gtpv2_pres_rep_area_action(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ no_tai--; } } - /* Octet (k+1) to m Macro eNB IDs [1..63] */ - /* Octet (m+1) to p Home eNB IDs [1..63] */ - /* Octet (p+1) to q ECGIs [1..63] */ - /* Octet (q+1) to r RAIs [1..15] */ - /* Octet (r+1) to s SAIs [1..63] */ - /* Octet (s+1) to t CGIs [1..63] */ + /* Octet (k+1) to m Macro eNB IDs [1..63] */ + /* Octet (m+1) to p Home eNB IDs [1..63] */ + /* Octet (p+1) to q ECGIs [1..63] */ + /* Octet (q+1) to r RAIs [1..15] */ + /* Octet (r+1) to s SAIs [1..63] */ + /* Octet (s+1) to t CGIs [1..63] */ proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, offset, length-offset); } /* - * 8.109 Presence Reporting Area Information + * 8.109 Presence Reporting Area Information */ static void dissect_gtpv2_pres_rep_area_information(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5230,7 +5230,7 @@ dissect_gtpv2_pres_rep_area_information(tvbuff_t *tvb, packet_info *pinfo _U_, p proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.110 TWAN Identifier Timestamp + * 8.110 TWAN Identifier Timestamp */ static void dissect_gtpv2_twan_identifier_timestamp(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5238,7 +5238,7 @@ dissect_gtpv2_twan_identifier_timestamp(tvbuff_t *tvb, packet_info *pinfo _U_, p proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.111 Overload Control Information + * 8.111 Overload Control Information */ static void dissect_gtpv2_overload_control_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5246,7 +5246,7 @@ dissect_gtpv2_overload_control_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.112 Load Control Information + * 8.112 Load Control Information */ static void dissect_gtpv2_load_control_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5254,7 +5254,7 @@ dissect_gtpv2_load_control_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.113 Metric + * 8.113 Metric */ static void dissect_gtpv2_metric(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5262,7 +5262,7 @@ dissect_gtpv2_metric(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.114 Sequence Number + * 8.114 Sequence Number */ static void dissect_gtpv2_seq_no(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) @@ -5270,7 +5270,7 @@ dissect_gtpv2_seq_no(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); } /* - * 8.115 APN and Relative Capacity + * 8.115 APN and Relative Capacity */ static void dissect_gtpv2_apn_and_relative_capacity(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c index 6925fc0c4b..5c64045b4c 100644 --- a/epan/dissectors/packet-null.c +++ b/epan/dissectors/packet-null.c @@ -458,11 +458,11 @@ proto_register_null(void) /* registered here but handled in ethertype.c */ { &hf_null_etype, - { "Type", "null.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, + { "Type", "null.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, NULL, HFILL }}, { &hf_null_family, - { "Family", "null.family", FT_UINT32, BASE_DEC, VALS(family_vals), 0x0, + { "Family", "null.family", FT_UINT32, BASE_DEC, VALS(family_vals), 0x0, NULL, HFILL }} }; static gint *ett[] = { diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index f2f3c3b2ea..8ad20f11da 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -112,7 +112,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree_add_item(rte_tree, hf_ripng_rte_metric, tvb, offset, 1, ENC_BIG_ENDIAN); proto_item_append_text(rte_ti, " Metric: %u", tvb_get_guint8(tvb, offset)); offset += 1; - } + } } } @@ -121,37 +121,37 @@ proto_register_ripng(void) { static hf_register_info hf[] = { { &hf_ripng_cmd, - { "Command", "ripng.cmd", + { "Command", "ripng.cmd", FT_UINT8, BASE_DEC, VALS(cmdvals), 0x0, "Used to specify the purpose of this message", HFILL }}, { &hf_ripng_version, - { "Version", "ripng.version", + { "Version", "ripng.version", FT_UINT8, BASE_DEC, NULL, 0x0, "Version of RIPng", HFILL }}, { &hf_ripng_reserved, - { "Reserved", "ripng.reserved", + { "Reserved", "ripng.reserved", FT_BYTES, BASE_NONE, NULL, 0x0, "Must be Zero", HFILL }}, { &hf_ripng_rte, - { "Route Table Entry", "ripng.rte", + { "Route Table Entry", "ripng.rte", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_ripng_rte_ipv6_prefix, - { "IPv6 Prefix", "ripng.rte.ipv6_prefix", + { "IPv6 Prefix", "ripng.rte.ipv6_prefix", FT_IPv6, BASE_NONE, NULL, 0x0, "Destination", HFILL }}, { &hf_ripng_rte_route_tag, - { "Route Tag", "ripng.rte.route_tag", + { "Route Tag", "ripng.rte.route_tag", FT_UINT16, BASE_HEX, NULL, 0x0, "Provides a method of separating internal RIPng routes (routes for networks within the RIPng routing domain) from external RIPng routes, which may have been imported from an EGP or another IGP", HFILL }}, { &hf_ripng_rte_prefix_length, - { "Prefix Length", "ripng.rte.prefix_length", + { "Prefix Length", "ripng.rte.prefix_length", FT_UINT8, BASE_DEC, NULL, 0x0, "The length in bits of the significant part of the prefix starting from the left of the prefix", HFILL }}, { &hf_ripng_rte_metric, - { "Metric", "ripng.rte.metric", + { "Metric", "ripng.rte.metric", FT_UINT8, BASE_DEC, NULL, 0x0, "The current metric for the destination; the value 16 (infinity) indicates that the destination is not reachable", HFILL }}, }; diff --git a/epan/dissectors/packet-rtacser.c b/epan/dissectors/packet-rtacser.c index b9e5fc9ca1..d49e034434 100644 --- a/epan/dissectors/packet-rtacser.c +++ b/epan/dissectors/packet-rtacser.c @@ -128,14 +128,14 @@ static const value_string rtacser_eventtype_vals[] = { }; static const enum_val_t rtacser_payload_proto_type[] = { - { "NONE ", "NONE ", RTACSER_PAYLOAD_NONE }, - { "SEL FM ", "SEL FM ", RTACSER_PAYLOAD_SELFM }, - { "DNP3 ", "DNP3 ", RTACSER_PAYLOAD_DNP3 }, - { "MODBUS RTU", "MODBUS RTU", RTACSER_PAYLOAD_MODBUS }, - { "SYNPHASOR ", "SYNPHASOR ", RTACSER_PAYLOAD_SYNPHASOR }, - { "L&G 8979 ", "L&G 8979 ", RTACSER_PAYLOAD_LG8979 }, - { "CP 2179 ", "CP 2179 ", RTACSER_PAYLOAD_CP2179 }, - { NULL, NULL, 0 } + { "NONE ", "NONE ", RTACSER_PAYLOAD_NONE }, + { "SEL FM ", "SEL FM ", RTACSER_PAYLOAD_SELFM }, + { "DNP3 ", "DNP3 ", RTACSER_PAYLOAD_DNP3 }, + { "MODBUS RTU", "MODBUS RTU", RTACSER_PAYLOAD_MODBUS }, + { "SYNPHASOR ", "SYNPHASOR ", RTACSER_PAYLOAD_SYNPHASOR }, + { "L&G 8979 ", "L&G 8979 ", RTACSER_PAYLOAD_LG8979 }, + { "CP 2179 ", "CP 2179 ", RTACSER_PAYLOAD_CP2179 }, + { NULL, NULL, 0 } }; static void @@ -161,7 +161,7 @@ dissect_rtacser_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *rtacser_tree, *cl_tree; int offset = 0, len; guint event_type; - nstime_t tv; + nstime_t tv; gboolean cts, dcd, dsr, rts, dtr, ring, mbok; tvbuff_t *payload_tvb; @@ -357,10 +357,9 @@ proto_reg_handoff_rtacser(void) dissector_add_uint("wtap_encap", WTAP_ENCAP_RTAC_SERIAL, rtacser_handle); - data_handle = find_dissector("data"); + data_handle = find_dissector("data"); } - /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * diff --git a/epan/dissectors/packet-s7comm_szl_ids.c b/epan/dissectors/packet-s7comm_szl_ids.c index 4210ab7062..158c2a3e73 100644 --- a/epan/dissectors/packet-s7comm_szl_ids.c +++ b/epan/dissectors/packet-s7comm_szl_ids.c @@ -1382,7 +1382,7 @@ s7comm_get_szl_id_index_description_text(guint16 id, guint16 idx) /******************************************************************************************************* * - * SZL-ID: 0xxy00 + * SZL-ID: 0xxy00 * Content: * If you read the partial lists with SZL-ID W#16#xy00, you obtain the * SZL-IDs supported by the module. @@ -2228,7 +2228,7 @@ s7comm_decode_szl_id_0131_idx_0003(tvbuff_t *tvb, /******************************************************************************************************* * * SZL-ID: 0x0131 - * Index: 0x0004 + * Index: 0x0004 * Content: * The partial list extract with SZL-ID W#16#0131 and the index W#16#0004 * contains information about the object management system (OMS) of the @@ -3526,7 +3526,7 @@ s7comm_szl_0132_0006_register(int proto) static hf_register_info hf[] = { /*** SZL functions ***/ { &hf_s7comm_szl_0132_0006_index, - { "Index", "s7comm.szl.0132.0006.index", FT_UINT16, BASE_HEX, NULL, 0x0, + { "Index", "s7comm.szl.0132.0006.index", FT_UINT16, BASE_HEX, NULL, 0x0, "W#16#0006: Data exchange with communication SFBs for configured connections", HFILL }}, { &hf_s7comm_szl_0132_0006_used_0, diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c index 23390a84de..c239db5e82 100644 --- a/epan/dissectors/packet-tnef.c +++ b/epan/dissectors/packet-tnef.c @@ -303,30 +303,30 @@ static gint dissect_counted_address(tvbuff_t *tvb, gint offset, packet_info *pin static void dissect_DTR(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) { - gint offset; + gint offset; - offset = 0; + offset = 0; - proto_tree_add_item(tree, hf_tnef_attribute_date_year, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset +=2; + proto_tree_add_item(tree, hf_tnef_attribute_date_year, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_month, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset +=2; + proto_tree_add_item(tree, hf_tnef_attribute_date_month, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_day, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset +=2; + proto_tree_add_item(tree, hf_tnef_attribute_date_day, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_hour, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset +=2; + proto_tree_add_item(tree, hf_tnef_attribute_date_hour, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_minute, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset +=2; + proto_tree_add_item(tree, hf_tnef_attribute_date_minute, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_second, tvb, offset, 2, ENC_LITTLE_ENDIAN); - offset +=2; + proto_tree_add_item(tree, hf_tnef_attribute_date_second, tvb, offset, 2, ENC_LITTLE_ENDIAN); + offset +=2; - proto_tree_add_item(tree, hf_tnef_attribute_date_day_of_week, tvb, offset, 2, ENC_LITTLE_ENDIAN); - /*offset +=2;*/ + proto_tree_add_item(tree, hf_tnef_attribute_date_day_of_week, tvb, offset, 2, ENC_LITTLE_ENDIAN); + /*offset +=2;*/ } @@ -639,43 +639,43 @@ proto_register_tnef(void) static hf_register_info hf[] = { { &hf_tnef_signature, { "Signature", "tnef.signature", FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_key, { "Key", "tnef.key", FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute, { "Attribute", "tnef.attribute", FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_lvl, { "Type", "tnef.attribute.lvl", FT_UINT8, BASE_DEC, VALS(tnef_Lvl_vals), 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_tag, { "Tag", "tnef.attribute.tag", FT_UINT32, BASE_HEX, VALS(tnef_Attribute_vals), 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_tag_type, { "Type", "tnef.attribute.tag.type", FT_UINT16, BASE_HEX, VALS(tnef_Types_vals), 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_tag_id, { "Tag", "tnef.attribute.tag.id", FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_length, { "Length", "tnef.attribute.length", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_value, { "Value", "tnef.attribute.value", FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_string, { "String", "tnef.attribute.string", FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_date, { "Date", "tnef.attribute.date", FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_display_name, { "Display Name", "tnef.attribute.display_name", FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_email_address, { "Email Address", "tnef.attribute.email_address", FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_attribute_date_year, { "Year", "tnef.attribute.date.year", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_tnef_attribute_date_month, @@ -692,67 +692,67 @@ proto_register_tnef(void) { "Day Of Week", "tnef.attribute.date.day_of_week", FT_UINT16, BASE_DEC, VALS(weekday_vals), 0, NULL, HFILL }}, { &hf_tnef_attribute_checksum, { "Checksum", "tnef.attribute.checksum", FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_mapi_props, { "MAPI Properties", "tnef.mapi_props", FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_version, { "Version", "tnef.version", FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_oem_codepage, { "OEM Codepage", "tnef.oem_codepage", FT_UINT64, BASE_HEX, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_message_class, { "Message Class", "tnef.message_class", FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_original_message_class, { "Original Message Class", "tnef.message_class.original", FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_priority, { "Priority", "tnef.priority", FT_UINT16, BASE_DEC, VALS(tnef_Priority_vals), 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_mapi_props_count, { "Count", "tnef.mapi_props.count", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property, { "Property", "tnef.property", FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_tag, { "Tag", "tnef.property.tag", FT_UINT32, BASE_HEX, VALS(nspi_MAPITAGS_vals), 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_tag_type, { "Type", "tnef.property.tag.type", FT_UINT16, BASE_HEX, VALS(nspi_property_types_vals), 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_tag_id, { "Tag", "tnef.property.tag.id", FT_UINT16, BASE_HEX, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_tag_set, { "Set", "tnef.attribute.tag.set", FT_GUID, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_tag_kind, { "Kind", "tnef.attribute.tag.kind", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_tag_name_id, { "Name", "tnef.attribute.tag.name.id", FT_UINT32, BASE_HEX, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_tag_name_length, { "Length", "tnef.attribute.tag.name.length", FT_UINT32, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_tag_name_string, { "Name", "tnef.attribute.tag.name.string", FT_STRING, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_property_padding, { "Padding", "tnef.property.padding", FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_padding, { "Padding", "tnef.padding", FT_NONE, BASE_NONE, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_values_count, { "Count", "tnef.values.count", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_value_length, { "Length", "tnef.value.length", FT_UINT16, BASE_DEC, NULL, 0x0, - NULL, HFILL }}, + NULL, HFILL }}, { &hf_tnef_PropValue_i, { "I", "tnef.PropValue.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_tnef_PropValue_l, @@ -803,8 +803,8 @@ proto_register_tnef(void) }; static ei_register_info ei[] = { - { &ei_tnef_expect_single_item, { "tnef.expect_single_item", PI_MALFORMED, PI_ERROR, "Expected single item", EXPFILL }}, - { &ei_tnef_incorrect_signature, { "tnef.signature.incorrect", PI_MALFORMED, PI_WARN, "Incorrect signature", EXPFILL }}, + { &ei_tnef_expect_single_item, { "tnef.expect_single_item", PI_MALFORMED, PI_ERROR, "Expected single item", EXPFILL }}, + { &ei_tnef_incorrect_signature, { "tnef.signature.incorrect", PI_MALFORMED, PI_WARN, "Incorrect signature", EXPFILL }}, }; expert_module_t* expert_tnef; |