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

Don't return 0 from "call_dissector_work()" if the packet was dissected 

by the dissector we handed off to, even if the tvbuff we handed them was
empty.

svn path=/trunk/; revision=6518
This commit is contained in:
Guy Harris 2002-10-29 05:15:24 +00:00
parent 0b8419fd5b
commit d958ee1a72
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/packet.c
View File

@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
* $Id: packet.c,v 1.80 2002/10/28 23:04:15 guy Exp $
* $Id: packet.c,v 1.81 2002/10/29 05:15:24 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -381,6 +381,14 @@ call_dissector_work(dissector_handle_t handle, tvbuff_t *tvb,
else {
(*handle->dissector.old)(tvb, pinfo, tree);
ret = tvb_length(tvb);
if (ret == 0) {
/*
* XXX - a tvbuff can have 0 bytes of data in
* it, so we have to make sure we don't return
* 0.
*/
ret = 1;
}
}
pinfo->current_proto = saved_proto;
pinfo->can_desegment = saved_can_desegment;