diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-11-23 00:12:57 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-11-24 14:35:42 +0000 |
| commit | daed8070dd87d18abd31ff95aa2abe327ede2af3 (patch) | |
| tree | a8297bcbe0d903dfb254bf81e0378cd39d869074 /plugins/profinet/packet-pn-ptcp.c | |
| parent | 6dbb97da103731d0abbd4fdeeef16d7af4059fa3 (diff) | |
| download | wireshark-daed8070dd87d18abd31ff95aa2abe327ede2af3.tar.gz | |
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 <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'plugins/profinet/packet-pn-ptcp.c')
| -rw-r--r-- | plugins/profinet/packet-pn-ptcp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c index dfe155ebcf..a52a47fbe3 100644 --- a/plugins/profinet/packet-pn-ptcp.c +++ b/plugins/profinet/packet-pn-ptcp.c @@ -774,18 +774,16 @@ dissect_PNPTCP_DelayPDU(tvbuff_t *tvb, int offset, /* possibly dissect a PN-RT packet (frame ID must be in the appropriate range) */ static gboolean -dissect_PNPTCP_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_PNPTCP_Data_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { - guint16 u16FrameID; + /* the tvb will NOT contain the frame_id here, so get it from dissector data! */ + guint16 u16FrameID = GPOINTER_TO_UINT(data); proto_item *item; proto_tree *ptcp_tree; int offset = 0; guint32 u32SubStart; - /* the tvb will NOT contain the frame_id here, so get it from our private data! */ - u16FrameID = GPOINTER_TO_UINT(pinfo->private_data); - /* frame id must be in valid range (acyclic Real-Time, PTCP) */ /* 0x0000 - 0x007F: RTSyncPDU (with follow up) */ /* 0x0080 - 0x00FF: RTSyncPDU (without follow up) */ |