diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-04-08 03:00:32 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-04-08 03:00:32 +0000 |
| commit | 3cbd0466f6f990bb5bcb303d72d8b66c87466e5c (patch) | |
| tree | 914b03db8a9275063e1bcee7b606ff6c8c19cea0 /packet-ndps.c | |
| parent | 28b442512f64e5a3cdb160144577aace4f0208f3 (diff) | |
| download | wireshark-3cbd0466f6f990bb5bcb303d72d8b66c87466e5c.tar.gz wireshark-3cbd0466f6f990bb5bcb303d72d8b66c87466e5c.tar.bz2 wireshark-3cbd0466f6f990bb5bcb303d72d8b66c87466e5c.zip | |
When dissecting a reply, don't put the frame number of the corresponding
request into the protocol tree if we haven't seen the request.
svn path=/trunk/; revision=7421
Diffstat (limited to 'packet-ndps.c')
| -rw-r--r-- | packet-ndps.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/packet-ndps.c b/packet-ndps.c index bcfd8216a1..926d9164f8 100644 --- a/packet-ndps.c +++ b/packet-ndps.c @@ -3,7 +3,7 @@ * Greg Morris <gmorris@novell.com> * Copyright (c) Novell, Inc. 2002-2003 * - * $Id: packet-ndps.c,v 1.14 2003/04/08 02:45:05 guy Exp $ + * $Id: packet-ndps.c,v 1.15 2003/04/08 03:00:32 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -6482,7 +6482,6 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int guint32 ndps_prog=0; guint32 error_val=0; guint32 problem_type=0; - guint32 frame_num=0; guint32 field_len=0; guint32 resource_type=0; guint32 qualified_name_type=0; @@ -6506,12 +6505,12 @@ dissect_ndps_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ndps_tree, int if (request_value) { ndps_prog = request_value->ndps_prog; ndps_func = request_value->ndps_func; - frame_num = request_value->ndps_frame_num; + proto_tree_add_uint_format(ndps_tree, hf_ndps_reqframe, tvb, 0, + 0, request_value->ndps_frame_num, + "Response to Request in Frame Number: %u", + request_value->ndps_frame_num); } - proto_tree_add_uint_format(ndps_tree, hf_ndps_reqframe, tvb, 0, - 0, frame_num, "Response to Request in Frame Number: %u", frame_num); - if (tvb_length_remaining(tvb, foffset) < 12 && tvb_get_ntohl(tvb, foffset) == 0) /* No error and no return data */ { proto_tree_add_uint(ndps_tree, hf_ndps_error_val, tvb, foffset, 4, error_val); |