* 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;
* 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++;
}
}
+/* Remove any %<interface_name> from an IP address. */
+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:
char *pprotocol = NULL;
char *phostname = NULL;
size_t hostlen;
+ char *remip, *locip;
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]);
+ 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(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);
- 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]);
+ 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(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 */
strcmp(env, "") == 0) {
return "";
}
- g_string_sprintf(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(),
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';
}
}
- g_string_sprintf(filter_str, "not %s host %s",
+ g_string_printf(filter_str, "not %s host %s",
host_ip_af(phostname), phostname);
g_free(phostname);
return filter_str->str;
* http://www.microsoft.com/technet/archive/termsrv/maintain/featusability/tsrvapi.mspx?mfr=true
*/
if (g_ascii_strncasecmp(env, "rdp", 3) == 0) {
- g_string_sprintf(filter_str, "not tcp port 3389");
+ g_string_printf(filter_str, "not tcp port 3389");
return filter_str->str;
}
}