From Xiao Xiangquan:

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

diff --git a/util.c b/util.c
index 1b466cf09892cfb8a09909f2475559748e2fe317..a7a25578cf5206a1cc9da371b3c587c44df88a4b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -37,6 +37,10 @@
 #include <unistd.h>
 #endif
 
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 #include <epan/strutil.h>
@@ -48,7 +52,7 @@
  * separated by spaces.
  */
 char *
-get_args_as_string(int argc, char **argv, int optind)
+get_args_as_string(int argc, char **argv, int optindex)
 {
        int len;
        int i;
@@ -58,21 +62,21 @@ get_args_as_string(int argc, char **argv, int optind)
         * Find out how long the string will be.
         */
        len = 0;
-       for (i = optind; i < argc; i++) {
-               len += strlen(argv[i]);
+       for (i = optindex; i < argc; i++) {
+               len += (int) strlen(argv[i]);
                len++;  /* space, or '\0' if this is the last argument */
        }
 
        /*
         * Allocate the buffer for the string.
         */
-       argstring = g_malloc(len);
+       argstring = (char *)g_malloc(len);
 
        /*
         * Now construct the string.
         */
        argstring[0] = '\0';
-       i = optind;
+       i = optindex;
        for (;;) {
                g_strlcat(argstring, argv[i], len);
                i++;
@@ -127,6 +131,21 @@ compute_timestamp_diff(gint *diffsec, gint *diffusec,
   }
 }
 
+/* Remove any %<interface_name> from an IP address. */
+static char *sanitize_filter_ip(char *hostname) {
+    gchar *end;
+    gchar *ret;
+
+    ret = g_strdup(hostname);
+    if (!ret)
+        return NULL;
+
+    end = strchr(ret, '%');
+    if (end)
+        *end = '\0';
+    return ret;
+}
+
 /* 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:
@@ -145,6 +164,7 @@ const gchar *get_conn_cfilter(void) {
        char *pprotocol = NULL;
        char *phostname = NULL;
        size_t hostlen;
+       char *remip, *locip;
 
        if (filter_str == NULL) {
                filter_str = g_string_new("");
@@ -152,15 +172,21 @@ const gchar *get_conn_cfilter(void) {
        if ((env = getenv("SSH_CONNECTION")) != NULL) {
                tokens = g_strsplit(env, " ", 4);
                if (tokens[3]) {
+                       remip = sanitize_filter_ip(tokens[0]);
+                       locip = sanitize_filter_ip(tokens[2]);
                        g_string_printf(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]);
+                                                        "and tcp port %s and %s host %s)", tokens[1], host_ip_af(remip), remip,
+                               tokens[3], host_ip_af(locip), locip);
+                       g_free(remip);
+                       g_free(locip);
                        return filter_str->str;
                }
        } else if ((env = getenv("SSH_CLIENT")) != NULL) {
                tokens = g_strsplit(env, " ", 3);
+               remip = sanitize_filter_ip(tokens[2]);
                g_string_printf(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]);
+                       "and tcp port %s)", tokens[1], host_ip_af(remip), tokens[0], remip);
+               g_free(remip);
                return filter_str->str;
        } else if ((env = getenv("REMOTEHOST")) != NULL) {
                /* FreeBSD 7.0 sets REMOTEHOST to an empty string */
@@ -169,13 +195,15 @@ const gchar *get_conn_cfilter(void) {
                    strcmp(env, "") == 0) {
                        return "";
                }
-               g_string_printf(filter_str, "not %s host %s", host_ip_af(env), env);
+               remip = sanitize_filter_ip(env);
+               g_string_printf(filter_str, "not %s host %s", host_ip_af(remip), remip);
+               g_free(remip);
                return filter_str->str;
        } else if ((env = getenv("DISPLAY")) != NULL) {
                /*
                 * This mirrors what _X11TransConnectDisplay() does.
                 * Note that, on some systems, the hostname can
-                * being with "/", which means that it's a pathname
+                * begin with "/", which means that it's a pathname
                 * of a UNIX domain socket to connect to.
                 *
                 * The comments mirror those in _X11TransConnectDisplay(),
@@ -255,7 +283,7 @@ const gchar *get_conn_cfilter(void) {
                if (hostlen == 0)
                        return "";      /* no hostname supplied */
 
-               phostname = g_malloc(hostlen + 1);
+               phostname = (char *)g_malloc(hostlen + 1);
                memcpy(phostname, lastp, hostlen);
                phostname[hostlen] = '\0';
 
@@ -302,21 +330,12 @@ const gchar *get_conn_cfilter(void) {
                        host_ip_af(phostname), phostname);
                g_free(phostname);
                return filter_str->str;
-       } else if ((env = getenv("SESSIONNAME")) != NULL) {
-               /* Apparently the KB article at
-                * http://technet2.microsoft.com/WindowsServer/en/library/6caf87bf-3d70-4801-9485-87e9ec3df0171033.mspx?mfr=true
-                * is incorrect.  There are _plenty_ of cases where CLIENTNAME
-                * and SESSIONNAME are set outside of a Terminal Terver session.
-                * It looks like Terminal Server sets SESSIONNAME to RDP-TCP#<number>
-                * for "real" sessions.
-                *
-                * XXX - There's a better way to do this described at
-                * http://www.microsoft.com/technet/archive/termsrv/maintain/featusability/tsrvapi.mspx?mfr=true
-                */
-               if (g_ascii_strncasecmp(env, "rdp", 3) == 0) {
-                       g_string_printf(filter_str, "not tcp port 3389");
-                       return filter_str->str;
-               }
+#ifdef _WIN32
+       } else if (GetSystemMetrics(SM_REMOTESESSION)) {
+               /* We have a remote session: http://msdn.microsoft.com/en-us/library/aa380798%28VS.85%29.aspx */
+               g_string_printf(filter_str, "not tcp port 3389");
+               return filter_str->str;
+#endif /* _WIN32 */
        }
        return "";
 }