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-eap.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-eap.c')
| -rw-r--r-- | epan/dissectors/packet-eap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index c886b8bc8f..b8a1c47a58 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -320,7 +320,7 @@ from RFC2716, pg 17 /* * reassembly of EAP-TLS */ -static GHashTable *eap_tls_fragment_table = NULL; +static reassembly_table eap_tls_reassembly_table; static int hf_eap_tls_flags = -1; static int hf_eap_tls_flag_l = -1; @@ -413,7 +413,8 @@ test_flag(unsigned char flag, unsigned char mask) static void eap_tls_defragment_init(void) { - fragment_table_init(&eap_tls_fragment_table); + reassembly_table_init(&eap_tls_reassembly_table, + &addresses_reassembly_table_functions); } static void @@ -1002,12 +1003,12 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) */ save_fragmented = pinfo->fragmented; pinfo->fragmented = TRUE; - fd_head = fragment_add_seq(tvb, offset, pinfo, - eap_reass_cookie, - eap_tls_fragment_table, + fd_head = fragment_add_seq(&eap_tls_reassembly_table, + tvb, offset, + pinfo, eap_reass_cookie, NULL, eap_tls_seq, size, - more_fragments); + more_fragments, 0); if (fd_head != NULL) /* Reassembled */ { |