remove wrong! string terminator detection

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

diff --git a/file.h b/file.h
index 716ea5da99e5c45ae6f3e4f51d67f94a968d0284..82640780debd373bf79eb00da8c2611d4a105483 100644 (file)
--- a/file.h
+++ b/file.h
@@ -60,16 +60,6 @@ typedef enum {
     cf_cb_file_closed,
     cf_cb_file_read_start,
     cf_cb_file_read_finished,
-#ifdef HAVE_LIBPCAP
-    cf_cb_live_capture_prepared,
-    cf_cb_live_capture_update_started,
-    cf_cb_live_capture_update_continue,
-    cf_cb_live_capture_update_finished,
-    cf_cb_live_capture_fixed_started,
-    cf_cb_live_capture_fixed_continue,
-    cf_cb_live_capture_fixed_finished,
-       cf_cb_live_capture_stopping,
-#endif
     cf_cb_packet_selected,
     cf_cb_packet_unselected,
     cf_cb_field_unselected,
@@ -81,9 +71,6 @@ typedef enum {
 
 typedef void (*cf_callback_t) (gint event, gpointer data, gpointer user_data);
 
-extern void
-cf_callback_invoke(int event, gpointer data);
-
 extern void
 cf_callback_add(cf_callback_t func, gpointer user_data);
 
@@ -142,7 +129,7 @@ cf_status_t cf_start_tail(capture_file *cf, const char *fname, gboolean is_tempf
  * @param err the error code, if an error had occured
  * @return one of cf_read_status_t
  */
-cf_read_status_t cf_continue_tail(capture_file *cf, int to_read, int *err);
+cf_read_status_t cf_continue_tail(capture_file *cf, volatile int to_read, int *err);
 
 /**
  * Finish reading from "end" of a capture file.
@@ -153,6 +140,15 @@ cf_read_status_t cf_continue_tail(capture_file *cf, int to_read, int *err);
  */
 cf_read_status_t cf_finish_tail(capture_file *cf, int *err);
 
+/**
+ * Determine whether this capture file (or a range of it) can be saved
+ * (except by copying the raw file data).
+ * 
+ * @param cf the capture file to check
+ * @return TRUE if it can be saved, FALSE if it can't
+ */
+gboolean cf_can_save_as(capture_file *cf);
+
 /**
  * Save a capture file (or a range of it).
  * 
@@ -160,7 +156,7 @@ cf_read_status_t cf_finish_tail(capture_file *cf, int *err);
  * @param fname the filename to save to
  * @param range the range of packets to save
  * @param save_format the format of the file to save (libpcap, ...)
- * @param compressed wether to gzip compress the file
+ * @param compressed whether to gzip compress the file
  * @return one of cf_status_t
  */
 cf_status_t cf_save(capture_file * cf, const char *fname, packet_range_t *range, guint save_format, gboolean compressed);
@@ -278,10 +274,9 @@ void cf_redissect_packets(capture_file *cf);
  * Rescan all packets and just run taps - don't reconstruct the display.
  * 
  * @param cf the capture file
- * @param do_columns TRUE if columns are to be generated, FALSE otherwise
  * @return one of cf_read_status_t
  */
-cf_read_status_t cf_retap_packets(capture_file *cf, gboolean do_columns);
+cf_read_status_t cf_retap_packets(capture_file *cf);
 
 /**
  * The time format has changed, rescan all packets.
@@ -326,6 +321,15 @@ cf_print_status_t cf_write_psml_packets(capture_file *cf, print_args_t *print_ar
  */
 cf_print_status_t cf_write_csv_packets(capture_file *cf, print_args_t *print_args);
 
+/**
+ * Print (export) the capture file into C Arrays format.
+ *
+ * @param cf the capture file
+ * @param print_args the arguments what and how to export
+ * @return one of cf_print_status_t
+ */
+cf_print_status_t cf_write_carrays_packets(capture_file *cf, print_args_t *print_args);
+
 /**
  * Find Packet in protocol tree.
  * 
@@ -443,10 +447,10 @@ void cf_unmark_frame(capture_file *cf, frame_data *frame);
  * Convert error number and info to a complete message.
  *
  * @param err the error number
- * @param err_info the additional info about this error (e.g. filename)
+ * @param err_info a string with additional details about this error
  * @return statically allocated error message
  */
-char *cf_read_error_message(int err, const gchar *err_info);
+char *cf_read_error_message(int err, gchar *err_info);
 
 /**
  * Merge two (or more) capture files into one.
@@ -465,4 +469,8 @@ cf_status_t
 cf_merge_files(char **out_filename, int in_file_count,
                char *const *in_filenames, int file_type, gboolean do_append);
 
+#if defined(HAVE_HEIMDAL_KERBEROS) || defined(HAVE_MIT_KERBEROS)
+void read_keytab_file(const char *);
+#endif
+
 #endif /* file.h */