/* Replay a remote debug session logfile for GDB.
- Copyright (C) 1996-2018 Free Software Foundation, Inc.
+ Copyright (C) 1996-2019 Free Software Foundation, Inc.
Written by Fred Fish (fnf@cygnus.com) from pieces of gdbserver.
This file is part of GDB.
#if USE_WIN32API
#include <winsock2.h>
+#include <wspiapi.h>
#endif
+#include "netstuff.h"
+
#ifndef HAVE_SOCKLEN_T
typedef int socklen_t;
#endif
static void
remote_open (char *name)
{
- if (!strchr (name, ':'))
+ char *last_colon = strrchr (name, ':');
+
+ if (last_colon == NULL)
{
fprintf (stderr, "%s: Must specify tcp connection as host:addr\n", name);
fflush (stderr);
exit (1);
}
- else
- {
+
#ifdef USE_WIN32API
- static int winsock_initialized;
+ static int winsock_initialized;
#endif
- char *port_str;
- int port;
- struct sockaddr_in sockaddr;
- socklen_t tmp;
- int tmp_desc;
+ int tmp;
+ int tmp_desc;
+ struct addrinfo hint;
+ struct addrinfo *ainfo;
- port_str = strchr (name, ':');
+ 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;
+ hint.ai_protocol = IPPROTO_TCP;
- port = atoi (port_str + 1);
+ parsed_connection_spec parsed = parse_connection_spec (name, &hint);
+
+ if (parsed.port_str.empty ())
+ error (_("Missing port on hostname '%s'"), name);
#ifdef USE_WIN32API
- if (!winsock_initialized)
- {
- WSADATA wsad;
+ if (!winsock_initialized)
+ {
+ WSADATA wsad;
- WSAStartup (MAKEWORD (1, 0), &wsad);
- winsock_initialized = 1;
- }
+ WSAStartup (MAKEWORD (1, 0), &wsad);
+ winsock_initialized = 1;
+ }
#endif
- tmp_desc = socket (PF_INET, SOCK_STREAM, 0);
- if (tmp_desc == -1)
- perror_with_name ("Can't open socket");
+ int r = getaddrinfo (parsed.host_str.c_str (), parsed.port_str.c_str (),
+ &hint, &ainfo);
- /* Allow rapid reuse of this port. */
- tmp = 1;
- setsockopt (tmp_desc, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp,
- sizeof (tmp));
+ if (r != 0)
+ {
+ fprintf (stderr, "%s:%s: cannot resolve name: %s\n",
+ parsed.host_str.c_str (), parsed.port_str.c_str (),
+ gai_strerror (r));
+ fflush (stderr);
+ exit (1);
+ }
+
+ scoped_free_addrinfo free_ainfo (ainfo);
+
+ struct addrinfo *p;
+
+ for (p = ainfo; p != NULL; p = p->ai_next)
+ {
+ tmp_desc = socket (p->ai_family, p->ai_socktype, p->ai_protocol);
- sockaddr.sin_family = PF_INET;
- sockaddr.sin_port = htons (port);
- sockaddr.sin_addr.s_addr = INADDR_ANY;
+ if (tmp_desc >= 0)
+ break;
+ }
+
+ if (p == NULL)
+ perror_with_name ("Cannot open socket");
- if (bind (tmp_desc, (struct sockaddr *) &sockaddr, sizeof (sockaddr))
- || listen (tmp_desc, 1))
- perror_with_name ("Can't bind address");
+ /* Allow rapid reuse of this port. */
+ tmp = 1;
+ setsockopt (tmp_desc, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp,
+ sizeof (tmp));
+
+ switch (p->ai_family)
+ {
+ case AF_INET:
+ ((struct sockaddr_in *) p->ai_addr)->sin_addr.s_addr = INADDR_ANY;
+ break;
+ case AF_INET6:
+ ((struct sockaddr_in6 *) p->ai_addr)->sin6_addr = in6addr_any;
+ break;
+ default:
+ fprintf (stderr, "Invalid 'ai_family' %d\n", p->ai_family);
+ exit (1);
+ }
+
+ if (bind (tmp_desc, p->ai_addr, p->ai_addrlen) != 0)
+ perror_with_name ("Can't bind address");
+
+ if (p->ai_socktype == SOCK_DGRAM)
+ remote_desc = tmp_desc;
+ else
+ {
+ struct sockaddr_storage sockaddr;
+ socklen_t sockaddrsize = sizeof (sockaddr);
+ char orig_host[GDB_NI_MAX_ADDR], orig_port[GDB_NI_MAX_PORT];
+
+ if (listen (tmp_desc, 1) != 0)
+ perror_with_name ("Can't listen on socket");
+
+ remote_desc = accept (tmp_desc, (struct sockaddr *) &sockaddr,
+ &sockaddrsize);
- tmp = sizeof (sockaddr);
- remote_desc = accept (tmp_desc, (struct sockaddr *) &sockaddr, &tmp);
if (remote_desc == -1)
perror_with_name ("Accept failed");
setsockopt (remote_desc, IPPROTO_TCP, TCP_NODELAY,
(char *) &tmp, sizeof (tmp));
+ if (getnameinfo ((struct sockaddr *) &sockaddr, sockaddrsize,
+ orig_host, sizeof (orig_host),
+ orig_port, sizeof (orig_port),
+ NI_NUMERICHOST | NI_NUMERICSERV) == 0)
+ {
+ fprintf (stderr, "Remote debugging from host %s, port %s\n",
+ orig_host, orig_port);
+ fflush (stderr);
+ }
+
#ifndef USE_WIN32API
close (tmp_desc); /* No longer need this */
gdbreplay_version (void)
{
printf ("GNU gdbreplay %s%s\n"
- "Copyright (C) 2018 Free Software Foundation, Inc.\n"
+ "Copyright (C) 2019 Free Software Foundation, Inc.\n"
"gdbreplay is free software, covered by "
"the GNU General Public License.\n"
"This gdbreplay was configured as \"%s\"\n",
static void
gdbreplay_usage (FILE *stream)
{
- fprintf (stream, "Usage:\tgdbreplay <logfile> <host:port>\n");
+ fprintf (stream, "Usage:\tgdbreplay LOGFILE HOST:PORT\n");
if (REPORT_BUGS_TO[0] && stream == stdout)
fprintf (stream, "Report bugs to \"%s\".\n", REPORT_BUGS_TO);
}