From 88f5cc8cf8606478832c7d0d7b74755f3f625015 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 13 Oct 2018 18:12:01 +0200 Subject: GDB: Remote target can now accept the form unix::/path/to/socket. Allow target remote to use the unix::/path/to/socket syntax as well as just plain /path/to/socket gdb/ * ser-uds.c (uds_open): Use parse_connection_spec to deal with the comm form unix::/path/to/socket. * serial.c (serial_open): Consider the "unix:" prefix when deciding which interface to use. --- gdb/ser-uds.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'gdb/ser-uds.c') diff --git a/gdb/ser-uds.c b/gdb/ser-uds.c index a98469f..acace25 100644 --- a/gdb/ser-uds.c +++ b/gdb/ser-uds.c @@ -23,6 +23,8 @@ #include #include +#include +#include "netstuff.h" #ifndef UNIX_PATH_MAX #define UNIX_PATH_MAX sizeof(((struct sockaddr_un *) NULL)->sun_path) @@ -33,9 +35,21 @@ static int uds_open (struct serial *scb, const char *name) { + struct addrinfo hint; + + memset (&hint, 0, sizeof (hint)); + /* Assume no prefix will be passed, therefore we should use + AF_UNSPEC. */ + hint.ai_family = AF_UNSPEC; + hint.ai_socktype = SOCK_STREAM; + + parsed_connection_spec parsed = parse_connection_spec (name, &hint); + + const char *socket_name = parsed.port_str.empty() ? name : parsed.port_str.c_str (); + struct sockaddr_un addr; - if (strlen (name) > UNIX_PATH_MAX - 1) + if (strlen (socket_name) > UNIX_PATH_MAX - 1) { warning (_("The socket name is too long. It may be no longer than %s bytes."), @@ -45,7 +59,7 @@ uds_open (struct serial *scb, const char *name) memset (&addr, 0, sizeof addr); addr.sun_family = AF_UNIX; - strncpy (addr.sun_path, name, UNIX_PATH_MAX - 1); + strncpy (addr.sun_path, socket_name, UNIX_PATH_MAX - 1); int sock = socket (AF_UNIX, SOCK_STREAM, 0); -- cgit v1.1