More warining fixes: char -> const char
[obnox/wireshark/wip.git] / util.c
diff --git a/util.c b/util.c
index b5789fe07a4a4f042349403df5c784bcfe644c74..7b61d1b3f1e35967f664f10a32b309e8195b6e94 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,7 +1,7 @@
 /* util.c
  * Utility routines
  *
- * $Id: util.c,v 1.68 2003/08/18 18:41:24 guy Exp $
+ * $Id$
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -56,314 +56,20 @@ typedef int mode_t;        /* for win32 */
 #endif /* __MINGW32__ */
 #endif /* HAVE_IO_H */
 
-#ifdef HAVE_LIBZ
-#include <zlib.h>      /* to get the libz version number */
-#endif
-
-#ifdef HAVE_LIBPCAP
-#include <pcap.h>
-#ifdef WIN32
-#include "capture-wpcap.h"
-#endif /* WIN32 */
-#endif /* HAVE_LIBPCAP */
-
-#ifdef HAVE_SOME_SNMP
-
-#ifdef HAVE_NET_SNMP
-#include <net-snmp/version.h>
-#endif /* HAVE_NET_SNMP */
-
-#ifdef HAVE_UCD_SNMP
-#include <ucd-snmp/version.h>
-#endif /* HAVE_UCD_SNMP */
-
-#endif /* HAVE_SOME_SNMP */
-
-#ifdef HAVE_SYS_UTSNAME_H
-#include <sys/utsname.h>
-#endif
-
-#include "util.h"
+#include <epan/address.h>
+#include <epan/addr_resolv.h>
 
 /*
- * See whether the last line in the string goes past column 80; if so,
- * replace the blank at the specified point with a newline.
+ * This has to come after the include of <pcap.h>, as the include of
+ * <pcap.h> might cause <winsock2.h> to be included, and if we've
+ * already included <winsock.h> as a result of including <windows.h>,
+ * we get a bunch of redefinitions.
  */
