aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-12-10 14:10:17 +0100
committerAnders Broman <a.broman58@gmail.com>2015-12-11 05:17:58 +0000
commitea1789f925f49027e6b2864e6cc846b7016dc13b (patch)
tree6e85ad0ec120dbcca96625db53b1b4da202b1e33 /epan/proto.c
parent9c47cb4254e6aa188cd15c1aebe660a6356d91ca (diff)
Qt: Reload Lua expert infos
Support reloading Lua plugins with expert infos. Use the same delayed deregister logic as for fields. Change-Id: I36efa0820050b3a7afed4de7a8b0fa16805e8dfa Reviewed-on: https://code.wireshark.org/review/12498 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/proto.c b/epan/proto.c
index 28d3677f5e..783af76eea 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -5400,6 +5400,7 @@ proto_deregister_protocol(const char *short_name)
for (i = 0; i < protocol->fields->len; i++) {
hfinfo = (header_field_info *)g_ptr_array_index(protocol->fields, i);
hfinfo_remove_from_gpa_name_map(hfinfo);
+ expert_deregister_expertinfo(hfinfo->abbrev);
g_ptr_array_add(deregistered_fields, gpa_hfinfo.hfi[hfinfo->id]);
}
g_ptr_array_free(protocol->fields, TRUE);
@@ -5919,6 +5920,8 @@ free_deregistered_data (gpointer data, gpointer user_data _U_)
void
proto_free_deregistered_fields (void)
{
+ expert_free_deregistered_expertinfos();
+
g_ptr_array_foreach(deregistered_fields, free_deregistered_field, NULL);
g_ptr_array_free(deregistered_fields, TRUE);
deregistered_fields = g_ptr_array_new();