Fix indent and add Modelines info for new common ui source file(s)
svn path=/trunk/; revision=45766
This commit is contained in:
Alexis La Goutte
parent
14f2efec2b
commit
7b3055b74b
399
ui/util.c
399
ui/util.c
|
|
@ -52,43 +52,43 @@
|
|||
char *
|
||||
get_args_as_string(int argc, char **argv, int optindex)
|
||||
{
|
||||
int len;
|
||||
int i;
|
||||
char *argstring;
|
||||
int len;
|
||||
int i;
|
||||
char *argstring;
|
||||
|
||||
/*
|
||||
* Find out how long the string will be.
|
||||
*/
|
||||
len = 0;
|
||||
for (i = optindex; i < argc; i++) {
|
||||
len += (int) strlen(argv[i]);
|
||||
len++; /* space, or '\0' if this is the last argument */
|
||||
}
|
||||
/*
|
||||
* Find out how long the string will be.
|
||||
*/
|
||||
len = 0;
|
||||
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 = (char *)g_malloc(len);
|
||||
/*
|
||||
* Allocate the buffer for the string.
|
||||
*/
|
||||
argstring = (char *)g_malloc(len);
|
||||
|
||||
/*
|
||||
* Now construct the string.
|
||||
*/
|
||||
argstring[0] = '\0';
|
||||
i = optindex;
|
||||
for (;;) {
|
||||
g_strlcat(argstring, argv[i], len);
|
||||
i++;
|
||||
if (i == argc)
|
||||
break;
|
||||
g_strlcat(argstring, " ", len);
|
||||
}
|
||||
return argstring;
|
||||
/*
|
||||
* Now construct the string.
|
||||
*/
|
||||
argstring[0] = '\0';
|
||||
i = optindex;
|
||||
for (;;) {
|
||||
g_strlcat(argstring, argv[i], len);
|
||||
i++;
|
||||
if (i == argc)
|
||||
break;
|
||||
g_strlcat(argstring, " ", len);
|
||||
}
|
||||
return argstring;
|
||||
}
|
||||
|
||||
/* Compute the difference between two seconds/microseconds time stamps. */
|
||||
void
|
||||
compute_timestamp_diff(gint *diffsec, gint *diffusec,
|
||||
guint32 sec1, guint32 usec1, guint32 sec2, guint32 usec2)
|
||||
guint32 sec1, guint32 usec1, guint32 sec2, guint32 usec2)
|
||||
{
|
||||
if (sec1 == sec2) {
|
||||
/* The seconds part of the first time is the same as the seconds
|
||||
|
|
@ -156,184 +156,197 @@ static char *sanitize_filter_ip(char *hostname) {
|
|||
*/
|
||||
|
||||
const gchar *get_conn_cfilter(void) {
|
||||
static GString *filter_str = NULL;
|
||||
gchar *env, **tokens;
|
||||
char *lastp, *lastc, *p;
|
||||
char *pprotocol = NULL;
|
||||
char *phostname = NULL;
|
||||
size_t hostlen;
|
||||
char *remip, *locip;
|
||||
static GString *filter_str = NULL;
|
||||
gchar *env, **tokens;
|
||||
char *lastp, *lastc, *p;
|
||||
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]) {
|
||||
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);
|
||||
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 */
|
||||
if (g_ascii_strcasecmp(env, "localhost") == 0 ||
|
||||
strcmp(env, "127.0.0.1") == 0 ||
|
||||
strcmp(env, "") == 0) {
|
||||
return "";
|
||||
}
|
||||
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
|
||||
* begin with "/", which means that it's a pathname
|
||||
* of a UNIX domain socket to connect to.
|
||||
*
|
||||
* The comments mirror those in _X11TransConnectDisplay(),
|
||||
* too. :-)
|
||||
*
|
||||
* Display names may be of the following format:
|
||||
*
|
||||
* [protoco./] [hostname] : [:] displaynumber [.screennumber]
|
||||
*
|
||||
* A string with exactly two colons separating hostname
|
||||
* from the display indicates a DECnet style name. Colons
|
||||
* in the hostname may occur if an IPv6 numeric address
|
||||
* is used as the hostname. An IPv6 numeric address may
|
||||
* also end in a double colon, so three colons in a row
|
||||
* indicates an IPv6 address ending in :: followed by
|
||||
* :display. To make it easier for people to read, an
|
||||
* IPv6 numeric address hostname may be surrounded by []
|
||||
* in a similar fashion to the IPv6 numeric address URL
|
||||
* syntax defined by IETF RFC 2732.
|
||||
*
|
||||
* If no hostname and no protocol is specified, the string
|
||||
* is interpreted as the most efficient local connection
|
||||
* to a server on the same machine. This is usually:
|
||||
*
|
||||
* o shared memory
|
||||
* o local stream
|
||||
* o UNIX domain socket
|
||||
* o TCP to local host.
|
||||
*/
|
||||
if (filter_str == NULL) {
|
||||
filter_str = g_string_new("");
|
||||
}
|
||||
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(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(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 */
|
||||
if (g_ascii_strcasecmp(env, "localhost") == 0 ||
|
||||
strcmp(env, "127.0.0.1") == 0 ||
|
||||
strcmp(env, "") == 0) {
|
||||
return "";
|
||||
}
|
||||
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
|
||||
* begin with "/", which means that it's a pathname
|
||||
* of a UNIX domain socket to connect to.
|
||||
*
|
||||
* The comments mirror those in _X11TransConnectDisplay(),
|
||||
* too. :-)
|
||||
*
|
||||
* Display names may be of the following format:
|
||||
*
|
||||
* [protoco./] [hostname] : [:] displaynumber [.screennumber]
|
||||
*
|
||||
* A string with exactly two colons separating hostname
|
||||
* from the display indicates a DECnet style name. Colons
|
||||
* in the hostname may occur if an IPv6 numeric address
|
||||
* is used as the hostname. An IPv6 numeric address may
|
||||
* also end in a double colon, so three colons in a row
|
||||
* indicates an IPv6 address ending in :: followed by
|
||||
* :display. To make it easier for people to read, an
|
||||
* IPv6 numeric address hostname may be surrounded by []
|
||||
* in a similar fashion to the IPv6 numeric address URL
|
||||
* syntax defined by IETF RFC 2732.
|
||||
*
|
||||
* If no hostname and no protocol is specified, the string
|
||||
* is interpreted as the most efficient local connection
|
||||
* to a server on the same machine. This is usually:
|
||||
*
|
||||
* o shared memory
|
||||
* o local stream
|
||||
* o UNIX domain socket
|
||||
* o TCP to local host.
|
||||
*/
|
||||
|
||||
p = env;
|
||||
p = env;
|
||||
|
||||
/*
|
||||
* Step 0, find the protocol. This is delimited by
|
||||
* the optional slash ('/').
|
||||
*/
|
||||
for (lastp = p; *p != '\0' && *p != ':' && *p != '/'; p++)
|
||||
;
|
||||
if (*p == '\0')
|
||||
return ""; /* must have a colon */
|
||||
/*
|
||||
* Step 0, find the protocol. This is delimited by
|
||||
* the optional slash ('/').
|
||||
*/
|
||||
for (lastp = p; *p != '\0' && *p != ':' && *p != '/'; p++)
|
||||
;
|
||||
if (*p == '\0')
|
||||
return ""; /* must have a colon */
|
||||
|
||||
if (p != lastp && *p != ':') { /* protocol given? */
|
||||
/* Yes */
|
||||
pprotocol = p;
|
||||
if (p != lastp && *p != ':') { /* protocol given? */
|
||||
/* Yes */
|
||||
pprotocol = p;
|
||||
|
||||
/* Is it TCP? */
|
||||
if (p - lastp != 3 || g_ascii_strncasecmp(lastp, "tcp", 3) != 0)
|
||||
return ""; /* not TCP */
|
||||
p++; /* skip the '/' */
|
||||
} else
|
||||
p = env; /* reset the pointer in
|
||||
case no protocol was given */
|
||||
/* Is it TCP? */
|
||||
if (p - lastp != 3 || g_ascii_strncasecmp(lastp, "tcp", 3) != 0)
|
||||
return ""; /* not TCP */
|
||||
p++; /* skip the '/' */
|
||||
} else
|
||||
p = env; /* reset the pointer in
|
||||
case no protocol was given */
|
||||
|
||||
/*
|
||||
* Step 1, find the hostname. This is delimited either by
|
||||
* one colon, or two colons in the case of DECnet (DECnet
|
||||
* Phase V allows a single colon in the hostname). (See
|
||||
* note above regarding IPv6 numeric addresses with
|
||||
* triple colons or [] brackets.)
|
||||
*/
|
||||
lastp = p;
|
||||
lastc = NULL;
|
||||
for (; *p != '\0'; p++)
|
||||
if (*p == ':')
|
||||
lastc = p;
|
||||
/*
|
||||
* Step 1, find the hostname. This is delimited either by
|
||||
* one colon, or two colons in the case of DECnet (DECnet
|
||||
* Phase V allows a single colon in the hostname). (See
|
||||
* note above regarding IPv6 numeric addresses with
|
||||
* triple colons or [] brackets.)
|
||||
*/
|
||||
lastp = p;
|
||||
lastc = NULL;
|
||||
for (; *p != '\0'; p++)
|
||||
if (*p == ':')
|
||||
lastc = p;
|
||||
|
||||
if (lastc == NULL)
|
||||
return ""; /* must have a colon */
|
||||
if (lastc == NULL)
|
||||
return ""; /* must have a colon */
|
||||
|
||||
if ((lastp != lastc) && (*(lastc - 1) == ':')
|
||||
&& (((lastc - 1) == lastp) || (*(lastc - 2) != ':'))) {
|
||||
/* DECnet display specified */
|
||||
return "";
|
||||
} else
|
||||
hostlen = lastc - lastp;
|
||||
if ((lastp != lastc) && (*(lastc - 1) == ':')
|
||||
&& (((lastc - 1) == lastp) || (*(lastc - 2) != ':'))) {
|
||||
/* DECnet display specified */
|
||||
return "";
|
||||
} else
|
||||
hostlen = lastc - lastp;
|
||||
|
||||
if (hostlen == 0)
|
||||
return ""; /* no hostname supplied */
|
||||
if (hostlen == 0)
|
||||
return ""; /* no hostname supplied */
|
||||
|
||||
phostname = (char *)g_malloc(hostlen + 1);
|
||||
memcpy(phostname, lastp, hostlen);
|
||||
phostname[hostlen] = '\0';
|
||||
phostname = (char *)g_malloc(hostlen + 1);
|
||||
memcpy(phostname, lastp, hostlen);
|
||||
phostname[hostlen] = '\0';
|
||||
|
||||
if (pprotocol == NULL) {
|
||||
/*
|
||||
* No protocol was explicitly specified, so it
|
||||
* could be a local connection over a transport
|
||||
* that we won't see.
|
||||
*
|
||||
* Does the host name refer to the local host?
|
||||
* If so, the connection would probably be a
|
||||
* local connection.
|
||||
*
|
||||
* XXX - compare against our host name?
|
||||
* _X11TransConnectDisplay() does.
|
||||
*/
|
||||
if (g_ascii_strcasecmp(phostname, "localhost") == 0 ||
|
||||
strcmp(phostname, "127.0.0.1") == 0) {
|
||||
g_free(phostname);
|
||||
return "";
|
||||
}
|
||||
if (pprotocol == NULL) {
|
||||
/*
|
||||
* No protocol was explicitly specified, so it
|
||||
* could be a local connection over a transport
|
||||
* that we won't see.
|
||||
*
|
||||
* Does the host name refer to the local host?
|
||||
* If so, the connection would probably be a
|
||||
* local connection.
|
||||
*
|
||||
* XXX - compare against our host name?
|
||||
* _X11TransConnectDisplay() does.
|
||||
*/
|
||||
if (g_ascii_strcasecmp(phostname, "localhost") == 0 ||
|
||||
strcmp(phostname, "127.0.0.1") == 0) {
|
||||
g_free(phostname);
|
||||
return "";
|
||||
}
|
||||
|
||||
/*
|
||||
* A host name of "unix" (case-sensitive) also
|
||||
* causes a local connection.
|
||||
*/
|
||||
if (strcmp(phostname, "unix") == 0) {
|
||||
g_free(phostname);
|
||||
return "";
|
||||
}
|
||||
/*
|
||||
* A host name of "unix" (case-sensitive) also
|
||||
* causes a local connection.
|
||||
*/
|
||||
if (strcmp(phostname, "unix") == 0) {
|
||||
g_free(phostname);
|
||||
return "";
|
||||
}
|
||||
|
||||
/*
|
||||
* Does the host name begin with "/"? If so,
|
||||
* it's presumed to be the pathname of a
|
||||
* UNIX domain socket.
|
||||
*/
|
||||
if (phostname[0] == '/') {
|
||||
g_free(phostname);
|
||||
return "";
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Does the host name begin with "/"? If so,
|
||||
* it's presumed to be the pathname of a
|
||||
* UNIX domain socket.
|
||||
*/
|
||||
if (phostname[0] == '/') {
|
||||
g_free(phostname);
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
g_string_printf(filter_str, "not %s host %s",
|
||||
host_ip_af(phostname), phostname);
|
||||
g_free(phostname);
|
||||
return filter_str->str;
|
||||
g_string_printf(filter_str, "not %s host %s",
|
||||
host_ip_af(phostname), phostname);
|
||||
g_free(phostname);
|
||||
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;
|
||||
} 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 "";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
/*
|
||||
* Editor modelines
|
||||
*
|
||||
* Local Variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* ex: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
|||
27
ui/util.h
27
ui/util.h
|
|
@ -41,14 +41,14 @@ 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:
|
||||
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>
|
||||
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>
|
||||
*/
|
||||
const char *get_conn_cfilter(void);
|
||||
|
||||
|
|
@ -58,3 +58,16 @@ const char *get_conn_cfilter(void);
|
|||
#endif /* __cplusplus */
|
||||
|
||||
#endif /* __UTIL_H__ */
|
||||
|
||||
/*
|
||||
* Editor modelines
|
||||
*
|
||||
* Local Variables:
|
||||
* c-basic-offset: 4
|
||||
* tab-width: 8
|
||||
* indent-tabs-mode: nil
|
||||
* End:
|
||||
*
|
||||
* ex: set shiftwidth=4 tabstop=8 expandtab:
|
||||
* :indentSize=4:tabSize=8:noTabs=true:
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue