Put back a fix that earlier checkins lost.

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

diff --git a/capture.h b/capture.h
index a09829d58ee37e258cebc782fe08085fa20a7762..dd638870dca16afd504ae80b3cc362f4b8914e03 100644 (file)
--- a/capture.h
+++ b/capture.h
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 /* This file should only be included if libpcap is present */
@@ -32,6 +32,11 @@
  */
 
 #include "capture_opts.h"
+#include "capture_session.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 typedef enum {
     capture_cb_capture_prepared,
@@ -41,10 +46,11 @@ typedef enum {
     capture_cb_capture_fixed_started,
     capture_cb_capture_fixed_continue,
     capture_cb_capture_fixed_finished,
-    capture_cb_capture_stopping
+    capture_cb_capture_stopping,
+    capture_cb_capture_failed
 } capture_cbs;
 
-typedef void (*capture_callback_t) (gint event, capture_options *capture_opts,
+typedef void (*capture_callback_t) (gint event, capture_session *cap_session,
                                     gpointer user_data);
 
 extern void
@@ -59,58 +65,30 @@ capture_callback_remove(capture_callback_t func);
  * @param capture_opts the numerous capture options
  * @return TRUE if the capture starts successfully, FALSE otherwise.
  */
-extern gboolean capture_start(capture_options *capture_opts);
+extern gboolean
+capture_start(capture_options *capture_opts, capture_session *cap_session);
 
 /** Stop a capture session (usually from a menu item). */
-extern void capture_stop(capture_options *capture_opts);
+extern void
+capture_stop(capture_session *cap_session);
 
 /** Restart the current captured packets and start again. */
-extern void capture_restart(capture_options *capture_opts);
+extern void
+capture_restart(capture_session *cap_session);
 
 /** Terminate the capture child cleanly when exiting. */
-extern void capture_kill_child(capture_options *capture_opts);
-
-/**
- * Capture child told us we have a new (or the first) capture file.
- */
-extern gboolean capture_input_new_file(capture_options *capture_opts, gchar *new_file);
-
-/**
- * Capture child told us we have new packets to read.
- */
-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, guint32 dropped);
-
-/**
- * Capture child told us that an error has occurred while starting the capture.
- */
-extern void capture_input_error_message(capture_options *capture_opts, 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_options *capture_opts, 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_options *capture_opts, gchar *msg);
+extern void
+capture_kill_child(capture_session *cap_session);
 
 struct if_stat_cache_s;
 typedef struct if_stat_cache_s if_stat_cache_t;
 
 /**
  * Start gathering capture statistics for the interfaces specified.
- * @param if_list A GList of if_info_t items
+ * @param capture_opts A structure containing options for the capture.
  * @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().
@@ -123,4 +101,8 @@ extern gboolean capture_stats(if_stat_cache_t *sc, char *ifname, struct pcap_sta
  */
 void capture_stat_stop(if_stat_cache_t *sc);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* capture.h */