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

DoIP: Make finding start of message more robust 

This patch allows the DoIP dissector to better identify the start
of messages, if the start of the TCP connection is missing or
packet loss occurred in the trace.

Fixes: #17149
This commit is contained in:
Dr. Lars Völker 2021-01-13 21:52:13 +01:00 committed by AndersBroman
parent 45e6575699
commit fba99bdef1
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-doip.c
View File

@ -678,6 +678,15 @@ dissect_doip_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static guint
get_doip_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *p _U_)
{
guint8 ver1 = tvb_get_guint8(tvb, DOIP_VERSION_OFFSET);
guint8 ver2 = tvb_get_guint8(tvb, DOIP_INV_VERSION_OFFSET);
if (ver1 != ((~ver2) & 0xff)) {
/* if ver2 is not the inverse of ver1, we are not at the start of a DoIP message! */
/* bounds_error: (0 < return < DOIP_HEADER_LEN) */
return 1;
}
/* PDU Length = length field value + header length */
return (guint)tvb_get_ntohl(tvb, offset + DOIP_LENGTH_OFFSET) + DOIP_HEADER_LEN;
}