diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-03-22 23:59:54 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-03-22 23:59:54 +0000 |
commit | a2414d8909088ddb40c907886e725993e6baecb5 (patch) | |
tree | 53f0ebac8baa171f4317c7eb502a354da8596c72 /epan/dissectors/packet-lapsat.c | |
parent | 3295912210fa1a8d7d0b1a18aa7c100f27905ed1 (diff) |
Don't wire into the reassembly code the notion that reassemblies should
be done on flows from one address to another; reassembly for protocols
running atop TCP should be done on flows from one TCP endpoint to
another.
We do this by:
adding "reassembly table" as a data structure;
associating hash tables for both in-progress reassemblies and
completed reassemblies with that data structure (currently, not
all reassemblies use the latter; they might keep completed
reassemblies in the first table);
having functions to create and destroy keys in that table;
offering standard routines for doing address-based and
address-and-port-based flow processing, so that dissectors not
needing their own specialized flow processing can just use them.
This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where
the second YPALL response is processed as if it were a continuation of
a previous response between different endpoints, even though said
response is already reassembled), and also allows the DCE RPC-specific
stuff to be moved out of epan/reassembly.c into the DCE RPC dissector.
svn path=/trunk/; revision=48491
Diffstat (limited to 'epan/dissectors/packet-lapsat.c')
-rw-r--r-- | epan/dissectors/packet-lapsat.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-lapsat.c b/epan/dissectors/packet-lapsat.c index 8020eb9414..e4e989df99 100644 --- a/epan/dissectors/packet-lapsat.c +++ b/epan/dissectors/packet-lapsat.c @@ -42,8 +42,7 @@ static int proto_lapsat = -1; -static GHashTable *lapsat_fragment_table = NULL; -static GHashTable *lapsat_reassembled_table = NULL; +static reassembly_table lapsat_reassembly_table; static dissector_table_t lapsat_sapi_dissector_table; @@ -251,8 +250,8 @@ static const fragment_items lapsat_frag_items = { static void lapsat_defragment_init(void) { - fragment_table_init(&lapsat_fragment_table); - reassembled_table_init(&lapsat_reassembled_table); + reassembly_table_init(&lapsat_reassembly_table, + &addresses_reassembly_table_functions); } @@ -535,10 +534,11 @@ dissect_lapsat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Fragment reconstruction helpers */ fd_m = fragment_add_seq_next( - payload, 0, pinfo, + &lapsat_reassembly_table, + payload, 0, + pinfo, fragment_id, /* To group fragments */ - lapsat_fragment_table, - lapsat_reassembled_table, + NULL, plen, !!(addr & LAPSAT_SI) /* More fragment ? */ ); |