we can merge more than two files with mergecap

[obnox/wireshark/wip.git] / util.h

diff --git a/util.h b/util.h
index 9ea2a8bfa348b386c889cc3da49df9ade39741fd..eadf6b9e686025ad7da5ed1fac89993ffcd0bb15 100644 (file)
--- a/util.h
+++ b/util.h
@@ -1,23 +1,22 @@
 /* util.h
  * Utility definitions
  *
- * $Id: util.h,v 1.15 2000/01/16 02:47:47 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * Copyright 1998 Gerald Combs
  *
- * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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.
@@ -32,22 +31,17 @@ extern "C" {
 
 int create_tempfile(char *, int, const char *);
 
-void ASCII_to_EBCDIC(guint8 *buf, guint bytes);
-guint8 ASCII_to_EBCDIC1(guint8 c);
-void EBCDIC_to_ASCII(guint8 *buf, guint bytes);
-guint8 EBCDIC_to_ASCII1(guint8 c);
-
-#ifdef HAVE_LIBPCAP
-
-GList *get_interface_list(int *err, char *err_str);
-
-/* Error values from "get_interface_list()". */
-#define        CANT_GET_INTERFACE_LIST 0       /* error getting list */
-#define        NO_INTERFACES_FOUND     1       /* list is empty */
+/*
+ * Collect command-line arguments as a string consisting of the arguments,
+ * separated by spaces.
+ */
+char *get_args_as_string(int, char **, int);
 
-void free_interface_list(GList *if_list);
+/* Compute the difference between two seconds/microseconds time stamps. */
+void compute_timestamp_diff(gint *, gint *, guint32, guint32, guint32, guint32);
 
-#endif
+/* Create a capture filter for the connection */
+char *get_conn_cfilter(void);
 
 #ifdef __cplusplus
 }