From 0960ac4dfdbfba5a81c56a49cfc6201ecd8f48e3 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 13 Dec 2015 16:54:16 -0500 Subject: Create capture dissector tables. They are modeled after dissection dissector tables, but for the moment, don't have/need the flexibility. They are intended to be much simpler/faster than full dissection. The two most used/needed are "wtap_encap" and "ethertype", so they were the basis of starting to use and test capture dissector table API. Others may be added in the future. The "capture dissector" function signature needed a bit of tweeking to handling "claiming" of a packet. The current application of this is capture functions returning TRUE if they affected a "type" of packet count. Returning FALSE ends up considering the packet an "other" type. Change-Id: I81d06a6ccb2c03665f087258a46b9d78d513d6cd Reviewed-on: https://code.wireshark.org/review/12607 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- capture_info.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'capture_info.c') diff --git a/capture_info.c b/capture_info.c index 1f9f104963..0d4afa380e 100644 --- a/capture_info.c +++ b/capture_info.c @@ -251,7 +251,8 @@ static void capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd, guint32 caplen, union wtap_pseudo_header *pseudo_header) { counts->total++; - call_capture_dissector(wtap_linktype, pd, 0, caplen, counts, pseudo_header); + if (!try_capture_dissector("wtap_encap", wtap_linktype, pd, 0, caplen, counts, pseudo_header)) + counts->other++; } -- cgit v1.2.3