Move the geometry shenanigans a bit further ahead in the startup

[metze/wireshark/wip.git] / capture_sync.h

diff --git a/capture_sync.h b/capture_sync.h
index 4d9ac967d6aff5cb155e72acf2e2dac7b8772f3b..507abfae7d8cd813a7970e5bdc4004e8534256bf 100644 (file)
--- a/capture_sync.h
+++ b/capture_sync.h
@@ -34,7 +34,6 @@
 #ifndef __CAPTURE_SYNC_H__
 #define __CAPTURE_SYNC_H__
 
-
 /**
  * Start a new capture session.
  *  Create a capture child which is doing the real capture work.
@@ -44,14 +43,15 @@
  *  Most of the parameters are passed through the global capture_opts.
  *
  *  @param capture_opts the options
+ *  @param cap_session a handle for the capture session
  *  @return             TRUE if a capture could be started, FALSE if not
  */
 extern gboolean
-sync_pipe_start(capture_options *capture_opts);
+sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, void(*update_cb)(void));
 
 /** User wants to stop capturing, gracefully close the capture child */
 extern void
-sync_pipe_stop(capture_options *capture_opts);
+sync_pipe_stop(capture_session *cap_session);
 
 /** User wants to stop the program, just kill the child as soon as possible */
 extern void
@@ -59,24 +59,24 @@ sync_pipe_kill(int fork_child);
 
 /** Set wireless channel using dumpcap */
 extern int
-sync_interface_set_80211_chan(gchar *iface, char *freq, gchar *type,
+sync_interface_set_80211_chan(const gchar *iface, const char *freq, const gchar *type,
                               gchar **data, gchar **primary_msg,
-                              gchar **secondary_msg);
+                              gchar **secondary_msg, void (*update_cb)(void));
 
 /** Get an interface list using dumpcap */
 extern int
 sync_interface_list_open(gchar **data, gchar **primary_msg,
-                         gchar **secondary_msg);
+                         gchar **secondary_msg, void (*update_cb)(void));
 
 /** Get interface capabilities using dumpcap */
 extern int
 sync_if_capabilities_open(const gchar *ifname, gboolean monitor_mode,
                           gchar **data, gchar **primary_msg,
-                          gchar **secondary_msg);
+                          gchar **secondary_msg, void (*update_cb)(void));
 
 /** Start getting interface statistics using dumpcap. */
 extern int
-sync_interface_stats_open(int *read_fd, int *fork_child, gchar **msg);
+sync_interface_stats_open(int *read_fd, int *fork_child, gchar **msg, void (*update_cb)(void));
 
 /** Stop gathering statistics. */
 extern int
@@ -86,5 +86,54 @@ sync_interface_stats_close(int *read_fd, int *fork_child, gchar **msg);
 extern int
 sync_pipe_gets_nonblock(int pipe_fd, char *bytes, int max);
 
+/*
+ * Routines supplied by our caller; we call them back to notify them
+ * of various events.
+ *
+ * XXX - this is *really* ugly.  We should do this better.
+ */
+
+/**
+ * Capture child told us we have a new (or the first) capture file.
+ */
+extern gboolean
+capture_input_new_file(capture_session *cap_session, gchar *new_file);
+
+/**
+ * Capture child told us we have new packets to read.
+ */
+extern void
+capture_input_new_packets(capture_session *cap_session, int to_read);
+
+/**
+ * Capture child told us how many dropped packets it counted.
+ */
+extern void
+capture_input_drops(capture_session *cap_session, guint32 dropped);
+
+/**
+ * Capture child told us that an error has occurred while starting the capture.
+ */
+extern void
+capture_input_error_message(capture_session *cap_session, char *error_message,
+                            char *secondary_error_msg);
+
+/**
+ * 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_session *cap_session, guint i,
+                                    char *error_message);
+
+/**
+ * Capture child closed its side of the pipe, report any error and
+ * do the required cleanup.
+ */
+extern void
+capture_input_closed(capture_session *cap_session, gchar *msg);
+
+/* set a callback to be called after fork with the pid of the forked child */
+extern void capture_sync_set_fetch_dumpcap_pid_cb(void(*cb)(int pid));
 
 #endif /* capture_sync.h */