aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-01-24 17:10:20 -0800
committerGuy Harris <guy@alum.mit.edu>2016-01-25 02:24:34 +0000
commit099698445b5cd60b00777ae47f68fba620fa975e (patch)
tree8c37921e0fa9893dd0c00e3b66f287c4d7d1a78d /epan/tap.c
parent6beb19af8e86c17d9b2d69bf1cc0b2e24fbc111b (diff)
Move the proto data stuff out of frame_data.[ch].
It's not tied to the frame_data structure any more, so it belongs by itself. Clean up some #includes while we're at it; in particular, frame_data.h doesn't use anything related to tvbuffs, so don't have it gratuitiously include tvbuff.h. Change-Id: Ic32922d4a3840bac47007c5d4c546b8842245e0c Reviewed-on: https://code.wireshark.org/review/13518 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/tap.c')
-rw-r--r--epan/tap.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/tap.c b/epan/tap.c
index 455a331e4e..16db81d619 100644
--- a/epan/tap.c
+++ b/epan/tap.c
@@ -33,9 +33,13 @@
#endif
#include <string.h>
+
+#include <glib.h>
+
#include <epan/packet_info.h>
#include <epan/dfilter/dfilter.h>
#include <epan/tap.h>
+
#include <wsutil/ws_diag_control.h>
static gboolean tapping_is_active=FALSE;