osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't put "[DCE/RPC fragment]" into the Info column if the packet isn't 

fragmented.

"PFC_NOT_FRAGMENTED()" is checked early in "dissect_dcerpc_cn_stub()";
there's no need to check it again in either of the code paths after
that, as we know it's true in the first code path and false in the second.

svn path=/trunk/; revision=7460
This commit is contained in:
Guy Harris 2003-04-15 08:04:54 +00:00
parent ff8f930fe3
commit 90a5d166ff
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packet-dcerpc.c
View File

@ -2,7 +2,7 @@
* Routines for DCERPC packet disassembly
* Copyright 2001, Todd Sabin <tas@webspan.net>
*
* $Id: packet-dcerpc.c,v 1.115 2003/04/14 13:22:13 sahlberg Exp $
* $Id: packet-dcerpc.c,v 1.116 2003/04/15 08:04:54 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -2187,22 +2187,24 @@ dissect_dcerpc_cn_stub (tvbuff_t *tvb, int offset, packet_info *pinfo,
save_fragmented = pinfo->fragmented;
/* if this packet is not fragmented, just dissect it and exit */
if(PFC_NOT_FRAGMENTED(hdr)){
pinfo->fragmented = !PFC_NOT_FRAGMENTED(hdr);
pinfo->fragmented = FALSE;
dcerpc_try_handoff (pinfo, tree, dcerpc_tree,
tvb_new_subset (tvb, offset, length, reported_length),
0, hdr->drep, di, auth_info);
goto end_cn_stub;
pinfo->fragmented = save_fragmented;
return;
}
/* The packet is fragmented. */
pinfo->fragmented = TRUE;
/* if we are not doing reassembly and this is the first fragment
then just dissect it and exit
*/
if( (!dcerpc_reassemble) && hdr->flags&PFC_FIRST_FRAG ){
pinfo->fragmented = !PFC_NOT_FRAGMENTED(hdr);
dcerpc_try_handoff (pinfo, tree, dcerpc_tree,
tvb_new_subset (tvb, offset, length,
reported_length),