diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2014-06-16 10:00:55 +0200 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2014-06-16 10:05:16 +0200 |
| commit | abec60cfddd94fa5f856c071f5b5861e81899f8a (patch) | |
| tree | 2b2eb12a09ac8d54aa14b2a8bef56326ac517f8f /dissector_80211.c | |
| parent | 91149e038fd865e8f977d32fff4de5bfb04f9f6d (diff) | |
dissector: Get rid of now unnecessary HAVE_DISSECTOR_PROTOS
Since commit 1cc762a ("lookup: Move UDP/TCP port and Ethernet type
lookup into own module") the netsniff-ng tool is the only one using the
dissector infrastructure. Thus we no longer need to conditionally device
HAVE_DISSECTOR_PROTOS, since netsniff-ng is the only tool defining this.
While at it, also remove the __WITH_PROTOS macro which is checked in
dissector_init_ethernet/dissector_cleanup_ethernet but is defined
nowhere. This will cause the functions to be called from both the
ethernet and ieee80211 dissectors, thus make sure we check the
initialization state before freeing as well.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'dissector_80211.c')
| -rw-r--r-- | dissector_80211.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/dissector_80211.c b/dissector_80211.c index e638e1e..28f5526 100644 --- a/dissector_80211.c +++ b/dissector_80211.c @@ -15,7 +15,6 @@ struct hash_table ieee80211_lay2; -#ifdef HAVE_DISSECTOR_PROTOS static inline void dissector_init_entry(int type) { dissector_set_print_type(&ieee80211_ops, type); @@ -32,11 +31,6 @@ static void dissector_init_layer_2(int type) // INSERT_HASH_PROTOS(blubber_ops, ieee80211_lay2); for_each_hash_int(&ieee80211_lay2, dissector_set_print_type, type); } -#else -static inline void dissector_init_entry(int type __maybe_unused) {} -static inline void dissector_init_exit(int type __maybe_unused) {} -static void dissector_init_layer_2(int type __maybe_unused) {} -#endif void dissector_init_ieee80211(int fnttype) { |