diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-10-24 00:17:58 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-10-24 00:17:58 +0000 |
| commit | 4cfd2f93eaf9e99c6e6bfe5794bc0afe72a49910 (patch) | |
| tree | d72a0d607dbdb9ff0957b181ca357c9dfa06ced7 /plugins | |
| parent | a3ba5dcbf58174e5a3d1b8af8ea3feb8dbb22569 (diff) | |
Remove profinet_conv member of struct _packet_info and turn it into proto_data.
svn path=/trunk/; revision=52806
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/profinet/packet-dcerpc-pn-io.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c index f54d07883b..4ac139503c 100644 --- a/plugins/profinet/packet-dcerpc-pn-io.c +++ b/plugins/profinet/packet-dcerpc-pn-io.c @@ -2596,8 +2596,7 @@ typedef struct pnio_ar_s { static void pnio_ar_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pnio_ar_t *ar) { - - pinfo->profinet_conv = ar; + p_add_proto_data(pinfo->fd, proto_pn_io, 0, ar ); pinfo->profinet_type = 10; if (tree) { @@ -9428,10 +9427,10 @@ pn_io_ar_conv_valid(packet_info *pinfo) static const gchar * pn_io_ar_conv_filter(packet_info *pinfo) { - pnio_ar_t *ar = (pnio_ar_t *)pinfo->profinet_conv; + pnio_ar_t *ar = (pnio_ar_t *)p_get_proto_data(pinfo->fd, proto_pn_io, 0); char *buf; - if (pinfo->profinet_type != 10) { + if ((pinfo->profinet_type != 10) || (ar == NULL)) { return NULL; } @@ -9448,10 +9447,10 @@ pn_io_ar_conv_filter(packet_info *pinfo) static const gchar * pn_io_ar_conv_data_filter(packet_info *pinfo) { - pnio_ar_t *ar = (pnio_ar_t *)pinfo->profinet_conv; + pnio_ar_t *ar = (pnio_ar_t *)p_get_proto_data(pinfo->fd, proto_pn_io, 0); char *buf; - if (pinfo->profinet_type != 10) { + if ((pinfo->profinet_type != 10) || (ar == NULL)) { return NULL; } if (ar->arType == 0x0010) /* IOCARSingle using RT_CLASS_3 */ |