osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Save and restore the value of pinfo->current_proto when calling a 

dissector in call_dissector_through_handle().

svn path=/trunk/; revision=8160
This commit is contained in:
Tim Potter 2003-08-12 20:09:38 +00:00
parent bb9f332da6
commit 3f6e918109
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/packet.c
View File

@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
* $Id: packet.c,v 1.93 2003/06/05 04:47:58 guy Exp $
* $Id: packet.c,v 1.94 2003/08/12 20:09:38 tpot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -346,8 +346,16 @@ static int
call_dissector_through_handle(dissector_handle_t handle, tvbuff_t *tvb,
packet_info *pinfo, proto_tree *tree)
{
const char *saved_proto;
int ret;
saved_proto = pinfo->current_proto;
if (handle->proto_index != -1) {
pinfo->current_proto =
proto_get_protocol_short_name(handle->proto_index);
}
if (handle->is_new)
ret = (*handle->dissector.new)(tvb, pinfo, tree);
else {
@ -362,6 +370,9 @@ call_dissector_through_handle(dissector_handle_t handle, tvbuff_t *tvb,
ret = 1;
}
}
pinfo->current_proto = saved_proto;
return ret;
}