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 <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 10 insertions, 10 deletions

diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c
index 778f512e6a..061840f488 100644
--- a/epan/dissectors/packet-vlan.c
+++ b/epan/dissectors/packet-vlan.c
@@ -25,12 +25,12 @@
 #include "config.h"
 
 #include <epan/packet.h>
+#include <epan/capture_dissectors.h>
 #include <wsutil/pint.h>
 #include <epan/expert.h>
 #include "packet-ieee8023.h"
 #include "packet-ipx.h"
 #include "packet-llc.h"
-#include "packet-vlan.h"
 #include <epan/etypes.h>
 #include <epan/prefs.h>
 #include <epan/to_str.h>
@@ -98,23 +98,22 @@ static gint ett_vlan = -1;
 
 static expert_field ei_vlan_len = EI_INIT;
 
-void
+static gboolean
 capture_vlan(const guchar *pd, int offset, int len, packet_counts *ld, const union wtap_pseudo_header *pseudo_header _U_ ) {
   guint16 encap_proto;
-  if ( !BYTES_ARE_IN_FRAME(offset,len,5) ) {
-    ld->other++;
-    return;
-  }
+  if ( !BYTES_ARE_IN_FRAME(offset,len,5) )
+    return FALSE;
+
   encap_proto = pntoh16( &pd[offset+2] );
   if ( encap_proto <= IEEE_802_3_MAX_LEN) {
     if ( pd[offset+4] == 0xff && pd[offset+5] == 0xff ) {
-      capture_ipx(pd,offset+4,len,ld, pseudo_header);
+      return capture_ipx(pd,offset+4,len,ld, pseudo_header);
     } else {
-      capture_llc(pd,offset+4,len,ld, pseudo_header);
+      return capture_llc(pd,offset+4,len,ld, pseudo_header);
     }
-  } else {
-    capture_ethertype(encap_proto, pd, offset+4, len, ld, pseudo_header);
   }
+
+  return try_capture_dissector("ethertype", encap_proto, pd, offset+4, len, ld, pseudo_header);
 }
 
 static void
@@ -269,6 +268,7 @@ proto_reg_handoff_vlan(void)
   ethertype_handle = find_dissector("ethertype");
 
   dissector_add_uint("ethertype", q_in_q_ethertype, vlan_handle);
+  register_capture_dissector("ethertype", ETHERTYPE_VLAN, capture_vlan, hfi_vlan->id);
 }
 
 /*