summaryrefslogtreecommitdiffstats
path: root/epan/packet.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-17 15:00:52 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-17 15:00:52 +0000
commit0f157e7d6c4be48f213ea022cb2d6d1316c423c8 (patch)
treeff4ad271b50a39e23d5a50a54f4bff37342cdc1c /epan/packet.c
parentAdding debian version 4.2.4-1. (diff)
downloadwireshark-0f157e7d6c4be48f213ea022cb2d6d1316c423c8.tar.xz
wireshark-0f157e7d6c4be48f213ea022cb2d6d1316c423c8.zip
Merging upstream version 4.2.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/packet.c')
-rw-r--r--epan/packet.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/epan/packet.c b/epan/packet.c
index 5a4c70a1..19b54bc3 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -3165,6 +3165,17 @@ register_heur_dissector_list(const char *name, const int proto)
return sub_dissectors;
}
+void
+deregister_heur_dissector_list(const char *name)
+{
+ heur_dissector_list_t sub_dissectors = find_heur_dissector_list(name);
+ if (sub_dissectors == NULL) {
+ return;
+ }
+
+ g_hash_table_remove(heur_dissector_lists, name);
+}
+
/*
* Register dissectors by name; used if one dissector always calls a
* particular dissector, or if it bases the decision of which dissector
@@ -3429,7 +3440,6 @@ deregister_dissector(const char *name)
g_hash_table_remove(registered_dissectors, name);
g_hash_table_remove(depend_dissector_lists, name);
g_hash_table_foreach(depend_dissector_lists, remove_depend_dissector_ghfunc, (gpointer)name);
- g_hash_table_remove(heur_dissector_lists, name);
destroy_dissector_handle(handle);
}