-static void
-do_word_wrap(GString *str, gint point)
-{
-       char *line_begin;
-
-       line_begin = strrchr(str->str, '\n');
-       if (line_begin == NULL)
-               line_begin = str->str;
-       else
-               line_begin++;
-       if (strlen(line_begin) > 80) {
-               g_assert(str->str[point] == ' ');
-               str->str[point] = '\n';
-       }
-}      
-
-/*
- * Get various library compile-time versions and append them to
- * the specified GString.
- */
-void
-get_compiled_version_info(GString *str)
-{
-#ifdef HAVE_LIBPCAP
-#ifdef HAVE_PCAP_VERSION
-       extern char pcap_version[];
-#endif /* HAVE_PCAP_VERSION */
-#endif /* HAVE_LIBPCAP */
-       gint break_point;
-
-       g_string_append(str, "with ");
-       g_string_sprintfa(str,
-#ifdef GLIB_MAJOR_VERSION
-           "GLib %d.%d.%d,", GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION,
-           GLIB_MICRO_VERSION);
-#else
-           "GLib (version unknown),");
-#endif
-
-#ifdef HAVE_LIBPCAP
-       g_string_append(str, " ");
-       break_point = str->len - 1;
-#ifdef WIN32
-       g_string_append(str, "with WinPcap (version unknown)");
-#else /* WIN32 */
-#ifdef HAVE_PCAP_VERSION
-       g_string_sprintfa(str, "with libpcap %s,", pcap_version);
-#else /* HAVE_PCAP_VERSION */
-       g_string_append(str, "with libpcap (version unknown)");
-#endif /* HAVE_PCAP_VERSION */
-       do_word_wrap(str, break_point);
-#endif /* WIN32 */
-#else /* HAVE_LIBPCAP */
-       g_string_append(str, " ");
-       break_point = str->len - 1;
-#ifdef WIN32
-       g_string_append(str, "without WinPcap,");
-#else /* WIN32 */
-       g_string_append(str, "without libpcap,");
-#endif /* WIN32 */
-       do_word_wrap(str, break_point);
-#endif /* HAVE_LIBPCAP */
-
-       g_string_append(str, " ");
-       break_point = str->len - 1;
-#ifdef HAVE_LIBZ
-       g_string_append(str, "with libz ");
-#ifdef ZLIB_VERSION
-       g_string_append(str, ZLIB_VERSION);
-#else /* ZLIB_VERSION */
-       g_string_append(str, "(version unknown)");
-#endif /* ZLIB_VERSION */
-#else /* HAVE_LIBZ */
-       g_string_append(str, "without libz");
-#endif /* HAVE_LIBZ */
-       g_string_append(str, ",");
-       do_word_wrap(str, break_point);
-
-/* Oh, this is pretty. */
-/* Oh, ha.  you think that was pretty.  Try this:! --Wes */
-       g_string_append(str, " ");
-       break_point = str->len - 1;
-#ifdef HAVE_SOME_SNMP
-
-#ifdef HAVE_UCD_SNMP
-       g_string_append(str, "with UCD-SNMP ");
-       g_string_append(str, VersionInfo);
-#endif /* HAVE_UCD_SNMP */
-
-#ifdef HAVE_NET_SNMP
-       g_string_append(str, "with Net-SNMP ");
-       g_string_append(str, netsnmp_get_version());
-#endif /* HAVE_NET_SNMP */
-
-#else /* no SNMP library */
-       g_string_append(str, "without UCD-SNMP or Net-SNMP");
-#endif /* HAVE_SOME_SNMP */
-       g_string_append(str, ",");
-       do_word_wrap(str, break_point);
-
-       g_string_append(str, " ");
-       break_point = str->len - 1;
-#ifdef HAVE_GNU_ADNS
-       g_string_append(str, "with ADNS");
-#else
-       g_string_append(str, "without ADNS");
-#endif /* HAVE_GNU_ADNS */
-       do_word_wrap(str, break_point);
-}
-
-/*
- * Get various library run-time versions, and the OS version, and append
- * them to the specified GString.
- */
-void
-get_runtime_version_info(GString *str)
-{
-#if defined(WIN32)
-       OSVERSIONINFO info;
-#elif defined(HAVE_SYS_UTSNAME_H)
-       struct utsname name;
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
 #endif
 
-#ifdef HAVE_LIBPCAP
-#ifdef WIN32
-       /*
-        * On Windows, we might have been compiled with WinPcap but
-        * might not have it loaded; indicate whether we have it or
-        * not.
-        *
-        * XXX - when versions of libcap and WinPcap with
-        * "pcap_lib_version()" are released, we should use it
-        * here if available.
-        */
-       if (has_wpcap)
-               g_string_sprintfa(str, "with WinPcap ");
-       else
-               g_string_append(str, "without WinPcap ");
-#endif /* WIN32 */
-#endif /* HAVE_LIBPCAP */
-
-       g_string_append(str, "on ");
-#if defined(WIN32)
-       info.dwOSVersionInfoSize = sizeof info;
-       if (!GetVersionEx(&info)) {
-               /*
-                * XXX - get the failure reason.
-                */
-               g_string_append(str, "unknown Windows version");
-               return;
-       }
-       switch (info.dwPlatformId) {
-
-       case VER_PLATFORM_WIN32s:
-               /* Shyeah, right. */
-               g_string_sprintfa(str, "Windows 3.1 with Win32s");
-               break;
-
-       case VER_PLATFORM_WIN32_WINDOWS:
-               /* Windows OT */
-               switch (info.dwMajorVersion) {
-
-               case 4:
-                       /* 3 cheers for Microsoft marketing! */
-                       switch (info.dwMinorVersion) {
-
-                       case 0:
-                               g_string_sprintfa(str, "Windows 95");
-                               break;
-
-                       case 10:
-                               g_string_sprintfa(str, "Windows 98");
-                               break;
-
-                       case 90:
-                               g_string_sprintfa(str, "Windows Me");
-                               break;
-
-                       default:
-                               g_string_sprintfa(str, "Windows OT, unknown version %u.%u",
-                                   info.dwMajorVersion, info.dwMinorVersion);
-                               break;
-                       }
-                       break;
-
-               default:
-                       g_string_sprintfa(str, "Windows OT, unknown version %u.%u",
-                           info.dwMajorVersion, info.dwMinorVersion);
-                       break;
-               }
-               break;
-
-       case VER_PLATFORM_WIN32_NT:
-               /* Windows NT */
-               switch (info.dwMajorVersion) {
-
-               case 3:
-               case 4:
-                       g_string_sprintfa(str, "Windows NT %u.%u",
-                           info.dwMajorVersion, info.dwMinorVersion);
-                       break;
-
-               case 5:
-                       /* 3 cheers for Microsoft marketing! */
-                       switch (info.dwMinorVersion) {
-
-                       case 0:
-                               g_string_sprintfa(str, "Windows 2000");
-                               break;
-
-                       case 1:
-                               g_string_sprintfa(str, "Windows XP");
-                               break;
-
-                       case 2:
-                               g_string_sprintfa(str, "Windows Server 2003");
-                               break;
-
-                       default:
-                               g_string_sprintfa(str, "Windows NT, unknown version %u.%u",
-                                   info.dwMajorVersion, info.dwMinorVersion);
-                               break;
-                       }
-                       break;
-
-               default:
-                       g_string_sprintfa(str, "Windows NT, unknown version %u.%u",
-                           info.dwMajorVersion, info.dwMinorVersion);
-                       break;
-               }
-               break;
-
-       default:
-               g_string_sprintfa(str, "Unknown Windows platform %u version %u.%u",
-                   info.dwPlatformId, info.dwMajorVersion, info.dwMinorVersion);
-               break;
-       }
-       if (info.szCSDVersion[0] != '\0')
-               g_string_sprintfa(str, " %s", info.szCSDVersion);
-       g_string_sprintfa(str, ", build %u", info.dwBuildNumber);
-#elif defined(HAVE_SYS_UTSNAME_H)
-       /*
-        * We have <sys/utsname.h>, so we assume we have "uname()".
-        */
-       if (uname(&name) < 0) {
-               g_string_sprintfa(str, "unknown OS version (uname failed - %s)",
-                   strerror(errno));
-               return;
-       }
-
-       if (strcmp(name.sysname, "AIX") == 0) {
-               /*
-                * Yay, IBM!  Thanks for doing something different
-                * from most of the other UNIXes out there, and
-                * making "name.version" apparently be the major
-                * version number and "name.release" be the minor
-                * version number.
-                */
-               g_string_sprintfa(str, "%s %s.%s", name.sysname, name.version,
-                   name.release);
-       } else {
-               /*
-                * XXX - get "version" on any other platforms?
-                *
-                * On Digital/Tru65 UNIX, it's something unknown.
-                * On Solaris, it's some kind of build information.
-                * On HP-UX, it appears to be some sort of subrevision
-                * thing.
-                */
-               g_string_sprintfa(str, "%s %s", name.sysname, name.release);
-       }
-#else
-       g_string_append(str, "an unknown OS");
-#endif
-}
+#include "util.h"
 
 /*
  * Collect command-line arguments as a string consisting of the arguments,
@@ -411,14 +117,14 @@ setup_tmpdir(char *dir)
        int len = strlen(dir);
        char *newdir;
 
-       /* Append slash if necessary */
-       if (dir[len - 1] == '/') {
+       /* Append path separator if necessary */
+       if (dir[len - 1] == G_DIR_SEPARATOR) {
                newdir = dir;
        }
        else {
                newdir = g_malloc(len + 2);
                strcpy(newdir, dir);
-               strcat(newdir, "/");
+               strcat(newdir, G_DIR_SEPARATOR_S);
        }
        return newdir;
 }
