summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2014-10-05 22:14:57 -0400
committerBill Meier <wmeier@newsguy.com>2014-10-06 02:55:49 +0000
commit07698d536b72f5267ebe654b0b0cbc394b713ce1 (patch)
tree1ae72c69e7e2ac830cf3ac3752da6c9fe067ee15
parent0111e461938d47efd1eb8dc17f135b93b253ab52 (diff)
downloadwireshark-07698d536b72f5267ebe654b0b0cbc394b713ce1.tar.gz
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
-rw-r--r--epan/dissectors/packet-bssgp.c334
-rw-r--r--epan/dissectors/packet-dcerpc-krb5rpc.c2
-rw-r--r--epan/dissectors/packet-gsm_a_bssmap.c564
-rw-r--r--epan/dissectors/packet-gtpv2.c64
-rw-r--r--epan/dissectors/packet-null.c4
-rw-r--r--epan/dissectors/packet-ripng.c18
-rw-r--r--epan/dissectors/packet-rtacser.c21
-rw-r--r--epan/dissectors/packet-s7comm_szl_ids.c6
-rw-r--r--epan/dissectors/packet-tnef.c104
-rw-r--r--epan/wmem/wmem_core.c4
-rw-r--r--epan/wslua/wslua_field.c4
-rw-r--r--plugins/ethercat/packet-ecatmb.c2
-rw-r--r--plugins/profinet/packet-dcerpc-pn-io.c10
-rw-r--r--ui/cli/tap-rtp.c58
-rw-r--r--ui/decode_as_utils.c4
-rw-r--r--ui/export_object_smb.c676
-rw-r--r--ui/iface_lists.c32
-rw-r--r--ui/time_shift.c194
-rw-r--r--ui/win32/console_win32.c90
-rw-r--r--wsutil/filesystem.c144
20 files changed, 1167 insertions, 1168 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;
diff --git a/epan/wmem/wmem_core.c b/epan/wmem/wmem_core.c
index 5215ece1e8..fb3fa2fea2 100644
--- a/epan/wmem/wmem_core.c
+++ b/epan/wmem/wmem_core.c
@@ -171,8 +171,8 @@ wmem_allocator_new(const wmem_allocator_type_t type)
default:
g_assert_not_reached();
/* This is necessary to squelch MSVC errors; is there
- any way to tell it that g_assert_not_reached()
- never returns? */
+ any way to tell it that g_assert_not_reached()
+ never returns? */
return NULL;
};
diff --git a/epan/wslua/wslua_field.c b/epan/wslua/wslua_field.c
index 6693ea1489..ad757929bd 100644
--- a/epan/wslua/wslua_field.c
+++ b/epan/wslua/wslua_field.c
@@ -581,14 +581,14 @@ WSLUA_METAMETHOD Field__call (lua_State* L) {
items_found++;
}
}
- in = (in->same_name_prev_id != -1) ? proto_registrar_get_nth(in->same_name_prev_id) : NULL;
+ in = (in->same_name_prev_id != -1) ? proto_registrar_get_nth(in->same_name_prev_id) : NULL;
}
WSLUA_RETURN(items_found); /* All the values of this field */
}
WSLUA_METAMETHOD Field__tostring(lua_State* L) {
- /* Obtain a string with the field name. */
+ /* Obtain a string with the field name. */
Field f = checkField(L,1);
if (wanted_fields) {
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index 5497d50ddf..0053f9aaa1 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -568,7 +568,7 @@ static void SoeFormatter(tvbuff_t *tvb, gint offset, char *szText, gint nMax, gu
break;
case 6:
g_snprintf ( szText, nMax, "SoE: EMGCY");
- break;
+ break;
default:
g_snprintf ( szText, nMax, "SoE:");
}
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index f8ebf4c1c6..e0d110efbf 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -6659,8 +6659,8 @@ dissect_LogData_block(tvbuff_t *tvb, int offset,
guint64 u64LocaltimeStamp;
e_uuid_t aruuid;
guint32 u32EntryDetail;
- dcerpc_info di; /* fake dcerpc_info struct */
- dcerpc_call_value call_data;
+ dcerpc_info di; /* fake dcerpc_info struct */
+ dcerpc_call_value call_data;
if (u8BlockVersionHigh != 1 || u8BlockVersionLow != 0) {
expert_add_info_format(pinfo, item, &ei_pn_io_block_version,
@@ -6668,10 +6668,10 @@ dissect_LogData_block(tvbuff_t *tvb, int offset,
return offset;
}
- di.conformant_run = 0;
- /* we need di->call_data->flags.NDR64 == 0 */
+ di.conformant_run = 0;
+ /* we need di->call_data->flags.NDR64 == 0 */
call_data.flags = 0;
- di.call_data = &call_data;
+ di.call_data = &call_data;
di.dcerpc_procedure_name = "";
/* ActualLocalTimeStamp */
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c
index 11322dab84..8ab5d3fe9a 100644
--- a/ui/cli/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
@@ -85,19 +85,19 @@ rtp_streams_stat_draw(void *arg _U_)
/* payload type */
if(strinfo->pt>95){
- if(strinfo->info_payload_type_str != NULL){
+ if(strinfo->info_payload_type_str != NULL){
payload_type = g_strdup(strinfo->info_payload_type_str);
- }else{
- payload_type = g_strdup_printf("Unknown(%u)",strinfo->pt);
- }
+ }else{
+ payload_type = g_strdup_printf("Unknown(%u)",strinfo->pt);
+ }
}else{
- payload_type = g_strdup(val_to_str_ext(strinfo->pt, &rtp_payload_type_vals_ext,
- "Unknown (%u)"));
+ payload_type = g_strdup(val_to_str_ext(strinfo->pt, &rtp_payload_type_vals_ext,
+ "Unknown (%u)"));
}
/* packet count, lost packets */
- expected = (strinfo->rtp_stats.stop_seq_nr + strinfo->rtp_stats.cycles*65536)
+ expected = (strinfo->rtp_stats.stop_seq_nr + strinfo->rtp_stats.cycles*65536)
- strinfo->rtp_stats.start_seq_nr + 1;
lost = expected - strinfo->rtp_stats.total_nr;
if (expected){
@@ -108,21 +108,21 @@ rtp_streams_stat_draw(void *arg _U_)
printf("%15s %5u %15s %5u 0x%08X %16s %5u %5d (%.1f%%) %15.2f %15.2f %15.2f %s\n",
ep_address_to_display(&(strinfo->src_addr)),
- strinfo->src_port,
- ep_address_to_display(&(strinfo->dest_addr)),
- strinfo->dest_port,
- strinfo->ssrc,
- payload_type,
- strinfo->npackets,
- lost, perc,
- strinfo->rtp_stats.max_delta,
- strinfo->rtp_stats.max_jitter,
- strinfo->rtp_stats.mean_jitter,
- (strinfo->problem)?"X":"");
-
- list = g_list_next(list);
-
- g_free(payload_type);
+ strinfo->src_port,
+ ep_address_to_display(&(strinfo->dest_addr)),
+ strinfo->dest_port,
+ strinfo->ssrc,
+ payload_type,
+ strinfo->npackets,
+ lost, perc,
+ strinfo->rtp_stats.max_delta,
+ strinfo->rtp_stats.max_jitter,
+ strinfo->rtp_stats.mean_jitter,
+ (strinfo->problem)?"X":"");
+
+ list = g_list_next(list);
+
+ g_free(payload_type);
}
@@ -136,19 +136,19 @@ rtp_streams_stat_draw(void *arg _U_)
static void
rtp_streams_stat_init(const char *opt_arg _U_, void* userdata _U_)
{
- GString *err_p;
+ GString *err_p;
err_p =
- register_tap_listener("rtp", &the_tapinfo_struct, NULL, 0,
- rtpstream_reset_cb,
- rtpstream_packet,
- rtp_streams_stat_draw);
+ register_tap_listener("rtp", &the_tapinfo_struct, NULL, 0,
+ rtpstream_reset_cb,
+ rtpstream_packet,
+ rtp_streams_stat_draw);
if (err_p != NULL)
{
- g_string_free(err_p, TRUE);
+ g_string_free(err_p, TRUE);
- exit(1);
+ exit(1);
}
}
diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index 5a29b3a4ee..8db4f2dff3 100644
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -92,8 +92,8 @@ change_dissector_if_matched(gpointer item, gpointer user_data)
*/
static prefs_set_pref_e
read_set_decode_as_entries(gchar *key, const gchar *value,
- void *user_data _U_,
- gboolean return_range_errors _U_)
+ void *user_data _U_,
+ gboolean return_range_errors _U_)
{
gchar *values[4] = {NULL, NULL, NULL, NULL};
gchar delimiter[4] = {',', ',', ',','\0'};
diff --git a/ui/export_object_smb.c b/ui/export_object_smb.c
index 704b2cd155..de866916dc 100644
--- a/ui/export_object_smb.c
+++ b/ui/export_object_smb.c
@@ -47,29 +47,29 @@
#define LEGAL_FILENAME_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890_.- /\\{}[]=()&%$!,;.+&%$~#@"
static const value_string smb_eo_contains_string[] = {
- {SMB_EO_CONTAINS_NOTHING, "" },
- {SMB_EO_CONTAINS_READS, "R" },
- {SMB_EO_CONTAINS_WRITES, "W" },
- {SMB_EO_CONTAINS_READSANDWRITES, "R&W"},
- {0, NULL}
+ {SMB_EO_CONTAINS_NOTHING, "" },
+ {SMB_EO_CONTAINS_READS, "R" },
+ {SMB_EO_CONTAINS_WRITES, "W" },
+ {SMB_EO_CONTAINS_READSANDWRITES, "R&W"},
+ {0, NULL}
};
/* Strings that describes the SMB object type */
static const value_string smb_fid_types[] = {
- {SMB_FID_TYPE_UNKNOWN,"UNKNOWN"},
- {SMB_FID_TYPE_FILE,"FILE"},
- {SMB_FID_TYPE_DIR,"DIRECTORY (Not Implemented)"},
- {SMB_FID_TYPE_PIPE,"PIPE (Not Implemented)"},
- {0, NULL}
+ {SMB_FID_TYPE_UNKNOWN,"UNKNOWN"},
+ {SMB_FID_TYPE_FILE,"FILE"},
+ {SMB_FID_TYPE_DIR,"DIRECTORY (Not Implemented)"},
+ {SMB_FID_TYPE_PIPE,"PIPE (Not Implemented)"},
+ {0, NULL}
};
static const value_string smb2_fid_types[] = {
- {SMB2_FID_TYPE_UNKNOWN,"UNKNOWN"},
- {SMB2_FID_TYPE_FILE,"FILE"},
- {SMB2_FID_TYPE_DIR,"DIRECTORY (Not Implemented)"},
- {SMB2_FID_TYPE_PIPE,"PIPE (Not Implemented)"},
- {SMB2_FID_TYPE_OTHER,"OTHER (Not Implemented)"},
- {0, NULL}
+ {SMB2_FID_TYPE_UNKNOWN,"UNKNOWN"},
+ {SMB2_FID_TYPE_FILE,"FILE"},
+ {SMB2_FID_TYPE_DIR,"DIRECTORY (Not Implemented)"},
+ {SMB2_FID_TYPE_PIPE,"PIPE (Not Implemented)"},
+ {SMB2_FID_TYPE_OTHER,"OTHER (Not Implemented)"},
+ {0, NULL}
};
/* This struct contains the relationship between
@@ -112,323 +112,323 @@ typedef struct _free_chunk {
static void
insert_chunk(active_file *file, export_object_entry_t *entry, const smb_eo_t *eo_info)
{
-gint nfreechunks = g_slist_length(file->free_chunk_list);
-gint i;
-free_chunk *current_free_chunk;
-free_chunk *new_free_chunk;
-guint64 chunk_offset = eo_info->smb_file_offset;
-guint64 chunk_length = eo_info->payload_len;
-guint64 chunk_end_offset = chunk_offset + chunk_length-1;
+ gint nfreechunks = g_slist_length(file->free_chunk_list);
+ gint i;
+ free_chunk *current_free_chunk;
+ free_chunk *new_free_chunk;
+ guint64 chunk_offset = eo_info->smb_file_offset;
+ guint64 chunk_length = eo_info->payload_len;
+ guint64 chunk_end_offset = chunk_offset + chunk_length-1;
/* Size of file in memory */
-guint64 calculated_size = chunk_offset + chunk_length;
-gpointer dest_memory_addr;
-
- /* Let's recalculate the file length and data gathered */
- if ((file->data_gathered == 0) && (nfreechunks == 0)) {
- /* If this is the first entry for this file, we first
- create an initial free chunk */
- new_free_chunk = (free_chunk *)g_malloc(sizeof(free_chunk));
- new_free_chunk->start_offset = 0;
- new_free_chunk->end_offset = MAX(file->file_length, chunk_end_offset+1) - 1;
- file->free_chunk_list = NULL;
- file->free_chunk_list = g_slist_append(file->free_chunk_list, new_free_chunk);
- nfreechunks += 1;
- } else {
- if (chunk_end_offset > file->file_length-1) {
- new_free_chunk = (free_chunk *)g_malloc(sizeof(free_chunk));
- new_free_chunk->start_offset = file->file_length;
- new_free_chunk->end_offset = chunk_end_offset;
- file->free_chunk_list = g_slist_append(file->free_chunk_list, new_free_chunk);
- nfreechunks += 1;
- }
- }
- file->file_length = MAX(file->file_length, chunk_end_offset+1);
-
- /* Recalculate each free chunk according with the incoming data chunk */
- for (i=0; i<nfreechunks; i++) {
- current_free_chunk = (free_chunk *)g_slist_nth_data(file->free_chunk_list, i);
- /* 1. data chunk before the free chunk? */
- /* -> free chunk is not altered and no new data gathered */
- if (chunk_end_offset<current_free_chunk->start_offset) {
- continue;
- }
- /* 2. data chunk overlaps the first part of free_chunk */
- /* -> free chunk shrinks from the beginning */
- if (chunk_offset<=current_free_chunk->start_offset && chunk_end_offset>=current_free_chunk->start_offset && chunk_end_offset<current_free_chunk->end_offset) {
- file->data_gathered += chunk_end_offset-current_free_chunk->start_offset+1;
- current_free_chunk->start_offset=chunk_end_offset+1;
- continue;
- }
- /* 3. data chunk overlaps completely the free chunk */
- /* -> free chunk is removed */
- if (chunk_offset<=current_free_chunk->start_offset && chunk_end_offset>=current_free_chunk->end_offset) {
- file->data_gathered += current_free_chunk->end_offset-current_free_chunk->start_offset+1;
- file->free_chunk_list = g_slist_remove(file->free_chunk_list, current_free_chunk);
- nfreechunks -= 1;
- if (nfreechunks == 0) { /* The free chunk list is empty */
- g_slist_free(file->free_chunk_list);
- file->free_chunk_list = NULL;
- break;
- }
- i--;
- continue;
- }
- /* 4. data chunk is inside the free chunk */
- /* -> free chunk is splitted into two */
- if (chunk_offset>current_free_chunk->start_offset && chunk_end_offset<current_free_chunk->end_offset) {
- new_free_chunk = (free_chunk *)g_malloc(sizeof(free_chunk));
- new_free_chunk->start_offset = chunk_end_offset + 1;
- new_free_chunk->end_offset = current_free_chunk->end_offset;
- current_free_chunk->end_offset = chunk_offset-1;
- file->free_chunk_list = g_slist_insert(file->free_chunk_list, new_free_chunk, i + 1);
- file->data_gathered += chunk_length;
- continue;
- }
- /* 5.- data chunk overlaps the end part of free chunk */
- /* -> free chunk shrinks from the end */
- if (chunk_offset>current_free_chunk->start_offset && chunk_offset<=current_free_chunk->end_offset && chunk_end_offset>=current_free_chunk->end_offset) {
- file->data_gathered += current_free_chunk->end_offset-chunk_offset+1;
- current_free_chunk->end_offset = chunk_offset-1;
- continue;
- }
- /* 6.- data chunk is after the free chunk */
- /* -> free chunk is not altered and no new data gathered */
- if (chunk_offset>current_free_chunk->end_offset) {
- continue;
- }
- }
-
- /* Now, let's insert the data chunk into memory
- ...first, we shall be able to allocate the memory */
- if (!entry->payload_data) {
- /* This is a New file */
- if (calculated_size > G_MAXSIZE) {
- /*
- * The argument to g_try_malloc() is
- * a gsize, the maximum value of which is
- * G_MAXSIZE. If the calculated size is
- * bigger than that, we just say the attempt
- * to allocate memory failed.
- */
- entry->payload_data = NULL;
- } else {
- entry->payload_data = (guint8 *)g_try_malloc((gsize)calculated_size);
- entry->payload_len = calculated_size;
- }
- if (!entry->payload_data) {
- /* Memory error */
- file->is_out_of_memory = TRUE;
- }
- } else {
- /* This is an existing file in memory */
- if (calculated_size > (guint64) entry->payload_len &&
- !file->is_out_of_memory) {
- /* We need more memory */
- if (calculated_size > G_MAXSIZE) {
- /*
- * As for g_try_malloc(), so for
- * g_try_realloc().
- */
- dest_memory_addr = NULL;
- } else {
- dest_memory_addr = g_try_realloc(
- entry->payload_data,
- (gsize)calculated_size);
- }
- if (!dest_memory_addr) {
- /* Memory error */
- file->is_out_of_memory = TRUE;
- /* We don't have memory for this file.
- Free the current file content from memory */
- g_free(entry->payload_data);
- entry->payload_data = NULL;
- entry->payload_len = 0;
- } else {
- entry->payload_data = (guint8 *)dest_memory_addr;
- entry->payload_len = calculated_size;
- }
- }
- }
- /* ...then, put the chunk of the file in the right place */
- if (!file->is_out_of_memory) {
- dest_memory_addr = entry->payload_data + chunk_offset;
- memmove(dest_memory_addr, eo_info->payload_data, eo_info->payload_len);
- }
+ guint64 calculated_size = chunk_offset + chunk_length;
+ gpointer dest_memory_addr;
+
+ /* Let's recalculate the file length and data gathered */
+ if ((file->data_gathered == 0) && (nfreechunks == 0)) {
+ /* If this is the first entry for this file, we first
+ create an initial free chunk */
+ new_free_chunk = (free_chunk *)g_malloc(sizeof(free_chunk));
+ new_free_chunk->start_offset = 0;
+ new_free_chunk->end_offset = MAX(file->file_length, chunk_end_offset+1) - 1;
+ file->free_chunk_list = NULL;
+ file->free_chunk_list = g_slist_append(file->free_chunk_list, new_free_chunk);
+ nfreechunks += 1;
+ } else {
+ if (chunk_end_offset > file->file_length-1) {
+ new_free_chunk = (free_chunk *)g_malloc(sizeof(free_chunk));
+ new_free_chunk->start_offset = file->file_length;
+ new_free_chunk->end_offset = chunk_end_offset;
+ file->free_chunk_list = g_slist_append(file->free_chunk_list, new_free_chunk);
+ nfreechunks += 1;
+ }
+ }
+ file->file_length = MAX(file->file_length, chunk_end_offset+1);
+
+ /* Recalculate each free chunk according with the incoming data chunk */
+ for (i=0; i<nfreechunks; i++) {
+ current_free_chunk = (free_chunk *)g_slist_nth_data(file->free_chunk_list, i);
+ /* 1. data chunk before the free chunk? */
+ /* -> free chunk is not altered and no new data gathered */
+ if (chunk_end_offset<current_free_chunk->start_offset) {
+ continue;
+ }
+ /* 2. data chunk overlaps the first part of free_chunk */
+ /* -> free chunk shrinks from the beginning */
+ if (chunk_offset<=current_free_chunk->start_offset && chunk_end_offset>=current_free_chunk->start_offset && chunk_end_offset<current_free_chunk->end_offset) {
+ file->data_gathered += chunk_end_offset-current_free_chunk->start_offset+1;
+ current_free_chunk->start_offset=chunk_end_offset+1;
+ continue;
+ }
+ /* 3. data chunk overlaps completely the free chunk */
+ /* -> free chunk is removed */
+ if (chunk_offset<=current_free_chunk->start_offset && chunk_end_offset>=current_free_chunk->end_offset) {
+ file->data_gathered += current_free_chunk->end_offset-current_free_chunk->start_offset+1;
+ file->free_chunk_list = g_slist_remove(file->free_chunk_list, current_free_chunk);
+ nfreechunks -= 1;
+ if (nfreechunks == 0) { /* The free chunk list is empty */
+ g_slist_free(file->free_chunk_list);
+ file->free_chunk_list = NULL;
+ break;
+ }
+ i--;
+ continue;
+ }
+ /* 4. data chunk is inside the free chunk */
+ /* -> free chunk is splitted into two */
+ if (chunk_offset>current_free_chunk->start_offset && chunk_end_offset<current_free_chunk->end_offset) {
+ new_free_chunk = (free_chunk *)g_malloc(sizeof(free_chunk));
+ new_free_chunk->start_offset = chunk_end_offset + 1;
+ new_free_chunk->end_offset = current_free_chunk->end_offset;
+ current_free_chunk->end_offset = chunk_offset-1;
+ file->free_chunk_list = g_slist_insert(file->free_chunk_list, new_free_chunk, i + 1);
+ file->data_gathered += chunk_length;
+ continue;
+ }
+ /* 5.- data chunk overlaps the end part of free chunk */
+ /* -> free chunk shrinks from the end */
+ if (chunk_offset>current_free_chunk->start_offset && chunk_offset<=current_free_chunk->end_offset && chunk_end_offset>=current_free_chunk->end_offset) {
+ file->data_gathered += current_free_chunk->end_offset-chunk_offset+1;
+ current_free_chunk->end_offset = chunk_offset-1;
+ continue;
+ }
+ /* 6.- data chunk is after the free chunk */
+ /* -> free chunk is not altered and no new data gathered */
+ if (chunk_offset>current_free_chunk->end_offset) {
+ continue;
+ }
+ }
+
+ /* Now, let's insert the data chunk into memory
+ ...first, we shall be able to allocate the memory */
+ if (!entry->payload_data) {
+ /* This is a New file */
+ if (calculated_size > G_MAXSIZE) {
+ /*
+ * The argument to g_try_malloc() is
+ * a gsize, the maximum value of which is
+ * G_MAXSIZE. If the calculated size is
+ * bigger than that, we just say the attempt
+ * to allocate memory failed.
+ */
+ entry->payload_data = NULL;
+ } else {
+ entry->payload_data = (guint8 *)g_try_malloc((gsize)calculated_size);
+ entry->payload_len = calculated_size;
+ }
+ if (!entry->payload_data) {
+ /* Memory error */
+ file->is_out_of_memory = TRUE;
+ }
+ } else {
+ /* This is an existing file in memory */
+ if (calculated_size > (guint64) entry->payload_len &&
+ !file->is_out_of_memory) {
+ /* We need more memory */
+ if (calculated_size > G_MAXSIZE) {
+ /*
+ * As for g_try_malloc(), so for
+ * g_try_realloc().
+ */
+ dest_memory_addr = NULL;
+ } else {
+ dest_memory_addr = g_try_realloc(
+ entry->payload_data,
+ (gsize)calculated_size);
+ }
+ if (!dest_memory_addr) {
+ /* Memory error */
+ file->is_out_of_memory = TRUE;
+ /* We don't have memory for this file.
+ Free the current file content from memory */
+ g_free(entry->payload_data);
+ entry->payload_data = NULL;
+ entry->payload_len = 0;
+ } else {
+ entry->payload_data = (guint8 *)dest_memory_addr;
+ entry->payload_len = calculated_size;
+ }
+ }
+ }
+ /* ...then, put the chunk of the file in the right place */
+ if (!file->is_out_of_memory) {
+ dest_memory_addr = entry->payload_data + chunk_offset;
+ memmove(dest_memory_addr, eo_info->payload_data, eo_info->payload_len);
+ }
}
/* We use this function to obtain the index in the GSL of a given file */
static int
find_incoming_file(GSList *GSL_active_files_p, active_file *incoming_file)
{
- int i, row, last;
- active_file *in_list_file;
-
- row = -1;
- last = g_slist_length(GSL_active_files_p) - 1;
-
- /* We lookup in reverse order because it is more likely that the file
- is one of the latest */
- for (i=last; i>=0; i--) {
- in_list_file = (active_file *)g_slist_nth_data(GSL_active_files_p, i);
- /* The best-working criteria of two identical files is that the file
- that is the same of the file that we are analyzing is the last one
- in the list that has the same tid and the same fid */
- /* note that we have excluded in_list_file->uid == incoming_file->uid
- from the comparison, because a file can be opened by different
- SMB users and it is still the same file */
- if (in_list_file->tid == incoming_file->tid &&
- in_list_file->fid == incoming_file->fid) {
- row = i;
- break;
- }
- }
-
- return row;
+ int i, row, last;
+ active_file *in_list_file;
+
+ row = -1;
+ last = g_slist_length(GSL_active_files_p) - 1;
+
+ /* We lookup in reverse order because it is more likely that the file
+ is one of the latest */
+ for (i=last; i>=0; i--) {
+ in_list_file = (active_file *)g_slist_nth_data(GSL_active_files_p, i);
+ /* The best-working criteria of two identical files is that the file
+ that is the same of the file that we are analyzing is the last one
+ in the list that has the same tid and the same fid */
+ /* note that we have excluded in_list_file->uid == incoming_file->uid
+ from the comparison, because a file can be opened by different
+ SMB users and it is still the same file */
+ if (in_list_file->tid == incoming_file->tid &&
+ in_list_file->fid == incoming_file->fid) {
+ row = i;
+ break;
+ }
+ }
+
+ return row;
}
/* This is the function answering to the registered tap listener call */
gboolean
eo_smb_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data)
{
-export_object_list_t *object_list = (export_object_list_t *)tapdata;
-const smb_eo_t *eo_info = (const smb_eo_t *)data;
-
-export_object_entry_t *entry;
-export_object_entry_t *current_entry;
-active_file incoming_file;
-gint active_row;
-active_file *new_file;
-active_file *current_file;
-guint8 contains;
-gboolean is_supported_filetype;
-gfloat percent;
-
-gchar *aux_smb_fid_type_string;
-
- if (eo_info->smbversion==1) {
- /* Is this an eo_smb supported file_type? (right now we only support FILE) */
- is_supported_filetype = (eo_info->fid_type == SMB_FID_TYPE_FILE);
- aux_smb_fid_type_string=g_strdup(try_val_to_str(eo_info->fid_type, smb_fid_types));
-
- /* What kind of data this packet contains? */
- switch(eo_info->cmd) {
- case SMB_COM_READ_ANDX:
- case SMB_COM_READ:
- contains = SMB_EO_CONTAINS_READS;
- break;
- case SMB_COM_WRITE_ANDX:
- case SMB_COM_WRITE:
- contains = SMB_EO_CONTAINS_WRITES;
- break;
- default:
- contains = SMB_EO_CONTAINS_NOTHING;
- break;
- }
- } else {
- /* Is this an eo_smb supported file_type? (right now we only support FILE) */
- is_supported_filetype = (eo_info->fid_type == SMB2_FID_TYPE_FILE );
- aux_smb_fid_type_string=g_strdup(try_val_to_str(eo_info->fid_type, smb2_fid_types));
-
- /* What kind of data this packet contains? */
- switch(eo_info->cmd) {
- case SMB2_COM_READ:
- contains = SMB_EO_CONTAINS_READS;
- break;
- case SMB2_COM_WRITE:
- contains = SMB_EO_CONTAINS_WRITES;
- break;
- default:
- contains = SMB_EO_CONTAINS_NOTHING;
- break;
- }
- }
-
-
- /* Is this data from an already tracked file or not? */
- incoming_file.tid = eo_info->tid;
- incoming_file.uid = eo_info->uid;
- incoming_file.fid = eo_info->fid;
- active_row = find_incoming_file(GSL_active_files, &incoming_file);
-
- if (active_row == -1) { /* This is a new-tracked file */
- /* Construct the entry in the list of active files */
- entry = (export_object_entry_t *)g_malloc(sizeof(export_object_entry_t));
- entry->payload_data = NULL;
- entry->payload_len = 0;
- new_file = (active_file *)g_malloc(sizeof(active_file));
- new_file->tid = incoming_file.tid;
- new_file->uid = incoming_file.uid;
- new_file->fid = incoming_file.fid;
- new_file->file_length = eo_info->end_of_file;
- new_file->flag_contains = contains;
- new_file->free_chunk_list = NULL;
- new_file->data_gathered = 0;
- new_file->is_out_of_memory = FALSE;
- entry->pkt_num = pinfo->fd->num;
-
- entry->hostname=g_filename_display_name(g_strcanon(eo_info->hostname,LEGAL_FILENAME_CHARS,'?'));
- entry->filename=g_filename_display_name(g_strcanon(eo_info->filename,LEGAL_FILENAME_CHARS,'?'));
-
- /* Insert the first chunk in the chunk list of this file */
- if (is_supported_filetype) {
- insert_chunk(new_file, entry, eo_info);
- }
-
- if (new_file->is_out_of_memory) {
- entry->content_type =
- g_strdup_printf("%s (%"G_GUINT64_FORMAT"?/%"G_GUINT64_FORMAT") %s [mem!!]",
- aux_smb_fid_type_string,
- new_file->data_gathered,
- new_file->file_length,
- try_val_to_str(contains, smb_eo_contains_string));
- } else {
- if (new_file->file_length > 0) {
- percent = (gfloat) (100*new_file->data_gathered/new_file->file_length);
- } else {
- percent = 0.0f;
- }
-
- entry->content_type =
- g_strdup_printf("%s (%"G_GUINT64_FORMAT"/%"G_GUINT64_FORMAT") %s [%5.2f%%]",
- aux_smb_fid_type_string,
- new_file->data_gathered,
- new_file->file_length,
- try_val_to_str(contains, smb_eo_contains_string),
- percent);
- }
-
- object_list_add_entry(object_list, entry);
- GSL_active_files = g_slist_append(GSL_active_files, new_file);
- }
- else if (is_supported_filetype) {
- current_file = (active_file *)g_slist_nth_data(GSL_active_files, active_row);
- /* Recalculate the current file flags */
- current_file->flag_contains = current_file->flag_contains|contains;
- current_entry = object_list_get_entry(object_list, active_row);
-
- insert_chunk(current_file, current_entry, eo_info);
-
- /* Modify the current_entry object_type string */
- if (current_file->is_out_of_memory) {
- current_entry->content_type =
- g_strdup_printf("%s (%"G_GUINT64_FORMAT"?/%"G_GUINT64_FORMAT") %s [mem!!]",
- aux_smb_fid_type_string,
- current_file->data_gathered,
- current_file->file_length,
- try_val_to_str(current_file->flag_contains, smb_eo_contains_string));
- } else {
- percent = (gfloat) (100*current_file->data_gathered/current_file->file_length);
- current_entry->content_type =
- g_strdup_printf("%s (%"G_GUINT64_FORMAT"/%"G_GUINT64_FORMAT") %s [%5.2f%%]",
- aux_smb_fid_type_string,
- current_file->data_gathered,
- current_file->file_length,
- try_val_to_str(current_file->flag_contains, smb_eo_contains_string),
- percent);
- }
- }
-
- return TRUE; /* State changed - window should be redrawn */
+ export_object_list_t *object_list = (export_object_list_t *)tapdata;
+ const smb_eo_t *eo_info = (const smb_eo_t *)data;
+
+ export_object_entry_t *entry;
+ export_object_entry_t *current_entry;
+ active_file incoming_file;
+ gint active_row;
+ active_file *new_file;
+ active_file *current_file;
+ guint8 contains;
+ gboolean is_supported_filetype;
+ gfloat percent;
+
+ gchar *aux_smb_fid_type_string;
+
+ if (eo_info->smbversion==1) {
+ /* Is this an eo_smb supported file_type? (right now we only support FILE) */
+ is_supported_filetype = (eo_info->fid_type == SMB_FID_TYPE_FILE);
+ aux_smb_fid_type_string=g_strdup(try_val_to_str(eo_info->fid_type, smb_fid_types));
+
+ /* What kind of data this packet contains? */
+ switch(eo_info->cmd) {
+ case SMB_COM_READ_ANDX:
+ case SMB_COM_READ:
+ contains = SMB_EO_CONTAINS_READS;
+ break;
+ case SMB_COM_WRITE_ANDX:
+ case SMB_COM_WRITE:
+ contains = SMB_EO_CONTAINS_WRITES;
+ break;
+ default:
+ contains = SMB_EO_CONTAINS_NOTHING;
+ break;
+ }
+ } else {
+ /* Is this an eo_smb supported file_type? (right now we only support FILE) */
+ is_supported_filetype = (eo_info->fid_type == SMB2_FID_TYPE_FILE );
+ aux_smb_fid_type_string=g_strdup(try_val_to_str(eo_info->fid_type, smb2_fid_types));
+
+ /* What kind of data this packet contains? */
+ switch(eo_info->cmd) {
+ case SMB2_COM_READ:
+ contains = SMB_EO_CONTAINS_READS;
+ break;
+ case SMB2_COM_WRITE:
+ contains = SMB_EO_CONTAINS_WRITES;
+ break;
+ default:
+ contains = SMB_EO_CONTAINS_NOTHING;
+ break;
+ }
+ }
+
+
+ /* Is this data from an already tracked file or not? */
+ incoming_file.tid = eo_info->tid;
+ incoming_file.uid = eo_info->uid;
+ incoming_file.fid = eo_info->fid;
+ active_row = find_incoming_file(GSL_active_files, &incoming_file);
+
+ if (active_row == -1) { /* This is a new-tracked file */
+ /* Construct the entry in the list of active files */
+ entry = (export_object_entry_t *)g_malloc(sizeof(export_object_entry_t));
+ entry->payload_data = NULL;
+ entry->payload_len = 0;
+ new_file = (active_file *)g_malloc(sizeof(active_file));
+ new_file->tid = incoming_file.tid;
+ new_file->uid = incoming_file.uid;
+ new_file->fid = incoming_file.fid;
+ new_file->file_length = eo_info->end_of_file;
+ new_file->flag_contains = contains;
+ new_file->free_chunk_list = NULL;
+ new_file->data_gathered = 0;
+ new_file->is_out_of_memory = FALSE;
+ entry->pkt_num = pinfo->fd->num;
+
+ entry->hostname=g_filename_display_name(g_strcanon(eo_info->hostname,LEGAL_FILENAME_CHARS,'?'));
+ entry->filename=g_filename_display_name(g_strcanon(eo_info->filename,LEGAL_FILENAME_CHARS,'?'));
+
+ /* Insert the first chunk in the chunk list of this file */
+ if (is_supported_filetype) {
+ insert_chunk(new_file, entry, eo_info);
+ }
+
+ if (new_file->is_out_of_memory) {
+ entry->content_type =
+ g_strdup_printf("%s (%"G_GUINT64_FORMAT"?/%"G_GUINT64_FORMAT") %s [mem!!]",
+ aux_smb_fid_type_string,
+ new_file->data_gathered,
+ new_file->file_length,
+ try_val_to_str(contains, smb_eo_contains_string));
+ } else {
+ if (new_file->file_length > 0) {
+ percent = (gfloat) (100*new_file->data_gathered/new_file->file_length);
+ } else {
+ percent = 0.0f;
+ }
+
+ entry->content_type =
+ g_strdup_printf("%s (%"G_GUINT64_FORMAT"/%"G_GUINT64_FORMAT") %s [%5.2f%%]",
+ aux_smb_fid_type_string,
+ new_file->data_gathered,
+ new_file->file_length,
+ try_val_to_str(contains, smb_eo_contains_string),
+ percent);
+ }
+
+ object_list_add_entry(object_list, entry);
+ GSL_active_files = g_slist_append(GSL_active_files, new_file);
+ }
+ else if (is_supported_filetype) {
+ current_file = (active_file *)g_slist_nth_data(GSL_active_files, active_row);
+ /* Recalculate the current file flags */
+ current_file->flag_contains = current_file->flag_contains|contains;
+ current_entry = object_list_get_entry(object_list, active_row);
+
+ insert_chunk(current_file, current_entry, eo_info);
+
+ /* Modify the current_entry object_type string */
+ if (current_file->is_out_of_memory) {
+ current_entry->content_type =
+ g_strdup_printf("%s (%"G_GUINT64_FORMAT"?/%"G_GUINT64_FORMAT") %s [mem!!]",
+ aux_smb_fid_type_string,
+ current_file->data_gathered,
+ current_file->file_length,
+ try_val_to_str(current_file->flag_contains, smb_eo_contains_string));
+ } else {
+ percent = (gfloat) (100*current_file->data_gathered/current_file->file_length);
+ current_entry->content_type =
+ g_strdup_printf("%s (%"G_GUINT64_FORMAT"/%"G_GUINT64_FORMAT") %s [%5.2f%%]",
+ aux_smb_fid_type_string,
+ current_file->data_gathered,
+ current_file->file_length,
+ try_val_to_str(current_file->flag_contains, smb_eo_contains_string),
+ percent);
+ }
+ }
+
+ return TRUE; /* State changed - window should be redrawn */
}
@@ -438,24 +438,24 @@ gchar *aux_smb_fid_type_string;
void
eo_smb_cleanup(void)
{
-int i, last;
-active_file *in_list_file;
-
- /* Free any previous data structures used in previous invocation to the
- export_object_smb function */
- last = g_slist_length(GSL_active_files);
- if (GSL_active_files) {
- for (i=last-1; i>=0; i--) {
- in_list_file = (active_file *)g_slist_nth_data(GSL_active_files, i);
- if (in_list_file->free_chunk_list) {
- g_slist_free(in_list_file->free_chunk_list);
- in_list_file->free_chunk_list = NULL;
- }
- g_free(in_list_file);
- }
- g_slist_free(GSL_active_files);
- GSL_active_files = NULL;
- }
+ int i, last;
+ active_file *in_list_file;
+
+ /* Free any previous data structures used in previous invocation to the
+ export_object_smb function */
+ last = g_slist_length(GSL_active_files);
+ if (GSL_active_files) {
+ for (i=last-1; i>=0; i--) {
+ in_list_file = (active_file *)g_slist_nth_data(GSL_active_files, i);
+ if (in_list_file->free_chunk_list) {
+ g_slist_free(in_list_file->free_chunk_list);
+ in_list_file->free_chunk_list = NULL;
+ }
+ g_free(in_list_file);
+ }
+ g_slist_free(GSL_active_files);
+ GSL_active_files = NULL;
+ }
}
/*
diff --git a/ui/iface_lists.c b/ui/iface_lists.c
index 1cf3dfeffb..5f0241d44f 100644
--- a/ui/iface_lists.c
+++ b/ui/iface_lists.c
@@ -160,12 +160,12 @@ scan_local_interfaces(void (*update_cb)(void))
*/
if_string = g_strdup_printf("%s", if_info->friendly_name);
#else
- /*
- * On UN*X, if we have a friendly name, show it along
- * with the interface name; the interface name is short
- * and somewhat friendly, and many UN*X users are used
- * to interface names, so we should show it.
- */
+ /*
+ * On UN*X, if we have a friendly name, show it along
+ * with the interface name; the interface name is short
+ * and somewhat friendly, and many UN*X users are used
+ * to interface names, so we should show it.
+ */
if_string = g_strdup_printf("%s: %s", if_info->friendly_name, if_info->name);
#endif
} else if (if_info->vendor_description != NULL) {
@@ -400,24 +400,24 @@ scan_local_interfaces(void (*update_cb)(void))
void
fill_in_local_interfaces(void(*update_cb)(void))
{
- GTimeVal start_time;
- GTimeVal end_time;
- float elapsed;
- static gboolean initialized = FALSE;
+ GTimeVal start_time;
+ GTimeVal end_time;
+ float elapsed;
+ static gboolean initialized = FALSE;
- /* record the time we started, so we can log total time later */
- g_get_current_time(&start_time);
- g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "fill_in_local_interfaces() starts");
+ /* record the time we started, so we can log total time later */
+ g_get_current_time(&start_time);
+ g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "fill_in_local_interfaces() starts");
if (!initialized) {
- /* do the actual work */
+ /* do the actual work */
scan_local_interfaces(update_cb);
initialized = TRUE;
}
- /* log how long it took */
+ /* log how long it took */
g_get_current_time(&end_time);
elapsed = (float) ((end_time.tv_sec - start_time.tv_sec) +
- ((end_time.tv_usec - start_time.tv_usec) / 1e6));
+ ((end_time.tv_usec - start_time.tv_usec) / 1e6));
g_log(LOG_DOMAIN_MAIN, G_LOG_LEVEL_INFO, "fill_in_local_interfaces() ends, taking %.3fs", elapsed);
}
diff --git a/ui/time_shift.c b/ui/time_shift.c
index 67c091d7d1..177a11b935 100644
--- a/ui/time_shift.c
+++ b/ui/time_shift.c
@@ -34,59 +34,59 @@
#include "ui/ui_util.h"
-#define SHIFT_POS 0
-#define SHIFT_NEG 1
-#define SHIFT_SETTOZERO 1
-#define SHIFT_KEEPOFFSET 0
-
-#define CHECK_YEARS(Y) \
- if (*Y < 1970) { \
- return "Years must be larger than 1970"; \
- }
-#define CHECK_MONTHS(M) \
- if (*M < 1 || *M > 12) { \
- return "Months must be between [1..12]"; \
- }
-#define CHECK_DAYS(D) \
- if (*D < 1 || *D > 31) { \
- return "Days must be between [1..31]"; \
- }
-#define CHECK_HOURS(h) \
- if (*h < 0 || *h > 23) { \
- return "Hours must be between [0..23]"; \
- }
-#define CHECK_HOUR(h) \
- if (*h < 0) { \
- return "Negative hours. Have you specified more than " \
- "one minus character?"; \
- }
-#define CHECK_MINUTE(m) \
- if (*m < 0 || *m > 59) { \
- return "Minutes must be between [0..59]"; \
- }
-#define CHECK_SECOND(s) \
- if (*s < 0 || *s > 59) { \
- return "Seconds must be between [0..59]"; \
- }
+#define SHIFT_POS 0
+#define SHIFT_NEG 1
+#define SHIFT_SETTOZERO 1
+#define SHIFT_KEEPOFFSET 0
+
+#define CHECK_YEARS(Y) \
+ if (*Y < 1970) { \
+ return "Years must be larger than 1970"; \
+ }
+#define CHECK_MONTHS(M) \
+ if (*M < 1 || *M > 12) { \
+ return "Months must be between [1..12]"; \
+ }
+#define CHECK_DAYS(D) \
+ if (*D < 1 || *D > 31) { \
+ return "Days must be between [1..31]"; \
+ }
+#define CHECK_HOURS(h) \
+ if (*h < 0 || *h > 23) { \
+ return "Hours must be between [0..23]"; \
+ }
+#define CHECK_HOUR(h) \
+ if (*h < 0) { \
+ return "Negative hours. Have you specified more than " \
+ "one minus character?"; \
+ }
+#define CHECK_MINUTE(m) \
+ if (*m < 0 || *m > 59) { \
+ return "Minutes must be between [0..59]"; \
+ }
+#define CHECK_SECOND(s) \
+ if (*s < 0 || *s > 59) { \
+ return "Seconds must be between [0..59]"; \
+ }
static void
modify_time_perform(frame_data *fd, int neg, nstime_t *offset, int settozero)
{
- /* The actual shift */
- if (settozero == SHIFT_SETTOZERO) {
- nstime_subtract(&(fd->abs_ts), &(fd->shift_offset));
- nstime_set_zero(&(fd->shift_offset));
- }
-
- if (neg == SHIFT_POS) {
- nstime_add(&(fd->abs_ts), offset);
- nstime_add(&(fd->shift_offset), offset);
- } else if (neg == SHIFT_NEG) {
- nstime_subtract(&(fd->abs_ts), offset);
- nstime_subtract(&(fd->shift_offset), offset);
- } else {
- fprintf(stderr, "Modify_time_perform: neg = %d?\n", neg);
- }
+ /* The actual shift */
+ if (settozero == SHIFT_SETTOZERO) {
+ nstime_subtract(&(fd->abs_ts), &(fd->shift_offset));
+ nstime_set_zero(&(fd->shift_offset));
+ }
+
+ if (neg == SHIFT_POS) {
+ nstime_add(&(fd->abs_ts), offset);
+ nstime_add(&(fd->shift_offset), offset);
+ } else if (neg == SHIFT_NEG) {
+ nstime_subtract(&(fd->abs_ts), offset);
+ nstime_subtract(&(fd->shift_offset), offset);
+ } else {
+ fprintf(stderr, "Modify_time_perform: neg = %d?\n", neg);
+ }
}
/*
@@ -103,31 +103,31 @@ modify_time_perform(frame_data *fd, int neg, nstime_t *offset, int settozero)
*/
static void
calcNT3(nstime_t *OT1, nstime_t *OT3, nstime_t *NT1, nstime_t *NT3,
- nstime_t *deltaOT, nstime_t *deltaNT)
+ nstime_t *deltaOT, nstime_t *deltaNT)
{
- long double fnt, fot, f, secs, nsecs;
-
- fnt = (long double)deltaNT->secs + (deltaNT->nsecs / 1000000000.0L);
- fot = (long double)deltaOT->secs + (deltaOT->nsecs / 1000000000.0L);
- f = fnt / fot;
-
- nstime_copy(NT3, OT3);
- nstime_subtract(NT3, OT1);
-
- secs = f * (long double)NT3->secs;
- nsecs = f * (long double)NT3->nsecs;
- nsecs += (secs - floorl(secs)) * 1000000000.0L;
- while (nsecs > 1000000000L) {
- secs += 1;
- nsecs -= 1000000000L;
- }
- while (nsecs < 0) {
- secs -= 1;
- nsecs += 1000000000L;
- }
- NT3->secs = (time_t)secs;
- NT3->nsecs = (int)nsecs;
- nstime_add(NT3, NT1);
+ long double fnt, fot, f, secs, nsecs;
+
+ fnt = (long double)deltaNT->secs + (deltaNT->nsecs / 1000000000.0L);
+ fot = (long double)deltaOT->secs + (deltaOT->nsecs / 1000000000.0L);
+ f = fnt / fot;
+
+ nstime_copy(NT3, OT3);
+ nstime_subtract(NT3, OT1);
+
+ secs = f * (long double)NT3->secs;
+ nsecs = f * (long double)NT3->nsecs;
+ nsecs += (secs - floorl(secs)) * 1000000000.0L;
+ while (nsecs > 1000000000L) {
+ secs += 1;
+ nsecs -= 1000000000L;
+ }
+ while (nsecs < 0) {
+ secs -= 1;
+ nsecs += 1000000000L;
+ }
+ NT3->secs = (time_t)secs;
+ NT3->nsecs = (int)nsecs;
+ nstime_add(NT3, NT1);
}
const gchar *
@@ -231,10 +231,10 @@ time_string_parse(const gchar *time_text, int *year, int *month, int *day, gbool
static const gchar *
time_string_to_nstime(const gchar *time_text, nstime_t *packettime, nstime_t *nstime)
{
- int h, m, Y, M, D;
- long double f;
- struct tm tm, *tmptm;
- time_t tt;
+ int h, m, Y, M, D;
+ long double f;
+ struct tm tm, *tmptm;
+ time_t tt;
const gchar *err_str;
if ((err_str = time_string_parse(time_text, &Y, &M, &D, NULL, &h, &m, &f)) != NULL)
@@ -270,13 +270,13 @@ time_string_to_nstime(const gchar *time_text, nstime_t *packettime, nstime_t *ns
const gchar *
time_shift_all(capture_file *cf, const gchar *offset_text)
{
- nstime_t offset;
- long double offset_float = 0;
- guint32 i;
- frame_data *fd;
+ nstime_t offset;
+ long double offset_float = 0;
+ guint32 i;
+ frame_data *fd;
gboolean neg;
- int h, m;
- long double f;
+ int h, m;
+ long double f;
const gchar *err_str;
if (!cf || !offset_text)
@@ -300,7 +300,7 @@ time_shift_all(capture_file *cf, const gchar *offset_text)
for (i = 1; i <= cf->count; i++) {
if ((fd = frame_data_sequence_find(cf->frames, i)) == NULL)
- continue; /* Shouldn't happen */
+ continue; /* Shouldn't happen */
modify_time_perform(fd, neg ? SHIFT_NEG : SHIFT_POS, &offset, SHIFT_KEEPOFFSET);
}
packet_list_queue_draw();
@@ -311,9 +311,9 @@ time_shift_all(capture_file *cf, const gchar *offset_text)
const gchar *
time_shift_settime(capture_file *cf, guint packet_num, const gchar *time_text)
{
- nstime_t set_time, diff_time, packet_time;
- frame_data *fd, *packetfd;
- guint32 i;
+ nstime_t set_time, diff_time, packet_time;
+ frame_data *fd, *packetfd;
+ guint32 i;
const gchar *err_str;
if (!cf || !time_text)
@@ -344,7 +344,7 @@ time_shift_settime(capture_file *cf, guint packet_num, const gchar *time_text)
/* Set everything back to the original time */
for (i = 1; i <= cf->count; i++) {
if ((fd = frame_data_sequence_find(cf->frames, i)) == NULL)
- continue; /* Shouldn't happen */
+ continue; /* Shouldn't happen */
modify_time_perform(fd, SHIFT_POS, &diff_time, SHIFT_SETTOZERO);
}
@@ -355,10 +355,10 @@ time_shift_settime(capture_file *cf, guint packet_num, const gchar *time_text)
const gchar *
time_shift_adjtime(capture_file *cf, guint packet1_num, const gchar *time1_text, guint packet2_num, const gchar *time2_text)
{
- nstime_t nt1, nt2, ot1, ot2, nt3;
- nstime_t dnt, dot, d3t;
- frame_data *fd, *packet1fd, *packet2fd;
- guint32 i;
+ nstime_t nt1, nt2, ot1, ot2, nt3;
+ nstime_t dnt, dot, d3t;
+ frame_data *fd, *packet1fd, *packet2fd;
+ guint32 i;
const gchar *err_str;
if (!cf || !time1_text || !time2_text)
@@ -416,7 +416,7 @@ time_shift_adjtime(capture_file *cf, guint packet1_num, const gchar *time1_text,
for (i = 1; i <= cf->count; i++) {
if ((fd = frame_data_sequence_find(cf->frames, i)) == NULL)
- continue; /* Shouldn't happen */
+ continue; /* Shouldn't happen */
/* Set everything back to the original time */
nstime_subtract(&(fd->abs_ts), &(fd->shift_offset));
@@ -438,9 +438,9 @@ time_shift_adjtime(capture_file *cf, guint packet1_num, const gchar *time1_text,
const gchar *
time_shift_undo(capture_file *cf)
{
- guint32 i;
- frame_data *fd;
- nstime_t nulltime;
+ guint32 i;
+ frame_data *fd;
+ nstime_t nulltime;
if (!cf)
return "Nothing to work with.";
@@ -452,7 +452,7 @@ time_shift_undo(capture_file *cf)
for (i = 1; i <= cf->count; i++) {
if ((fd = frame_data_sequence_find(cf->frames, i)) == NULL)
- continue; /* Shouldn't happen */
+ continue; /* Shouldn't happen */
modify_time_perform(fd, SHIFT_NEG, &nulltime, SHIFT_SETTOZERO);
}
packet_list_queue_draw();
diff --git a/ui/win32/console_win32.c b/ui/win32/console_win32.c
index 7e69616697..c768868b0f 100644
--- a/ui/win32/console_win32.c
+++ b/ui/win32/console_win32.c
@@ -60,51 +60,51 @@ static gboolean stdin_capture = FALSE; /* Don't grab stdin & stdout if TRUE */
static gboolean
needs_redirection(int std_handle)
{
- HANDLE fd;
- DWORD handle_type;
- DWORD error;
-
- fd = GetStdHandle(std_handle);
- if (fd == NULL) {
- /*
- * No standard handle. According to Microsoft's
- * documentation for GetStdHandle(), one reason for
- * this would be that the process is "a service on
- * an interactive desktop"; I'm not sure whether
- * such a process should be popping up a console.
- *
- * However, it also appears to be the case for
- * the standard input and standard error, but
- * *not* the standard output, for something run
- * with a double-click in Windows Explorer,
- * sow we'll say it needs redirection.
- */
- return TRUE;
- }
- if (fd == INVALID_HANDLE_VALUE) {
- /*
- * OK, I'm not when this would happen; return
- * "no redirection" for now.
- */
- return FALSE;
- }
- handle_type = GetFileType(fd);
- if (handle_type == FILE_TYPE_UNKNOWN) {
- error = GetLastError();
- if (error == ERROR_INVALID_HANDLE) {
- /*
- * OK, this appears to be the case where we're
- * running something in a mode that needs a
- * console.
- */
- return TRUE;
- }
- }
-
- /*
- * Assume no redirection is needed for all other cases.
- */
- return FALSE;
+ HANDLE fd;
+ DWORD handle_type;
+ DWORD error;
+
+ fd = GetStdHandle(std_handle);
+ if (fd == NULL) {
+ /*
+ * No standard handle. According to Microsoft's
+ * documentation for GetStdHandle(), one reason for
+ * this would be that the process is "a service on
+ * an interactive desktop"; I'm not sure whether
+ * such a process should be popping up a console.
+ *
+ * However, it also appears to be the case for
+ * the standard input and standard error, but
+ * *not* the standard output, for something run
+ * with a double-click in Windows Explorer,
+ * sow we'll say it needs redirection.
+ */
+ return TRUE;
+ }
+ if (fd == INVALID_HANDLE_VALUE) {
+ /*
+ * OK, I'm not when this would happen; return
+ * "no redirection" for now.
+ */
+ return FALSE;
+ }
+ handle_type = GetFileType(fd);
+ if (handle_type == FILE_TYPE_UNKNOWN) {
+ error = GetLastError();
+ if (error == ERROR_INVALID_HANDLE) {
+ /*
+ * OK, this appears to be the case where we're
+ * running something in a mode that needs a
+ * console.
+ */
+ return TRUE;
+ }
+ }
+
+ /*
+ * Assume no redirection is needed for all other cases.
+ */
+ return FALSE;
}
/* The code to create and desstroy console windows should not be necessary,
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index 99b3e5340e..57fea7baf1 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -1085,74 +1085,74 @@ static const char *extcap_dir = NULL;
static void init_extcap_dir(void) {
#ifdef _WIN32
- /*
- * On Windows, the data file directory is the installation
- * directory; the extcap hooks are stored under it.
- *
- * Assume we're running the installed version of Wireshark;
- * on Windows, the data file directory is the directory
- * in which the Wireshark binary resides.
- */
- extcap_dir = g_strdup_printf("%s\\extcap\\%s", get_datafile_dir(),
- VERSION);
-
- /*
- * Make sure that pathname refers to a directory.
- */
- if (test_for_directory(extcap_dir) != EISDIR) {
- /*
- * Either it doesn't refer to a directory or it
- * refers to something that doesn't exist.
- *
- * Assume that means we're running a version of
- * Wireshark we've built in a build directory,
- * in which case {datafile dir}\plugins is the
- * top-level extcap hooks source directory, and use
- * that directory and set the "we're running in
- * a build directory" flag, so the plugin
- * scanner will check all subdirectories of that
- * directory for extcap hooks.
- */
- g_free( (gpointer) extcap_dir);
- extcap_dir = g_strdup_printf("%s\\extcap", get_datafile_dir());
- running_in_build_directory_flag = TRUE;
- }
+ /*
+ * On Windows, the data file directory is the installation
+ * directory; the extcap hooks are stored under it.
+ *
+ * Assume we're running the installed version of Wireshark;
+ * on Windows, the data file directory is the directory
+ * in which the Wireshark binary resides.
+ */
+ extcap_dir = g_strdup_printf("%s\\extcap\\%s", get_datafile_dir(),
+ VERSION);
+
+ /*
+ * Make sure that pathname refers to a directory.
+ */
+ if (test_for_directory(extcap_dir) != EISDIR) {
+ /*
+ * Either it doesn't refer to a directory or it
+ * refers to something that doesn't exist.
+ *
+ * Assume that means we're running a version of
+ * Wireshark we've built in a build directory,
+ * in which case {datafile dir}\plugins is the
+ * top-level extcap hooks source directory, and use
+ * that directory and set the "we're running in
+ * a build directory" flag, so the plugin
+ * scanner will check all subdirectories of that
+ * directory for extcap hooks.
+ */
+ g_free( (gpointer) extcap_dir);
+ extcap_dir = g_strdup_printf("%s\\extcap", get_datafile_dir());
+ running_in_build_directory_flag = TRUE;
+ }
#else
- if (running_in_build_directory_flag) {
- /*
- * We're (probably) being run from the build directory and
- * weren't started with special privileges, so we'll use
- * the "extcap hooks" subdirectory of the directory where the program
- * we're running is (that's the build directory).
- */
- extcap_dir = g_strdup_printf("%s/extcap", get_progfile_dir());
- } else {
- if (getenv("WIRESHARK_EXTCAP_DIR") && !started_with_special_privs()) {
- /*
- * The user specified a different directory for extcap hooks
- * and we aren't running with special privileges.
- */
- extcap_dir = g_strdup(getenv("WIRESHARK_EXTCAP_DIR"));
- }
+ if (running_in_build_directory_flag) {
+ /*
+ * We're (probably) being run from the build directory and
+ * weren't started with special privileges, so we'll use
+ * the "extcap hooks" subdirectory of the directory where the program
+ * we're running is (that's the build directory).
+ */
+ extcap_dir = g_strdup_printf("%s/extcap", get_progfile_dir());
+ } else {
+ if (getenv("WIRESHARK_EXTCAP_DIR") && !started_with_special_privs()) {
+ /*
+ * The user specified a different directory for extcap hooks
+ * and we aren't running with special privileges.
+ */
+ extcap_dir = g_strdup(getenv("WIRESHARK_EXTCAP_DIR"));
+ }
#ifdef __APPLE__
- /*
- * If we're running from an app bundle and weren't started
- * with special privileges, use the Contents/Resources/lib/wireshark/extcap
- * subdirectory of the app bundle.
- *
- * (appbundle_dir is not set to a non-null value if we're
- * started with special privileges, so we need only check
- * it; we don't need to call started_with_special_privs().)
- */
- else if (appbundle_dir != NULL) {
- extcap_dir = g_strdup_printf("%s/Contents/Resources/lib/wireshark/extcap",
- appbundle_dir);
- }
+ /*
+ * If we're running from an app bundle and weren't started
+ * with special privileges, use the Contents/Resources/lib/wireshark/extcap
+ * subdirectory of the app bundle.
+ *
+ * (appbundle_dir is not set to a non-null value if we're
+ * started with special privileges, so we need only check
+ * it; we don't need to call started_with_special_privs().)
+ */
+ else if (appbundle_dir != NULL) {
+ extcap_dir = g_strdup_printf("%s/Contents/Resources/lib/wireshark/extcap",
+ appbundle_dir);
+ }
#endif
- else {
- extcap_dir = EXTCAP_DIR;
- }
- }
+ else {
+ extcap_dir = EXTCAP_DIR;
+ }
+ }
#endif
}
#endif /* HAVE_EXTCAP */
@@ -1165,11 +1165,11 @@ static void init_extcap_dir(void) {
const char *
get_extcap_dir(void) {
#if defined(HAVE_EXTCAP)
- if (!extcap_dir)
- init_extcap_dir();
- return extcap_dir;
+ if (!extcap_dir)
+ init_extcap_dir();
+ return extcap_dir;
#else
- return NULL;
+ return NULL;
#endif
}
@@ -1818,11 +1818,11 @@ get_datafile_path(const char *filename)
{
if (running_in_build_directory_flag &&
(!strcmp(filename, "AUTHORS-SHORT") ||
- !strcmp(filename, "hosts"))) {
+ !strcmp(filename, "hosts"))) {
/* We're running in the build directory and the requested file is a
* generated (or a test) file. Return the file name in the build
- * directory (not in the source/data directory).
- * (Oh the things we do to keep the source directory pristine...)
+ * directory (not in the source/data directory).
+ * (Oh the things we do to keep the source directory pristine...)
*/
return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", get_progfile_dir(), filename);
} else {
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-20 10:28:13 +0000