X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Fremote-utils.c;h=d7da4b7aed21eee67a2274962d8d0f91ea33a2e8;hb=c5adaa1921c34d2b9711ec7cecd3cb4a253620db;hp=ac57ce53fd419d0d7914ebe013a11424d38dd276;hpb=e38504b39279fa86cbb2c4a45ab8ec34e3aef90b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index ac57ce53fd..d7da4b7aed 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -1,5 +1,5 @@ /* Remote utility routines for the remote server for GDB. - Copyright (C) 1986-2018 Free Software Foundation, Inc. + Copyright (C) 1986-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -23,9 +23,11 @@ #include "target.h" #include "gdbthread.h" #include "tdesc.h" +#include "debug.h" #include "dll.h" -#include "rsp-low.h" -#include "gdbthread.h" +#include "gdbsupport/rsp-low.h" +#include "gdbsupport/netstuff.h" +#include "gdbsupport/filestuff.h" #include #if HAVE_SYS_IOCTL_H #include @@ -54,7 +56,7 @@ #if HAVE_FCNTL_H #include #endif -#include "gdb_sys_time.h" +#include "gdbsupport/gdb_sys_time.h" #include #if HAVE_ARPA_INET_H #include @@ -62,7 +64,7 @@ #include #if USE_WIN32API -#include +#include #endif #if __QNX__ @@ -103,18 +105,11 @@ struct sym_cache struct sym_cache *next; }; -int remote_debug = 0; -struct ui_file *gdb_stdlog; - static int remote_is_stdio = 0; static gdb_fildes_t remote_desc = INVALID_DESCRIPTOR; static gdb_fildes_t listen_desc = INVALID_DESCRIPTOR; -/* FIXME headerize? */ -extern int using_threads; -extern int debug_threads; - #ifdef USE_WIN32API # define read(fd, buf, len) recv (fd, (char *) buf, len, 0) # define write(fd, buf, len) send (fd, (char *) buf, len, 0) @@ -151,19 +146,18 @@ enable_async_notification (int fd) static int handle_accept_event (int err, gdb_client_data client_data) { - struct sockaddr_in sockaddr; - socklen_t tmp; + struct sockaddr_storage sockaddr; + socklen_t len = sizeof (sockaddr); if (debug_threads) debug_printf ("handling possible accept event\n"); - tmp = sizeof (sockaddr); - remote_desc = accept (listen_desc, (struct sockaddr *) &sockaddr, &tmp); + remote_desc = accept (listen_desc, (struct sockaddr *) &sockaddr, &len); if (remote_desc == -1) perror_with_name ("Accept failed"); /* Enable TCP keep alive process. */ - tmp = 1; + socklen_t tmp = 1; setsockopt (remote_desc, SOL_SOCKET, SO_KEEPALIVE, (char *) &tmp, sizeof (tmp)); @@ -192,8 +186,19 @@ handle_accept_event (int err, gdb_client_data client_data) delete_file_handler (listen_desc); /* Convert IP address to string. */ - fprintf (stderr, "Remote debugging from host %s\n", - inet_ntoa (sockaddr.sin_addr)); + char orig_host[GDB_NI_MAX_ADDR], orig_port[GDB_NI_MAX_PORT]; + + int r = getnameinfo ((struct sockaddr *) &sockaddr, len, + orig_host, sizeof (orig_host), + orig_port, sizeof (orig_port), + NI_NUMERICHOST | NI_NUMERICSERV); + + if (r != 0) + fprintf (stderr, _("Could not obtain remote address: %s\n"), + gai_strerror (r)); + else + fprintf (stderr, _("Remote debugging from host %s, port %s\n"), + orig_host, orig_port); enable_async_notification (remote_desc); @@ -218,14 +223,10 @@ void remote_prepare (const char *name) { client_state &cs = get_client_state (); - const char *port_str; #ifdef USE_WIN32API static int winsock_initialized; #endif - int port; - struct sockaddr_in sockaddr; socklen_t tmp; - char *port_end; remote_is_stdio = 0; if (strcmp (name, STDIO_CONNECTION_NAME) == 0) @@ -238,17 +239,25 @@ remote_prepare (const char *name) return; } - port_str = strchr (name, ':'); - if (port_str == NULL) + struct addrinfo hint; + struct addrinfo *ainfo; + + 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; + + parsed_connection_spec parsed + = parse_connection_spec_without_prefix (name, &hint); + + if (parsed.port_str.empty ()) { cs.transport_is_reliable = 0; return; } - port = strtoul (port_str + 1, &port_end, 10); - if (port_str[1] == '\0' || *port_end != '\0') - error ("Bad port argument: %s", name); - #ifdef USE_WIN32API if (!winsock_initialized) { @@ -259,8 +268,26 @@ remote_prepare (const char *name) } #endif - listen_desc = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); - if (listen_desc == -1) + int r = getaddrinfo (parsed.host_str.c_str (), parsed.port_str.c_str (), + &hint, &ainfo); + + if (r != 0) + error (_("%s: cannot resolve name: %s"), name, gai_strerror (r)); + + scoped_free_addrinfo freeaddrinfo (ainfo); + + struct addrinfo *iter; + + for (iter = ainfo; iter != NULL; iter = iter->ai_next) + { + listen_desc = gdb_socket_cloexec (iter->ai_family, iter->ai_socktype, + iter->ai_protocol); + + if (listen_desc >= 0) + break; + } + + if (iter == NULL) perror_with_name ("Can't open socket"); /* Allow rapid reuse of this port. */ @@ -268,14 +295,25 @@ remote_prepare (const char *name) setsockopt (listen_desc, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp, sizeof (tmp)); - sockaddr.sin_family = PF_INET; - sockaddr.sin_port = htons (port); - sockaddr.sin_addr.s_addr = INADDR_ANY; + switch (iter->ai_family) + { + case AF_INET: + ((struct sockaddr_in *) iter->ai_addr)->sin_addr.s_addr = INADDR_ANY; + break; + case AF_INET6: + ((struct sockaddr_in6 *) iter->ai_addr)->sin6_addr = in6addr_any; + break; + default: + internal_error (__FILE__, __LINE__, + _("Invalid 'ai_family' %d\n"), iter->ai_family); + } - if (bind (listen_desc, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) - || listen (listen_desc, 1)) + if (bind (listen_desc, iter->ai_addr, iter->ai_addrlen) != 0) perror_with_name ("Can't bind address"); + if (listen (listen_desc, 1) != 0) + perror_with_name ("Can't listen on socket"); + cs.transport_is_reliable = 1; } @@ -290,7 +328,7 @@ remote_open (const char *name) port_str = strchr (name, ':'); #ifdef USE_WIN32API if (port_str == NULL) - error ("Only : is supported on this platform."); + error ("Only HOST:PORT is supported on this platform."); #endif if (strcmp (name, STDIO_CONNECTION_NAME) == 0) @@ -350,18 +388,24 @@ remote_open (const char *name) #endif /* USE_WIN32API */ else { - int port; - socklen_t len; - struct sockaddr_in sockaddr; - - len = sizeof (sockaddr); - if (getsockname (listen_desc, - (struct sockaddr *) &sockaddr, &len) < 0 - || len < sizeof (sockaddr)) + char listen_port[GDB_NI_MAX_PORT]; + struct sockaddr_storage sockaddr; + socklen_t len = sizeof (sockaddr); + + if (getsockname (listen_desc, (struct sockaddr *) &sockaddr, &len) < 0) perror_with_name ("Can't determine port"); - port = ntohs (sockaddr.sin_port); - fprintf (stderr, "Listening on port %d\n", port); + int r = getnameinfo ((struct sockaddr *) &sockaddr, len, + NULL, 0, + listen_port, sizeof (listen_port), + NI_NUMERICSERV); + + if (r != 0) + fprintf (stderr, _("Can't obtain port where we are listening: %s"), + gai_strerror (r)); + else + fprintf (stderr, _("Listening on port %s\n"), listen_port); + fflush (stderr); /* Register the event loop handler. */ @@ -849,7 +893,6 @@ static unsigned char *readchar_bufp; static int readchar (void) { - client_state &cs = get_client_state (); int ch; if (readchar_bufcnt == 0) @@ -1222,7 +1265,7 @@ prepare_resume_reply (char *buf, ptid_t ptid, in GDB will claim this event belongs to inferior_ptid if we do not specify a thread, and there's no way for gdbserver to know what inferior_ptid is. */ - if (1 || !ptid_equal (cs.general_thread, ptid)) + if (1 || cs.general_thread != ptid) { int core = -1; /* In non-stop, don't change the general thread behind @@ -1512,7 +1555,7 @@ look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb) if (!startswith (cs.own_buf, "qSymbol:")) { - warning ("Malformed response to qSymbol, ignoring: %s\n", cs.own_buf); + warning ("Malformed response to qSymbol, ignoring: %s", cs.own_buf); return -1; } @@ -1590,7 +1633,7 @@ relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc) { if (decode_X_packet (&cs.own_buf[1], len - 1, &mem_addr, &mem_len, &mem_buf) < 0 - || write_inferior_memory (mem_addr, mem_buf, mem_len) != 0) + || target_write_memory (mem_addr, mem_buf, mem_len) != 0) write_enn (cs.own_buf); else write_ok (cs.own_buf); @@ -1598,7 +1641,7 @@ relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc) else { decode_M_packet (&cs.own_buf[1], &mem_addr, &mem_len, &mem_buf); - if (write_inferior_memory (mem_addr, mem_buf, mem_len) == 0) + if (target_write_memory (mem_addr, mem_buf, mem_len) == 0) write_ok (cs.own_buf); else write_enn (cs.own_buf); @@ -1613,14 +1656,14 @@ relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc) if (cs.own_buf[0] == 'E') { - warning ("An error occurred while relocating an instruction: %s\n", + warning ("An error occurred while relocating an instruction: %s", cs.own_buf); return -1; } if (!startswith (cs.own_buf, "qRelocInsn:")) { - warning ("Malformed response to qRelocInsn, ignoring: %s\n", + warning ("Malformed response to qRelocInsn, ignoring: %s", cs.own_buf); return -1; }