@@ -456,7 +162,7 @@ try_tempfile(char *namebuf, int namebuflen, const char *dir, const char *pfx)
 }
 
 static char *tmpdir = NULL;
-#ifdef WIN32
+#ifdef _WIN32
 static char *temp = NULL;
 #endif
 static char *E_tmpdir;
@@ -475,7 +181,7 @@ create_tempfile(char *namebuf, int namebuflen, const char *pfx)
        if (!initialized) {
                if ((dir = getenv("TMPDIR")) != NULL)
                        tmpdir = setup_tmpdir(dir);
-#ifdef WIN32
+#ifdef _WIN32
                if ((dir = getenv("TEMP")) != NULL)
                        temp = setup_tmpdir(dir);
 #endif
@@ -490,7 +196,7 @@ create_tempfile(char *namebuf, int namebuflen, const char *pfx)
                        return fd;
        }
 
-#ifdef WIN32
+#ifdef _WIN32
        if (temp != NULL) {
                fd = try_tempfile(namebuf, namebuflen, temp, pfx);
                if (fd != -1)
@@ -502,120 +208,7 @@ create_tempfile(char *namebuf, int namebuflen, const char *pfx)
        if (fd != -1)
                return fd;
 
-       return try_tempfile(namebuf, namebuflen, "/tmp", pfx);
-}
-
-/* ASCII/EBCDIC conversion tables from
- * http://www.room42.com/store/computer_center/code_tables.shtml
- */
-#if 0
-static guint8 ASCII_translate_EBCDIC [ 256 ] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-    0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-    0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
-    0x40, 0x5A, 0x7F, 0x7B, 0x5B, 0x6C, 0x50, 0x7D, 0x4D,
-    0x5D, 0x5C, 0x4E, 0x6B, 0x60, 0x4B, 0x61,
-    0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,
-    0xF9, 0x7A, 0x5E, 0x4C, 0x7E, 0x6E, 0x6F,
-    0x7C, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8,
-    0xC9, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6,
-    0xD7, 0xD8, 0xD9, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7,
-    0xE8, 0xE9, 0xAD, 0xE0, 0xBD, 0x5F, 0x6D,
-    0x7D, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88,
-    0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,
-    0x97, 0x98, 0x99, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
-    0xA8, 0xA9, 0xC0, 0x6A, 0xD0, 0xA1, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B,
-    0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B, 0x4B
-};
-
-void
-ASCII_to_EBCDIC(guint8 *buf, guint bytes)
-{
-       guint   i;
-       guint8  *bufptr;
-
-       bufptr = buf;
-
-       for (i = 0; i < bytes; i++, bufptr++) {
-               *bufptr = ASCII_translate_EBCDIC[*bufptr];
-       }
-}
-
-guint8
-ASCII_to_EBCDIC1(guint8 c)
-{
-       return ASCII_translate_EBCDIC[c];
-}
-#endif
-
-static guint8 EBCDIC_translate_ASCII [ 256 ] = {
-    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-    0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
-    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-    0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
-    0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-    0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
-    0x2E, 0x2E, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
-    0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x2E, 0x3F,
-    0x20, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x2E, 0x2E, 0x2E, 0x3C, 0x28, 0x2B, 0x7C,
-    0x26, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x2E, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0x5E,
-    0x2D, 0x2F, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x2E, 0x7C, 0x2C, 0x25, 0x5F, 0x3E, 0x3F,
-    0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x2E, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22,
-    0x2E, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-    0x69, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x2E, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71,
-    0x72, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x2E, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
-    0x7A, 0x2E, 0x2E, 0x2E, 0x5B, 0x2E, 0x2E,
-    0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x2E, 0x2E, 0x2E, 0x2E, 0x5D, 0x2E, 0x2E,
-    0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
-    0x49, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51,
-    0x52, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x5C, 0x2E, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-    0x5A, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E,
-    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
-    0x39, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E, 0x2E
-};
-
-void
-EBCDIC_to_ASCII(guint8 *buf, guint bytes)
-{
-       guint   i;
-       guint8  *bufptr;
-
-       bufptr = buf;
-
-       for (i = 0; i < bytes; i++, bufptr++) {
-               *bufptr = EBCDIC_translate_ASCII[*bufptr];
-       }
-}
-
-guint8
-EBCDIC_to_ASCII1(guint8 c)
-{
-       return EBCDIC_translate_ASCII[c];
+       return try_tempfile(namebuf, namebuflen, G_DIR_SEPARATOR_S "tmp", pfx);
 }
 
 /* Compute the difference between two seconds/microseconds time stamps. */
