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

From Jaime Fournier: handle DCE RPC connectionless CANCEL PDUs with no 

body.

svn path=/trunk/; revision=5730
This commit is contained in:
Guy Harris 2002-06-22 01:30:54 +00:00
parent 567aac9787
commit 5f8f311188
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -1270,6 +1270,9 @@ Solomon Peachy <pizza[AT]shaftnet.org> {
WEP support and other mangling of the 802.11 disector
}
Jaime Fournier <jafour1[AT]yahoo.com> {
Handle DCE RPC connectionless CANCEL PDUs with no body
}
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
give his permission to use his version of snprintf.c.

1
doc/ethereal.pod.template
View File

@ -1452,6 +1452,7 @@ B<http://www.ethereal.com>.
Bill Fumerola <billf[AT]FreeBSD.org>
Chris Waters <chris[AT]waters.co.nz>
Solomon Peachy <pizza[AT]shaftnet.org>
Jaime Fournier <jafour1[AT]yahoo.com>
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
permission to use his version of snprintf.c.

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.61 2002/06/19 10:06:02 guy Exp $
* $Id: packet-dcerpc.c,v 1.62 2002/06/22 01:30:53 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -3279,11 +3279,19 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case PDU_CL_CANCEL:
dissect_dcerpc_dg_cancel (tvb, offset, pinfo, dcerpc_tree, &hdr);
/*
* XXX - The DCE RPC 1.1 spec doesn't say the body is optional,
* but in at least one capture none of the Cl_cancel PDUs had a
* body.
*/
/* XXX - we assume "frag_len" is the length of the body */
if (hdr.frag_len != 0)
dissect_dcerpc_dg_cancel (tvb, offset, pinfo, dcerpc_tree, &hdr);
break;
case PDU_NOCALL:
/* Body is optional; if present, it's the same as PDU_FACK */
/* XXX - we assume "frag_len" is the length of the body */
if (hdr.frag_len != 0)
dissect_dcerpc_dg_fack (tvb, offset, pinfo, dcerpc_tree, &hdr);
break;