diff options
| author | Evan Huus <eapache@gmail.com> | 2013-08-13 03:11:28 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-08-13 03:11:28 +0000 |
| commit | a2b2885daf8c4a6dd9b4beda67d2d47ce974999d (patch) | |
| tree | b0b2f51350dc676e5a15edceb19fcefe14436153 /epan/epan.c | |
| parent | 14b098baf7ac4ba8382b4038fd717b5e186c03b8 (diff) | |
Create the dissector hash table in only one place, and specify that its values
should be freed when it is destroyed. This requires splitting packet_init in
two: the hash table which must be created before protocol registration, and the
caching of common protocol handles, which must happen after registration.
svn path=/trunk/; revision=51329
Diffstat (limited to 'epan/epan.c')
| -rw-r--r-- | epan/epan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/epan.c b/epan/epan.c index 5c81dfe8d0..6555932c72 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -108,9 +108,10 @@ epan_init(void (*register_all_protocols_func)(register_cb cb, gpointer client_da tap_init(); prefs_init(); expert_init(); + packet_init(); proto_init(register_all_protocols_func, register_all_handoffs_func, cb, client_data); - packet_init(); + packet_cache_proto_handles(); dfilter_init(); final_registration_all_protocols(); expert_packet_init(); |