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

Postpone marking objects as expired until the whole frame is completed. 

We can have a case where one Lua dissector calls another Lua dissector,
so we can't mark all objects when only one dissector is completed.

This fixes comment #37 and #39 in bug 2453.

svn path=/trunk/; revision=28325
This commit is contained in:
Stig Bjørlykke 2009-05-10 15:56:57 +00:00
parent 328de9c584
commit 27a22f674f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
epan/wslua/init_wslua.c
View File

@ -1,5 +1,5 @@
/*
* packet-lua.c
* init_wslua.c
*
* Wireshark's interface to the Lua Programming Language
*
@ -27,6 +27,7 @@
*/
#include "wslua.h"
#include <epan/dissectors/packet-frame.h>
#include <epan/nstime.h>
#include <math.h>
#include <epan/expert.h>
@ -44,6 +45,14 @@ int lua_dissectors_table_ref;
dissector_handle_t lua_data_handle;
static void lua_frame_end(void)
{
clear_outstanding_Tvb();
clear_outstanding_Pinfo();
clear_outstanding_Column();
clear_outstanding_Columns();
clear_outstanding_TreeItem();
}
static int wslua_not_register_menu(lua_State* LS) {
luaL_error(LS,"too late to register a menu");
@ -104,12 +113,7 @@ int dissect_lua(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) {
expert_add_info_format(pinfo, pi, PI_DEBUG, PI_ERROR ,"Lua Error");
}
clear_outstanding_Tvb();
clear_outstanding_Pinfo();
clear_outstanding_Column();
clear_outstanding_Columns();
clear_outstanding_TreeItem();
register_frame_end_routine(lua_frame_end);
lua_pinfo = NULL;
lua_tree = NULL;