@@ -662,35 +255,59 @@ compute_timestamp_diff(gint *diffsec, gint *diffusec,
   }
 }
 
-/* Decode a base64 string in-place - simple and slow algorithm.
-   Return length of result. Taken from rproxy/librsync/base64.c by
-   Andrew Tridgell. */
+/* 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:
 
-size_t base64_decode(char *s)
-{
-       static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-       int bit_offset, byte_offset, idx, i, n;
-       unsigned char *d = (unsigned char *)s;
-       char *p;
-
-       n=i=0;
-
-       while (*s && (p=strchr(b64, *s))) {
-               idx = (int)(p - b64);
-               byte_offset = (i*6)/8;
-               bit_offset = (i*6)%8;
-               d[byte_offset] &= ~((1<<(8-bit_offset))-1);
-               if (bit_offset < 3) {
-                       d[byte_offset] |= (idx << (2-bit_offset));
-                       n = byte_offset+1;
-               } else {
-                       d[byte_offset] |= (idx >> (bit_offset-2));
-                       d[byte_offset+1] = 0;
-                       d[byte_offset+1] |= (idx << (8-(bit_offset-2))) & 0xFF;
-                       n = byte_offset+2;
+   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>
+ */
+
+gchar *get_conn_cfilter(void) {
+       static GString *filter_str = NULL;
+       gchar *env, **tokens;
+
+       if (filter_str == NULL) {
+               filter_str = g_string_new("");
+       }
+       if ((env = getenv("SSH_CONNECTION")) != NULL) {
+               tokens = g_strsplit(env, " ", 4);
+               if (tokens[3]) {
+                       g_string_sprintf(filter_str, "not (tcp port %s and %s host %s "
+                                                        "and tcp port %s and %s host %s)", tokens[1], host_ip_af(tokens[0]), tokens[0],
+                               tokens[3], host_ip_af(tokens[2]), tokens[2]);
+                       return filter_str->str;
+               }
+       } else if ((env = getenv("SSH_CLIENT")) != NULL) {
+               tokens = g_strsplit(env, " ", 3);
+               g_string_sprintf(filter_str, "not (tcp port %s and %s host %s "
+                       "and tcp port %s)", tokens[1], host_ip_af(tokens[0]), tokens[0], tokens[2]);
+               return filter_str->str;
+       } else if ((env = getenv("REMOTEHOST")) != NULL) {
+               if (strcasecmp(env, "localhost") == 0 || strcmp(env, "127.0.0.1") == 0) {
+                       return "";
+               }
+               g_string_sprintf(filter_str, "not %s host %s", host_ip_af(env), env);
+               return filter_str->str;
+       } else if ((env = getenv("DISPLAY")) != NULL) {
+               tokens = g_strsplit(env, ":", 2);
+               if (tokens[0] && tokens[0][0] != 0) {
+                       if (strcasecmp(tokens[0], "localhost") == 0 ||
+                                       strcmp(tokens[0], "127.0.0.1") == 0) {
+                               return "";
+                       }
+                       g_string_sprintf(filter_str, "not %s host %s",
+                               host_ip_af(tokens[0]), tokens[0]);
+                       return filter_str->str;
+               }
+       } else if ((env = getenv("CLIENTNAME")) != NULL) {
+               if (g_strcasecmp("console", env) != 0) {
+                       g_string_sprintf(filter_str, "not %s host %s", host_ip_af(env), env);
+                       return filter_str->str;
                }
-               s++; i++;
        }
-
-       return n;
+       return "";
 }