Revert r35132 so that a better fix can be implemented that doesn't break

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

diff --git a/util.h b/util.h
index 6a36487fb2a68efde8c0d3da181b52f01eddefbf..2849b05cd652d795a99bbed5bc0e7bb083fa950d 100644 (file)
--- a/util.h
+++ b/util.h
@@ -1,10 +1,10 @@
 /* util.h
  * Utility definitions
  *
- * $Id: util.h,v 1.30 2003/11/18 04:16:28 gerald Exp $
+ * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -29,38 +29,29 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/*
- * Get various library compile-time versions and append them to
- * the specified GString.
+/* Collect command-line arguments as a string consisting of the arguments,
+ * separated by spaces.
  */
-void get_compiled_version_info(GString *str);
+char *get_args_as_string(int argc, char **argv, int optindex);
 
-/*
- * Get various library run-time versions, and the OS version, and append
- * them to the specified GString.
+/* Compute the difference between two seconds/microseconds time stamps.
+ * Beware: we're using nanosecond resolution now and function is currently unused
  */
-void get_runtime_version_info(GString *str);
-
-int create_tempfile(char *, int, const char *);
-
-/*
- * Collect command-line arguments as a string consisting of the arguments,
- * separated by spaces.
+void compute_timestamp_diff(gint *diffsec, gint *diffusec, 
+                            guint32 sec1, guint32 usec1, guint32 sec2, guint32 usec2);
+
+/* Try to figure out if we're remotely connected, e.g. via ssh or
+   Terminal Server, and create a capture filter that matches aspects of the
+   connection.  We match the following environment variables:
+
+   SSH_CONNECTION (ssh): <remote IP> <remote port> <local IP> <local port>
+   SSH_CLIENT (ssh): <remote IP> <remote port> <local port>
+   REMOTEHOST (tcsh, others?): <remote name>
+   DISPLAY (x11): [remote name]:<display num>
+   CLIENTNAME (terminal server): <remote name>
  */
-char *get_args_as_string(int argc, char **argv, int optind);
-
-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);
-
-/* Compute the difference between two seconds/microseconds time stamps. */
-void compute_timestamp_diff(gint *, gint *, guint32, guint32, guint32, guint32);
-/* In-place decoding of a base64 string. */
-size_t base64_decode(char *s);
+const char *get_conn_cfilter(void);
 
-/* Create a capture filter for the connection */
-char *get_conn_cfilter(void);
 
 #ifdef __cplusplus
 }