Try to fix some of the build problems, it still bumms out on:
[obnox/wireshark/wip.git] / capture.h
index 79084bd8334210d96af30cc6a2a36c07b58f3535..93ea812ba2ae77b3a1b267d1160186463789e7e0 100644 (file)
--- a/capture.h
+++ b/capture.h
 
 #include "capture_opts.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+typedef enum {
+    capture_cb_capture_prepared,
+    capture_cb_capture_update_started,
+    capture_cb_capture_update_continue,
+    capture_cb_capture_update_finished,
+    capture_cb_capture_fixed_started,
+    capture_cb_capture_fixed_continue,
+    capture_cb_capture_fixed_finished,
+    capture_cb_capture_stopping
+} capture_cbs;
+
+typedef void (*capture_callback_t) (gint event, capture_options *capture_opts,
+                                    gpointer user_data);
+
+extern void
+capture_callback_add(capture_callback_t func, gpointer user_data);
+
+extern void
+capture_callback_remove(capture_callback_t func);
+
 /**
  * Start a capture session.
  *
@@ -63,7 +87,7 @@ extern void capture_input_new_packets(capture_options *capture_opts, int to_read
 /**
  * Capture child told us how many dropped packets it counted.
  */
-extern void capture_input_drops(capture_options *capture_opts, int dropped);
+extern void capture_input_drops(capture_options *capture_opts, guint32 dropped);
 
 /**
  * Capture child told us that an error has occurred while starting the capture.
@@ -74,34 +98,23 @@ extern void capture_input_error_message(capture_options *capture_opts, char *err
  * Capture child told us that an error has occurred while parsing a
  * capture filter when starting/running the capture.
  */
-extern void capture_input_cfilter_error_message(capture_options *capture_opts, char *error_message);
+extern void capture_input_cfilter_error_message(capture_options *capture_opts, guint i, char *error_message);
 
 /**
- * Capture child closed its side of the pipe, do the required cleanup.
+ * Capture child closed its side of the pipe, report any error and
+ * do the required cleanup.
  */
-extern void capture_input_closed(capture_options *capture_opts);
-
-#ifdef HAVE_LIBPCAP
-/**
- * Fetch the interface list from a child process.
- */
-extern GList *capture_interface_list(int *err, char **err_str);
-
-/**
- * Fetch the linktype list for the specified interface from a child process.
- */
-extern GList *capture_pcap_linktype_list(const char *devname, char **err_str);
-
+extern void capture_input_closed(capture_options *capture_opts, gchar *msg);
 
 struct if_stat_cache_s;
 typedef struct if_stat_cache_s if_stat_cache_t;
 
 /**
  * Start gathering capture statistics for the interfaces specified.
- * @param A GList of if_info_t items
+ * @param if_list A GList of if_info_t items
  * @return A pointer to the statistics state data.
  */
-extern if_stat_cache_t * capture_stat_start(GList *if_list);
+extern if_stat_cache_t * capture_stat_start(capture_options *capture_opts);
 
 /**
  * Fetch capture statistics, similar to pcap_stats().
@@ -113,6 +126,9 @@ extern gboolean capture_stats(if_stat_cache_t *sc, char *ifname, struct pcap_sta
  * Stop gathering capture statistics.
  */
 void capture_stat_stop(if_stat_cache_t *sc);
-#endif /* HAVE_LIBPCAP */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
 
 #endif /* capture.h */