osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Preparation to make it possible to dissable heuristic protocols 

trough the proto dialouge.

svn path=/trunk/; revision=40215
This commit is contained in:
Anders Broman 2011-12-15 20:39:01 +00:00
parent 939ae71194
commit 8259fbb105
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/packet.c
View File

@ -1593,6 +1593,7 @@ heur_dissector_add(const char *name, heur_dissector_t dissector, const int proto
dtbl_entry = g_malloc(sizeof (heur_dtbl_entry_t));
dtbl_entry->dissector = dissector;
dtbl_entry->protocol = find_protocol_by_id(proto);
dtbl_entry->enabled = TRUE;
/* do the table insertion */
*sub_dissectors = g_slist_append(*sub_dissectors, (gpointer)dtbl_entry);
@ -1665,7 +1666,7 @@ dissector_try_heuristic(heur_dissector_list_t sub_dissectors,
dtbl_entry = (heur_dtbl_entry_t *)entry->data;
if (dtbl_entry->protocol != NULL &&
!proto_is_protocol_enabled(dtbl_entry->protocol)) {
(!proto_is_protocol_enabled(dtbl_entry->protocol)||(dtbl_entry->enabled==FALSE))) {
/*
* No - don't try this dissector.
*/

1
epan/packet.h
View File

@ -273,6 +273,7 @@ typedef GSList *heur_dissector_list_t;
typedef struct {
heur_dissector_t dissector;
protocol_t *protocol;
gboolean enabled;
} heur_dtbl_entry_t;
/** A protocol uses this function to register a heuristic sub-dissector list.