diff options
| author | Pedro Alves <palves@redhat.com> | 2015-03-09 11:27:05 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2015-03-09 11:27:05 +0000 |
| commit | 9eb1356e381f3412f53ffe5bc68ce854330600fb (patch) | |
| tree | 1a764e6c10e8942911c65b959e99eae4e9d774e4 /gdb/gdbserver/gdbreplay.c | |
| parent | 43fa85d9a8d7aac7a70c72220abd09d39703208a (diff) | |
| download | gdb-9eb1356e381f3412f53ffe5bc68ce854330600fb.zip gdb-9eb1356e381f3412f53ffe5bc68ce854330600fb.tar.gz gdb-9eb1356e381f3412f53ffe5bc68ce854330600fb.tar.bz2 | |
Revert union gdb_sockaddr_u
This reverts 366c75fc.
We don't actually need to access the object through
"struct sockaddr *", so we don't need the union:
https://sourceware.org/ml/gdb-patches/2015-03/msg00213.html
gdb/ChangeLog:
2015-03-09 Pedro Alves <palves@redhat.com>
Revert:
2015-03-07 Pedro Alves <palves@redhat.com>
* common/gdb_socket.h: New file.
* ser-tcp.c: Include gdb_socket.h. Don't include netinet/in.h nor
sys/socket.h.
(net_open): Use union gdb_sockaddr_u.
gdb/gdbserver/ChangeLog:
2015-03-09 Pedro Alves <palves@redhat.com>
Revert:
2015-03-07 Pedro Alves <palves@redhat.com>
* gdbreplay.c: No longer include <netinet/in.h>, <sys/socket.h>,
or <winsock2.h> here. Instead include "gdb_socket.h".
(remote_open): Use union gdb_sockaddr_u.
* remote-utils.c: No longer include <netinet/in.h>, <sys/socket.h>
or <winsock2.h> here. Instead include "gdb_socket.h".
(handle_accept_event, remote_prepare): Use union gdb_sockaddr_u.
* tracepoint.c: Include "gdb_socket.h" instead of <sys/socket.h>
or <sys/un.h>.
(init_named_socket, gdb_agent_helper_thread): Use union
gdb_sockaddr_u.
Diffstat (limited to 'gdb/gdbserver/gdbreplay.c')
| -rw-r--r-- | gdb/gdbserver/gdbreplay.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c index bfd6f19..a02a824 100644 --- a/gdb/gdbserver/gdbreplay.c +++ b/gdb/gdbserver/gdbreplay.c @@ -36,16 +36,24 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif #if HAVE_NETDB_H #include <netdb.h> #endif #if HAVE_NETINET_TCP_H #include <netinet/tcp.h> #endif -#include "gdb_socket.h" #include <alloca.h> +#if USE_WIN32API +#include <winsock2.h> +#endif #ifndef HAVE_SOCKLEN_T typedef int socklen_t; @@ -180,7 +188,7 @@ remote_open (char *name) #endif char *port_str; int port; - union gdb_sockaddr_u sockaddr; + struct sockaddr_in sockaddr; socklen_t tmp; int tmp_desc; @@ -207,16 +215,16 @@ remote_open (char *name) setsockopt (tmp_desc, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp, sizeof (tmp)); - sockaddr.sa_in.sin_family = PF_INET; - sockaddr.sa_in.sin_port = htons (port); - sockaddr.sa_in.sin_addr.s_addr = INADDR_ANY; + sockaddr.sin_family = PF_INET; + sockaddr.sin_port = htons (port); + sockaddr.sin_addr.s_addr = INADDR_ANY; - if (bind (tmp_desc, &sockaddr.sa, sizeof (sockaddr.sa_in)) + if (bind (tmp_desc, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) || listen (tmp_desc, 1)) perror_with_name ("Can't bind address"); - tmp = sizeof (sockaddr.sa_in); - remote_desc = accept (tmp_desc, &sockaddr.sa, &tmp); + tmp = sizeof (sockaddr); + remote_desc = accept (tmp_desc, (struct sockaddr *) &sockaddr, &tmp); if (remote_desc == -1) perror_with_name ("Accept failed"); |