diff options
| author | Evan Huus <eapache@gmail.com> | 2013-11-07 17:06:04 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-11-07 17:06:04 +0000 |
| commit | 5c319860fb22dec62f57efcc9a9cdc80434a982f (patch) | |
| tree | c5b4b8f28c89f5e081973e0ec49cb3d1ce0529bc /epan/dissectors/packet-ndmp.c | |
| parent | 6441f10c416f79a7b68f5a90b825643220add023 (diff) | |
Add a p_add_proto_data call to dissect_ndmp to match the one in
dissect_ndmp_heur.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9393
Potentially we should add a void *data to tcp_dissect_pdus instead...?
svn path=/trunk/; revision=53144
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 388d3c5b05..f8247d8590 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3478,7 +3478,7 @@ check_if_ndmp(tvbuff_t *tvb, packet_info *pinfo) * At this point we may have either an NDMP PDU or an NDMP PDU fragment. */ static int -dissect_ndmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) +dissect_ndmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) { /* If we are doing defragmentation, don't check more than the record mark here, * because if this is a continuation of a fragmented NDMP PDU there won't be a @@ -3493,6 +3493,11 @@ dissect_ndmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ return 0; } + /* XXX - tcp_dissect_pdus() doesn't have a way to pass dissector data, so store + the tcpinfo structure from the TCP dissector as proto_data to be retrieved + in dissect_ndmp_message() */ + p_add_proto_data(pinfo->fd, proto_ndmp, 0, data); + tcp_dissect_pdus(tvb, pinfo, tree, ndmp_desegment, 4, get_ndmp_pdu_len, dissect_ndmp_message); return tvb_length(tvb); |