Fix Missing -z proto,colinfo,ip,gtp.teid_cp and -z proto,colinfo,ip,gtp.teid_data

[obnox/wireshark/wip.git] / epan / tap.h

diff --git a/epan/tap.h b/epan/tap.h
index 0834ce90e4868b0b0d65c9d720428d7eaf86237d..30dfffb9f94035d063fc6232c93b9a7bdc1b2c6a 100644 (file)
--- a/epan/tap.h
+++ b/epan/tap.h
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  * 
  * This program is free software; you can redistribute it and/or
@@ -27,10 +27,14 @@
 
 #include "epan/epan.h"
 
-/* With MSVC and a libethereal.dll, we need a 
+#ifdef INTTYPES_H_DEFINES_FORMATS
+#include <inttypes.h>
+#endif
+
+/* With MSVC and a libwireshark.dll, we need a 
  * special declaration of num_tap_filters.
  */
-ETH_VAR_IMPORT int num_tap_filters;
+WS_VAR_IMPORT int num_tap_filters;
 
 typedef void (*tap_reset_cb)(void *tapdata);
 typedef int  (*tap_packet_cb)(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data);
@@ -38,10 +42,6 @@ typedef void (*tap_draw_cb)(void *tapdata);
 
 
 extern void tap_init(void);
-extern void register_tap_listener_cmd_arg(const char *cmd, void (*func)(char *arg));
-extern gboolean process_tap_cmd_arg(char *optarg);
-extern void list_tap_cmd_args(void);
-extern void start_requested_taps(void);
 extern int register_tap(const char *name);
 extern int find_tap_id(const char *name);
 extern void tap_queue_packet(int tap_id, packet_info *pinfo, const void *tap_specific_data);
@@ -50,9 +50,11 @@ extern void tap_push_tapped_queue(epan_dissect_t *edt);
 extern void reset_tap_listeners(void);
 extern void draw_tap_listeners(gboolean draw_all);
 extern GString *register_tap_listener(const char *tapname, void *tapdata,
-    char *fstring, tap_reset_cb tap_reset, tap_packet_cb tap_packet,
+    const char *fstring, tap_reset_cb tap_reset, tap_packet_cb tap_packet,
     tap_draw_cb tap_draw);
 extern void remove_tap_listener(void *tapdata);
 extern gboolean have_tap_listeners(void);
+extern gboolean have_tap_listener(int tap_id);
+extern const void *fetch_tapped_data(int tap_id, int idx);
 
 #endif