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-gsm_sms.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-gsm_sms.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_sms.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index ba4a91beae..3ee4e3b37e 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -192,8 +192,7 @@ static gboolean g_is_wsp; static dissector_table_t gsm_sms_dissector_tbl; /* Short Message reassembly */ -static GHashTable *g_sm_fragment_table = NULL; -static GHashTable *g_sm_reassembled_table = NULL; +static reassembly_table g_sm_reassembly_table; static GHashTable *g_sm_fragment_params_table = NULL; static gint ett_gsm_sms_ud_fragment = -1; static gint ett_gsm_sms_ud_fragments = -1; @@ -242,8 +241,8 @@ typedef struct { static void gsm_sms_defragment_init (void) { - fragment_table_init (&g_sm_fragment_table); - reassembled_table_init(&g_sm_reassembled_table); + reassembly_table_init(&g_sm_reassembly_table, + &addresses_reassembly_table_functions); if (g_sm_fragment_params_table) { g_hash_table_destroy(g_sm_fragment_params_table); } @@ -2672,10 +2671,10 @@ dis_field_ud(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 length, gb try_gsm_sms_ud_reassemble = TRUE; save_fragmented = g_pinfo->fragmented; g_pinfo->fragmented = TRUE; - fd_sm = fragment_add_seq_check (tvb, offset, g_pinfo, + fd_sm = fragment_add_seq_check (&g_sm_reassembly_table, tvb, offset, + g_pinfo, g_sm_id, /* guint32 ID for fragments belonging together */ - g_sm_fragment_table, /* list of message fragments */ - g_sm_reassembled_table, /* list of reassembled messages */ + NULL, g_frag-1, /* guint32 fragment sequence number */ length, /* guint32 fragment length */ (g_frag != g_frags)); /* More fragments? */ |