Separate reassembly request methods in Lua API implementation.

Now both new-style and pinfo based method work without interference.

svn path=/trunk/; revision=27002
This commit is contained in:
Balint Reczey 2008-12-15 15:46:53 +00:00
parent 4607e187df
commit f64f7b1e8d
1 changed files with 2 additions and 8 deletions

View File

@ -91,14 +91,8 @@ int dissect_lua(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) {
/* if the Lua dissector reported the consumed bytes, pass it to our caller */
if (lua_isnumber(L, -1)) {
/* we got the consumed bytes of the missing bytes as a negative number */
if ((consumed_bytes = (int) lua_tonumber(L, -1)) < 0)
pinfo->desegment_len = 0 - consumed_bytes;
/* Lua dissectors may return DESEGMENT_ONE_MORE_SEGMENT indicating that
* it needs need more bytes, but the exact number of needed bytes is not known */
if (consumed_bytes == DESEGMENT_ONE_MORE_SEGMENT)
pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT;
/* we got the consumed bytes or the missing bytes as a negative number */
consumed_bytes = (int) lua_tonumber(L, -1);
lua_pop(L, 1);
}
}