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-batadv.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-batadv.c')
-rw-r--r-- | epan/dissectors/packet-batadv.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 8e3cf01b72..357ab2d69c 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -581,8 +581,7 @@ static int batadv_tap = -1; static int batadv_follow_tap = -1; /* segmented messages */ -static GHashTable *msg_fragment_table = NULL; -static GHashTable *msg_reassembled_table = NULL; +static reassembly_table msg_reassembly_table; static unsigned int batadv_ethertype = ETH_P_BATMAN; @@ -2320,10 +2319,9 @@ static void dissect_batadv_unicast_frag_v12(tvbuff_t *tvb, packet_info *pinfo, p length_remaining = tvb_length_remaining(tvb, offset); if (length_remaining < 0) length_remaining = 0; - frag_msg = fragment_add_seq_check(tvb, offset, pinfo, - unicast_frag_packeth->seqno + head, - msg_fragment_table, - msg_reassembled_table, + frag_msg = fragment_add_seq_check(&msg_reassembly_table, + tvb, offset, + pinfo, unicast_frag_packeth->seqno + head, NULL, 1 - head, length_remaining, head); @@ -2435,10 +2433,9 @@ static void dissect_batadv_unicast_frag_v14(tvbuff_t *tvb, packet_info *pinfo, p length_remaining = tvb_length_remaining(tvb, offset); if (length_remaining < 0) length_remaining = 0; - frag_msg = fragment_add_seq_check(tvb, offset, pinfo, - unicast_frag_packeth->seqno + head, - msg_fragment_table, - msg_reassembled_table, + frag_msg = fragment_add_seq_check(&msg_reassembly_table, + tvb, offset, + pinfo, unicast_frag_packeth->seqno + head, NULL, 1 - head, length_remaining, head); @@ -3159,8 +3156,8 @@ static void dissect_batadv_roam_adv_v14(tvbuff_t *tvb, packet_info *pinfo, proto static void batadv_init_routine(void) { - fragment_table_init(&msg_fragment_table); - reassembled_table_init(&msg_reassembled_table); + reassembly_table_init(&msg_reassembly_table, + &addresses_reassembly_table_functions); } void proto_register_batadv(void) |