Put all the capture dissector structures into epan/capture_dissectors.h.

Don't scatter them amongst various other headers.

Change-Id: I243954222cd4ad3e6bbe8b4d1dd25ee4952f87d6
Reviewed-on: https://code.wireshark.org/review/21277
Reviewed-by: Guy Harris <guy@alum.mit.edu>

capture_info.h

@@ -38,18 +38,12 @@
 
 #include "capture_opts.h"
 #include <capchild/capture_session.h>
+#include <epan/capture_dissectors.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-typedef struct {
-    GHashTable*       counts_hash; /* packet counters keyed by proto */
-    gint              other;      /* Packets not counted in the hash total */
-    gint              total;      /* Cache of total packets */
-
-} packet_counts;
-
 /** Current Capture info. */
 typedef struct {
     /* handle */

epan/capture_dissectors.h

@@ -25,7 +25,6 @@
 
 #include "ws_symbol_export.h"
 #include <wiretap/wtap.h>
-#include <capture_info.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,6 +33,17 @@ extern "C" {
 /** @file
  */
 
+/** Table of counts of packets of various types. */
+typedef struct {
+    GHashTable*       counts_hash; /* packet counters keyed by proto */
+    gint              other;       /* Packets not counted in the hash total */
+    gint              total;       /* Cache of total packets */
+} packet_counts;
+
+typedef struct _capture_packet_info {
+    GHashTable *counts;
+} capture_packet_info_t;
+
 typedef struct capture_dissector_handle* capture_dissector_handle_t;
 
 /** callback function definition for capture dissectors */

epan/packet.h

@@ -58,10 +58,6 @@ struct epan_range;
 	((guint)(offset) + (guint)(len) > (guint)(offset) && \
 	 (guint)(offset) + (guint)(len) <= (guint)(captured_len))
 
-typedef struct _capture_packet_info {
-    GHashTable *counts;
-} capture_packet_info_t;
-
 extern void packet_init(void);
 extern void packet_cache_proto_handles(void);
 extern void packet_cleanup(void);