diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-21 12:25:57 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-21 19:26:33 +0000 |
| commit | 951ac6c230c0397767ac4bfc1b5aa668330dd68d (patch) | |
| tree | 74332af00563d1eff91916ed16c2539e3131960a | |
| parent | 4bf38d7c21c5091cf803f79873a41e20facb4e22 (diff) | |
| download | wireshark-951ac6c230c0397767ac4bfc1b5aa668330dd68d.tar.gz | |
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>
| -rw-r--r-- | capture_info.h | 8 | ||||
| -rw-r--r-- | epan/capture_dissectors.h | 12 | ||||
| -rw-r--r-- | epan/packet.h | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/capture_info.h b/capture_info.h index 8e2e7b6bed..fc9f52c4f2 100644 --- a/capture_info.h +++ b/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 */ diff --git a/epan/capture_dissectors.h b/epan/capture_dissectors.h index d4bbf194d8..d413ebc93e 100644 --- a/epan/capture_dissectors.h +++ b/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 */ diff --git a/epan/packet.h b/epan/packet.h index d6e512532f..6451d63677 100644 --- a/epan/packet.h +++ b/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); |