osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

PROFINET: Fix count of IO data objects and IOCS 

Split the counts of IO data objects and IOCS between
input and output. Remove increment of IO data objects
in station information, sometimes leading to extremely
high and invalid number of IO data objects.
This commit is contained in:
Matthias Dietrich 2022-04-03 16:30:46 +02:00 committed by A Wireshark GitLab Utility
parent dcffa0303a
commit 86bc544fd3
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/epan/profinet/packet-dcerpc-pn-io.c
View File

@ -8588,11 +8588,13 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
guint8 mac[6];
guint16 u16NumberOfAPIs;
guint32 u32Api;
guint16 u16NumberOfIODataObjects;
guint16 u16NumberOfIODataObjectsInAPI;
guint16 u16NumberOfIODataObjectsInCR = 0U;
guint16 u16SlotNr;
guint16 u16SubslotNr;
guint16 u16IODataObjectFrameOffset;
guint16 u16NumberOfIOCS;
guint16 u16NumberOfIOCSInAPI;
guint16 u16NumberOfIOCSInCR = 0U;
guint16 u16IOCSFrameOffset;
proto_item *api_item;
proto_tree *api_tree;
@ -8628,7 +8630,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_lt, &u16LT);
offset = dissect_IOCRProperties(tvb, offset, pinfo, tree, drep);
offset = dissect_IOCRProperties(tvb, offset, pinfo, tree, drep);
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, tree, drep,
hf_pn_io_data_length, &u16DataLength);
@ -8690,7 +8692,7 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
hf_pn_io_api, &u32Api);
/* NumberOfIODataObjects */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_number_of_io_data_objects, &u16NumberOfIODataObjects);
hf_pn_io_number_of_io_data_objects, &u16NumberOfIODataObjectsInAPI);
/* Set global Variant for Number of IO Data Objects */
/* Notice: Handle Input & Output seperate!!! */
@ -8719,12 +8721,12 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
init_pnio_rtc1_station(station_info);
conversation_add_proto_data(conversation, current_aruuid, station_info);
}
station_info->ioDataObjectNr += u16NumberOfIODataObjects;
u16NumberOfIODataObjectsInCR += u16NumberOfIODataObjectsInAPI;
pn_find_dcp_station_info(station_info, conversation);
}
u16Tmp = u16NumberOfIODataObjects;
u16Tmp = u16NumberOfIODataObjectsInAPI;
while (u16Tmp--) {
sub_item = proto_tree_add_item(api_tree, hf_pn_io_io_data_object, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_io_data_object);
@ -8784,20 +8786,14 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
/* NumberOfIOCS */
offset = dissect_dcerpc_uint16(tvb, offset, pinfo, api_tree, drep,
hf_pn_io_number_of_iocs, &u16NumberOfIOCS);
hf_pn_io_number_of_iocs, &u16NumberOfIOCSInAPI);
/* Set global Vairant for NumberOfIOCS */
if (!PINFO_FD_VISITED(pinfo)) {
if (station_info != NULL) {
if (u16IOCRType == PN_INPUT_CR) {
station_info->iocsNr_in = u16NumberOfIOCS;
} else {
station_info->iocsNr_out = u16NumberOfIOCS;
}
}
u16NumberOfIOCSInCR += u16NumberOfIOCSInAPI;
}
u16Tmp = u16NumberOfIOCS;
u16Tmp = u16NumberOfIOCSInAPI;
while (u16Tmp--) {
sub_item = proto_tree_add_item(api_tree, hf_pn_io_io_cs, tvb, offset, 0, ENC_NA);
sub_tree = proto_item_add_subtree(sub_item, ett_pn_io_io_cs);
@ -8848,11 +8844,24 @@ dissect_IOCRBlockReq_block(tvbuff_t *tvb, int offset,
}
proto_item_append_text(api_item, ": 0x%x, NumberOfIODataObjects: %u NumberOfIOCS: %u",
u32Api, u16NumberOfIODataObjects, u16NumberOfIOCS);
u32Api, u16NumberOfIODataObjectsInAPI, u16NumberOfIOCSInAPI);
proto_item_set_len(api_item, offset - u32ApiStart);
}
/* Update global object count */
if (!PINFO_FD_VISITED(pinfo)) {
if (station_info != NULL) {
if (u16IOCRType == PN_INPUT_CR) {
station_info->iocsNr_in = u16NumberOfIOCSInCR;
station_info->ioDataObjectNr_in = u16NumberOfIODataObjectsInCR;
} else {
station_info->iocsNr_out = u16NumberOfIOCSInCR;
station_info->ioDataObjectNr_out = u16NumberOfIODataObjectsInCR;
}
}
}
if (ar != NULL) {
switch (u16IOCRType) {
case(1): /* Input CR */

4
plugins/epan/profinet/packet-pn-rtc-one.c
View File

@ -462,14 +462,14 @@ dissect_PNIO_C_SDU_RTC1(tvbuff_t *tvb, int offset,
if (addresses_equal(&(pinfo->src), conversation_key_addr1(conversation->key_ptr)) && addresses_equal(&(pinfo->dst), conversation_key_addr2(conversation->key_ptr))) {
inputFlag = TRUE;
outputFlag = FALSE;
number_io_data_objects_input_cr = station_info->ioDataObjectNr;
number_io_data_objects_input_cr = station_info->ioDataObjectNr_in;
number_iocs_input_cr = station_info->iocsNr_in;
}
if (addresses_equal(&(pinfo->dst), conversation_key_addr1(conversation->key_ptr)) && addresses_equal(&(pinfo->src), conversation_key_addr2(conversation->key_ptr))) {
outputFlag = TRUE;
inputFlag = FALSE;
number_io_data_objects_output_cr = station_info->ioDataObjectNr;
number_io_data_objects_output_cr = station_info->ioDataObjectNr_out;
number_iocs_output_cr = station_info->iocsNr_out;
}
}

3
plugins/epan/profinet/packet-pn.h
View File

@ -38,7 +38,8 @@ typedef struct tagStationInfo {
guint16 u16Vendor_id;
guint16 u16Device_id;
/* frame structure */
guint16 ioDataObjectNr;
guint16 ioDataObjectNr_in;
guint16 ioDataObjectNr_out;
guint16 iocsNr_in;
guint16 iocsNr_out;
/* GSDfile station information */