diff options
| author | Guy Harris <guy@alum.mit.edu> | 2009-07-03 17:12:36 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2009-07-03 17:12:36 +0000 |
| commit | bf7462bf97167d67d8b02da10b6a8878845055c9 (patch) | |
| tree | bf5061d3ae91dc724b0d5a9d73de8b6c05eea7c0 /epan/dissectors/packet-ndmp.c | |
| parent | d36f35f28b7f56b80bbfdd4642720029b5103370 (diff) | |
| download | wireshark-bf7462bf97167d67d8b02da10b6a8878845055c9.tar.gz | |
Set save_fragmented regardless of whether we're reassembling or not, as
we restore it regardless of whether we're reassembling or not.
svn path=/trunk/; revision=28938
Diffstat (limited to 'epan/dissectors/packet-ndmp.c')
| -rw-r--r-- | epan/dissectors/packet-ndmp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index ac6c956598..2ae9d7e975 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3032,6 +3032,9 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ ndmp_rm=tvb_get_ntohl(tvb, offset); + /* Save the flag indicating whether this packet is a fragment */ + save_fragmented = pinfo->fragmented; + /* Reassemble if desegmentation and reassembly are enabled, otherwise * just pass through and use the data in tvb for dissection */ if (ndmp_defragment && ndmp_desegment) @@ -3127,8 +3130,6 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - save_fragmented = pinfo->fragmented; - /* If fragmentation is neccessary */ if (do_frag) { @@ -3299,7 +3300,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) */ dissect_ndmp_cmd(new_tvb, offset, pinfo, ndmp_tree, &nh); - /* restore saved variabled */ + /* restore saved variables */ pinfo->fragmented = save_fragmented; col_set_writable(pinfo->cinfo, save_writable); |