aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/epan
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-07-15 01:22:33 -0700
committerGuy Harris <guy@alum.mit.edu>2019-07-15 10:00:26 +0000
commit151159ad90f6561974dd4639f2a7df4a8b99cb0d (patch)
treee9b4fba63789d8c274780c0f1b42641a6890413a /plugins/epan
parent1d4d43c2d88e039986b2b966caf2118cba2caa17 (diff)
Clean up indentation.
Change-Id: I072ae41e48583ed52679cc58fb3b65e7654bf3ab Reviewed-on: https://code.wireshark.org/review/33947 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'plugins/epan')
-rw-r--r--plugins/epan/profinet/packet-dcerpc-pn-io.c156
1 files changed, 78 insertions, 78 deletions
diff --git a/plugins/epan/profinet/packet-dcerpc-pn-io.c b/plugins/epan/profinet/packet-dcerpc-pn-io.c
index 4d1899ee43..fac0b7dbee 100644
--- a/plugins/epan/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/epan/profinet/packet-dcerpc-pn-io.c
@@ -7111,7 +7111,7 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
hf_pn_io_number_of_ars, &u16NumberOfARs);
/* BlockversionLow: 0 */
if (u8BlockVersionLow == 0) {
- while (u16NumberOfARs--) {
+ while (u16NumberOfARs--) {
ar_item = proto_tree_add_item(tree, hf_pn_io_ar_data, tvb, offset, 0, ENC_NA);
ar_tree = proto_item_add_subtree(ar_item, ett_pn_io_ar_data);
u32ARDataStart = offset;
@@ -7121,108 +7121,108 @@ dissect_ARData_block(tvbuff_t *tvb, int offset,
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_ar_type, &u16ARType);
offset = dissect_ARProperties(tvb, offset, pinfo, ar_tree, item, drep);
- offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, ar_tree, drep,
+ offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_cminitiator_objectuuid, &uuid);
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep,
- hf_pn_io_station_name_length, &u16NameLength);
- pStationName = (char *)wmem_alloc(wmem_packet_scope(), u16NameLength+1);
- tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
- pStationName[u16NameLength] = '\0';
+ hf_pn_io_station_name_length, &u16NameLength);
+ pStationName = (char *)wmem_alloc(wmem_packet_scope(), u16NameLength+1);
+ tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
+ pStationName[u16NameLength] = '\0';
proto_tree_add_string (ar_tree, hf_pn_io_cminitiator_station_name, tvb, offset, u16NameLength, pStationName);
- offset += u16NameLength;
+ offset += u16NameLength;
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_number_of_iocrs, &u16NumberOfIOCRs);
- while (u16NumberOfIOCRs--) {
- iocr_item = proto_tree_add_item(ar_tree, hf_pn_io_iocr_tree, tvb, offset, 0, ENC_NA);
- iocr_tree = proto_item_add_subtree(iocr_item, ett_pn_io_iocr);
- u32IOCRStart = offset;
-
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
- hf_pn_io_iocr_type, &u16IOCRType);
- offset = dissect_IOCRProperties(tvb, offset, pinfo, iocr_tree, drep);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
- hf_pn_io_frame_id, &u16FrameID);
-
- proto_item_append_text(iocr_item, ": FrameID:0x%x", u16FrameID);
-
- /* add cycle counter */
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
- hf_pn_io_cycle_counter, &u16CycleCounter);
-
- u8DataStatus = tvb_get_guint8(tvb, offset);
- u8TransferStatus = tvb_get_guint8(tvb, offset+1);
-
- /* add data status subtree */
- ds_item = proto_tree_add_uint_format(iocr_tree, hf_pn_io_data_status,
- tvb, offset, 1, u8DataStatus,
- "DataStatus: 0x%02x (Frame: %s and %s, Provider: %s and %s)",
- u8DataStatus,
- (u8DataStatus & 0x04) ? "Valid" : "Invalid",
- (u8DataStatus & 0x01) ? "Primary" : "Backup",
- (u8DataStatus & 0x20) ? "Ok" : "Problem",
- (u8DataStatus & 0x10) ? "Run" : "Stop");
- ds_tree = proto_item_add_subtree(ds_item, ett_pn_io_data_status);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res67, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_ok, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_operate, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res3, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_valid, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res1, tvb, offset, 1, u8DataStatus);
- proto_tree_add_uint(ds_tree, hf_pn_io_data_status_primary, tvb, offset, 1, u8DataStatus);
-
- offset++;
-
- /* add transfer status */
- if (u8TransferStatus) {
- proto_tree_add_uint_format(iocr_tree, hf_pn_io_transfer_status, tvb,
- offset, 1, u8TransferStatus,
- "TransferStatus: 0x%02x (ignore this frame)", u8TransferStatus);
- } else {
- proto_tree_add_uint_format(iocr_tree, hf_pn_io_transfer_status, tvb,
- offset, 1, u8TransferStatus,
- "TransferStatus: 0x%02x (OK)", u8TransferStatus);
- }
+ while (u16NumberOfIOCRs--) {
+ iocr_item = proto_tree_add_item(ar_tree, hf_pn_io_iocr_tree, tvb, offset, 0, ENC_NA);
+ iocr_tree = proto_item_add_subtree(iocr_item, ett_pn_io_iocr);
+ u32IOCRStart = offset;
- offset++;
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
+ hf_pn_io_iocr_type, &u16IOCRType);
+ offset = dissect_IOCRProperties(tvb, offset, pinfo, iocr_tree, drep);
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
+ hf_pn_io_frame_id, &u16FrameID);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
- hf_pn_io_cminitiator_udprtport, &u16UDPRTPort);
- offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
- hf_pn_io_cmresponder_udprtport, &u16UDPRTPort);
+ proto_item_append_text(iocr_item, ": FrameID:0x%x", u16FrameID);
- proto_item_set_len(iocr_item, offset - u32IOCRStart);
- }
+ /* add cycle counter */
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
+ hf_pn_io_cycle_counter, &u16CycleCounter);
+
+ u8DataStatus = tvb_get_guint8(tvb, offset);
+ u8TransferStatus = tvb_get_guint8(tvb, offset+1);
+
+ /* add data status subtree */
+ ds_item = proto_tree_add_uint_format(iocr_tree, hf_pn_io_data_status,
+ tvb, offset, 1, u8DataStatus,
+ "DataStatus: 0x%02x (Frame: %s and %s, Provider: %s and %s)",
+ u8DataStatus,
+ (u8DataStatus & 0x04) ? "Valid" : "Invalid",
+ (u8DataStatus & 0x01) ? "Primary" : "Backup",
+ (u8DataStatus & 0x20) ? "Ok" : "Problem",
+ (u8DataStatus & 0x10) ? "Run" : "Stop");
+ ds_tree = proto_item_add_subtree(ds_item, ett_pn_io_data_status);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res67, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_ok, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_operate, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res3, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_valid, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_res1, tvb, offset, 1, u8DataStatus);
+ proto_tree_add_uint(ds_tree, hf_pn_io_data_status_primary, tvb, offset, 1, u8DataStatus);
+
+ offset++;
+
+ /* add transfer status */
+ if (u8TransferStatus) {
+ proto_tree_add_uint_format(iocr_tree, hf_pn_io_transfer_status, tvb,
+ offset, 1, u8TransferStatus,
+ "TransferStatus: 0x%02x (ignore this frame)", u8TransferStatus);
+ } else {
+ proto_tree_add_uint_format(iocr_tree, hf_pn_io_transfer_status, tvb,
+ offset, 1, u8TransferStatus,
+ "TransferStatus: 0x%02x (OK)", u8TransferStatus);
+ }
+
+ offset++;
+
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
+ hf_pn_io_cminitiator_udprtport, &u16UDPRTPort);
+ offset = dissect_dcerpc_uint16(tvb, offset, pinfo, iocr_tree, drep,
+ hf_pn_io_cmresponder_udprtport, &u16UDPRTPort);
- /* AlarmCRType */
+ proto_item_set_len(iocr_item, offset - u32IOCRStart);
+ }
+
+ /* AlarmCRType */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_alarmcr_type, &u16AlarmCRType);
- /* LocalAlarmReference */
+ /* LocalAlarmReference */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_localalarmref, &u16LocalAlarmReference);
- /* RemoteAlarmReference */
+ /* RemoteAlarmReference */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_remotealarmref, &u16RemoteAlarmReference);
- /* ParameterServerObjectUUID */
+ /* ParameterServerObjectUUID */
offset = dissect_dcerpc_uuid_t(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_parameter_server_objectuuid, &uuid);
- /* StationNameLength */
+ /* StationNameLength */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_station_name_length, &u16NameLength);
- /* ParameterServerStationName */
- pStationName = (char *)wmem_alloc(wmem_packet_scope(), u16NameLength+1);
- tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
- pStationName[u16NameLength] = '\0';
+ /* ParameterServerStationName */
+ pStationName = (char *)wmem_alloc(wmem_packet_scope(), u16NameLength+1);
+ tvb_memcpy(tvb, (guint8 *) pStationName, offset, u16NameLength);
+ pStationName[u16NameLength] = '\0';
proto_tree_add_string (ar_tree, hf_pn_io_parameter_server_station_name, tvb, offset, u16NameLength, pStationName);
- offset += u16NameLength;
- /* NumberOfAPIs */
+ offset += u16NameLength;
+ /* NumberOfAPIs */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, ar_tree, drep,
hf_pn_io_number_of_apis, &u16NumberOfAPIs);
- /* API */
- if (u16NumberOfAPIs > 0) {
+ /* API */
+ if (u16NumberOfAPIs > 0) {
offset = dissect_dcerpc_uint32(tvb, offset, pinfo, ar_tree, drep,
- hf_pn_io_api, &u32Api);
+ hf_pn_io_api, &u32Api);
}
proto_item_set_len(ar_item, offset - u32ARDataStart);
}