diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-05-27 09:22:27 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-05-27 09:22:27 +0000 |
| commit | bc24ddab678cf3ad0b6dfaedd3685f436f9f637c (patch) | |
| tree | 35b4a753cb8164f09c6aa2b8cf1f76feb8756412 /packet-dcerpc.c | |
| parent | 540345e8c127f5b07f33d51694e66d0b98f8d21d (diff) | |
Put back the stuff for connection-oriented data to show fragment data as
"Fragment data (N bytes)" if we aren't dissecting it.
svn path=/trunk/; revision=7751
Diffstat (limited to 'packet-dcerpc.c')
| -rw-r--r-- | packet-dcerpc.c | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/packet-dcerpc.c b/packet-dcerpc.c index bc026150f3..ba114f772f 100644 --- a/packet-dcerpc.c +++ b/packet-dcerpc.c @@ -2,7 +2,7 @@ * Routines for DCERPC packet disassembly * Copyright 2001, Todd Sabin <tas@webspan.net> * - * $Id: packet-dcerpc.c,v 1.125 2003/05/26 21:58:45 guy Exp $ + * $Id: packet-dcerpc.c,v 1.126 2003/05/27 09:22:27 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2309,7 +2309,12 @@ dissect_dcerpc_cn_stub (tvbuff_t *tvb, int offset, packet_info *pinfo, tvb_new_subset (tvb, offset, length, reported_length), 0, hdr->drep, di, auth_info); - goto end_cn_stub; + if (check_col(pinfo->cinfo, COL_INFO)) { + col_append_fstr(pinfo->cinfo, COL_INFO, + " [DCE/RPC %s fragment]", fragment_type(hdr->flags)); + } + pinfo->fragmented = save_fragmented; + return; } /* if we have already seen this packet, see if it was reassembled @@ -2392,10 +2397,18 @@ dissect_dcerpc_cn_stub (tvbuff_t *tvb, int offset, packet_info *pinfo, stub_length, TRUE); - - end_cn_stub: + /* Show the fragment data. */ + if (dcerpc_tree) { + if (length > 0) { + proto_tree_add_text (dcerpc_tree, tvb, offset, length, + "Fragment data (%d byte%s)", + stub_length, + plurality(stub_length, "", "s")); + } + } + /* if reassembly is complete, dissect the full PDU */ if(fd_head && (fd_head->flags&FD_DEFRAGMENTED) ){ |