From daed8070dd87d18abd31ff95aa2abe327ede2af3 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 23 Nov 2014 00:12:57 -0500 Subject: Pass FrameID as data to the heuristic table, rather than use pinfo->private_data. Change-Id: Idd5818cbb2b1f8628bb29c2c71dfc6d41df89b5d Reviewed-on: https://code.wireshark.org/review/5448 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- plugins/profinet/packet-dcom-cba-acco.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'plugins/profinet/packet-dcom-cba-acco.c') diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c index 57cb135daf..28ed2a337d 100644 --- a/plugins/profinet/packet-dcom-cba-acco.c +++ b/plugins/profinet/packet-dcom-cba-acco.c @@ -3148,15 +3148,13 @@ dissect_CBA_Connection_Data(tvbuff_t *tvb, static gboolean dissect_CBA_Connection_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, - void *data _U_) + void *data) { guint8 u8Version; guint8 u8Flags; - guint16 u16FrameID; - cba_frame_t *frame; - /* the tvb will NOT contain the frame_id here! */ - u16FrameID = GPOINTER_TO_UINT(pinfo->private_data); + guint16 u16FrameID = GPOINTER_TO_UINT(data); + cba_frame_t *frame; /* frame id must be in valid range (cyclic Real-Time, class=1 or class=2) */ if (u16FrameID < 0x8000 || u16FrameID >= 0xfb00) { -- cgit v1.2.3