2005-06-14 05:32:01 +08:00
|
|
|
/* Serial interface for raw TCP connections on Un*x like systems.
|
|
|
|
|
2007-01-10 01:59:20 +08:00
|
|
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001, 2005, 2006,
|
|
|
|
2007 Free Software Foundation, Inc.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
This file is part of GDB.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
2005-12-18 06:34:03 +08:00
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "serial.h"
|
2005-03-26 03:47:23 +08:00
|
|
|
#include "ser-base.h"
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
#include "ser-tcp.h"
|
1999-09-22 11:28:34 +08:00
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
#include <sys/types.h>
|
2001-12-08 01:57:05 +08:00
|
|
|
|
|
|
|
#ifdef HAVE_SYS_FILIO_H
|
|
|
|
#include <sys/filio.h> /* For FIONBIO. */
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_IOCTL_H
|
|
|
|
#include <sys/ioctl.h> /* For FIONBIO. */
|
|
|
|
#endif
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
#include <sys/time.h>
|
2005-04-21 13:34:33 +08:00
|
|
|
|
|
|
|
#ifdef USE_WIN32API
|
|
|
|
#include <winsock2.h>
|
|
|
|
#define ETIMEDOUT WSAETIMEDOUT
|
2005-07-25 07:02:41 +08:00
|
|
|
#define close(fd) closesocket (fd)
|
2005-04-21 13:34:33 +08:00
|
|
|
#define ioctl ioctlsocket
|
|
|
|
#else
|
1999-04-16 09:35:26 +08:00
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#include <netdb.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/tcp.h>
|
2005-04-21 13:34:33 +08:00
|
|
|
#endif
|
1999-04-16 09:35:26 +08:00
|
|
|
|
2001-02-06 12:17:03 +08:00
|
|
|
#include <signal.h>
|
1999-04-16 09:35:26 +08:00
|
|
|
#include "gdb_string.h"
|
|
|
|
|
2005-06-14 05:32:01 +08:00
|
|
|
#ifndef HAVE_SOCKLEN_T
|
|
|
|
typedef int socklen_t;
|
|
|
|
#endif
|
|
|
|
|
1999-09-22 11:28:34 +08:00
|
|
|
void _initialize_ser_tcp (void);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
2001-12-04 14:12:56 +08:00
|
|
|
/* seconds to wait for connect */
|
|
|
|
#define TIMEOUT 15
|
2004-06-26 03:46:08 +08:00
|
|
|
/* how many times per second to poll deprecated_ui_loop_hook */
|
2001-12-04 14:12:56 +08:00
|
|
|
#define POLL_INTERVAL 2
|
|
|
|
|
|
|
|
/* Open a tcp socket */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
int
|
2002-05-14 12:26:25 +08:00
|
|
|
net_open (struct serial *scb, const char *name)
|
1999-04-16 09:35:26 +08:00
|
|
|
{
|
2001-12-04 14:12:56 +08:00
|
|
|
char *port_str, hostname[100];
|
|
|
|
int n, port, tmp;
|
2002-05-14 12:26:25 +08:00
|
|
|
int use_udp;
|
1999-04-16 09:35:26 +08:00
|
|
|
struct hostent *hostent;
|
|
|
|
struct sockaddr_in sockaddr;
|
2005-04-21 13:34:33 +08:00
|
|
|
#ifdef USE_WIN32API
|
|
|
|
u_long ioarg;
|
|
|
|
#else
|
|
|
|
int ioarg;
|
|
|
|
#endif
|
1999-04-16 09:35:26 +08:00
|
|
|
|
2002-05-14 12:26:25 +08:00
|
|
|
use_udp = 0;
|
|
|
|
if (strncmp (name, "udp:", 4) == 0)
|
|
|
|
{
|
|
|
|
use_udp = 1;
|
|
|
|
name = name + 4;
|
|
|
|
}
|
|
|
|
else if (strncmp (name, "tcp:", 4) == 0)
|
|
|
|
name = name + 4;
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
port_str = strchr (name, ':');
|
|
|
|
|
|
|
|
if (!port_str)
|
2005-02-10 Andrew Cagney <cagney@gnu.org>
Mark up all error and warning messages.
* ada-lang.c, amd64-tdep.c, arch-utils.c, breakpoint.c: Update.
* bsd-kvm.c, bsd-uthread.c, coff-solib.h, coffread.c: Update.
* core-aout.c, core-regset.c, corefile.c, corelow.c: Update.
* cp-abi.c, cp-support.c, cp-valprint.c, cris-tdep.c: Update.
* dbxread.c, demangle.c, doublest.c, dsrec.c: Update.
* dve3900-rom.c, dwarf2expr.c, dwarf2loc.c: Update.
* dwarf2read.c, dwarfread.c, elfread.c, eval.c: Update.
* event-top.c, exec.c, expprint.c, f-lang.c: Update.
* f-typeprint.c, f-valprint.c, fbsd-nat.c, findvar.c: Update.
* frame.c, frv-linux-tdep.c, gcore.c, gdbtypes.c: Update.
* gnu-nat.c, gnu-v2-abi.c, gnu-v3-abi.c, go32-nat.c: Update.
* hpacc-abi.c, hppa-hpux-nat.c, hppa-hpux-tdep.c: Update.
* hppa-linux-nat.c, hppa-linux-tdep.c, hppa-tdep.c: Update.
* hpread.c, hpux-thread.c, i386-linux-nat.c: Update.
* i386-linux-tdep.c, i386-tdep.c, i386bsd-nat.c: Update.
* i386gnu-nat.c, i387-tdep.c, ia64-linux-nat.c: Update.
* ia64-tdep.c, inf-child.c, inf-ptrace.c, inf-ttrace.c: Update.
* infcall.c, infcmd.c, inflow.c, infptrace.c, infrun.c: Update.
* inftarg.c, interps.c, irix5-nat.c, jv-lang.c: Update.
* kod-cisco.c, kod.c, language.c, libunwind-frame.c: Update.
* linespec.c, linux-nat.c, linux-thread-db.c, m2-lang.c: Update.
* m32r-rom.c, m68hc11-tdep.c, m68k-tdep.c: Update.
* m68klinux-nat.c, macrocmd.c, macroexp.c, main.c: Update.
* maint.c, mdebugread.c, mem-break.c, memattr.c: Update.
* mips-linux-tdep.c, mips-tdep.c, mipsread.c, monitor.c: Update.
* nlmread.c, nto-procfs.c, objc-lang.c, objfiles.c: Update.
* observer.c, ocd.c, p-lang.c, p-typeprint.c: Update.
* p-valprint.c, pa64solib.c, parse.c, ppc-linux-tdep.c: Update.
* ppcnbsd-tdep.c, printcmd.c, procfs.c, remote-e7000.c: Update.
* remote-fileio.c, remote-m32r-sdi.c, remote-rdi.c: Update.
* remote-rdp.c, remote-sim.c, remote-st.c: Update.
* remote-utils.c, remote-utils.h, remote.c: Update.
* rom68k-rom.c, rs6000-nat.c, s390-tdep.c, scm-lang.c: Update.
* ser-e7kpc.c, ser-tcp.c, ser-unix.c, sh-tdep.c: Update.
* sh3-rom.c, shnbsd-tdep.c, sol-thread.c, solib-aix5.c: Update.
* solib-frv.c, solib-irix.c, solib-osf.c, solib-pa64.c: Update.
* solib-som.c, solib-sunos.c, solib-svr4.c, solib.c: Update.
* somread.c, somsolib.c, source.c, stabsread.c: Update.
* stack.c, std-regs.c, symfile-mem.c, symfile.c: Update.
* symmisc.c, symtab.c, target.c, thread.c, top.c: Update.
* tracepoint.c, trad-frame.c, typeprint.c, utils.c: Update.
* uw-thread.c, valarith.c, valops.c, valprint.c: Update.
* value.c, varobj.c, version.in, win32-nat.c, wince.c: Update.
* xcoffread.c, xcoffsolib.c, cli/cli-cmds.c: Update.
* cli/cli-decode.c, cli/cli-dump.c, cli/cli-logging.c: Update.
* cli/cli-script.c, cli/cli-setshow.c, mi/mi-cmd-break.c: Update.
* mi/mi-cmd-disas.c, mi/mi-cmd-env.c, mi/mi-cmd-file.c: Update.
* mi/mi-cmd-stack.c, mi/mi-cmd-var.c, mi/mi-getopt.c: Update.
* mi/mi-symbol-cmds.c, tui/tui-layout.c, tui/tui-stack.c: Update.
* tui/tui-win.c: Update.
2005-02-11 12:06:14 +08:00
|
|
|
error (_("net_open: No colon in host name!")); /* Shouldn't ever happen */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
tmp = min (port_str - name, (int) sizeof hostname - 1);
|
1999-07-08 04:19:36 +08:00
|
|
|
strncpy (hostname, name, tmp); /* Don't want colon */
|
1999-04-16 09:35:26 +08:00
|
|
|
hostname[tmp] = '\000'; /* Tie off host name */
|
|
|
|
port = atoi (port_str + 1);
|
|
|
|
|
2001-12-04 14:12:56 +08:00
|
|
|
/* default hostname is localhost */
|
2001-08-02 17:08:03 +08:00
|
|
|
if (!hostname[0])
|
|
|
|
strcpy (hostname, "localhost");
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
hostent = gethostbyname (hostname);
|
|
|
|
if (!hostent)
|
|
|
|
{
|
|
|
|
fprintf_unfiltered (gdb_stderr, "%s: unknown host\n", hostname);
|
|
|
|
errno = ENOENT;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2002-05-14 12:26:25 +08:00
|
|
|
if (use_udp)
|
|
|
|
scb->fd = socket (PF_INET, SOCK_DGRAM, 0);
|
|
|
|
else
|
|
|
|
scb->fd = socket (PF_INET, SOCK_STREAM, 0);
|
|
|
|
|
2001-12-04 14:12:56 +08:00
|
|
|
if (scb->fd < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
sockaddr.sin_family = PF_INET;
|
|
|
|
sockaddr.sin_port = htons (port);
|
|
|
|
memcpy (&sockaddr.sin_addr.s_addr, hostent->h_addr,
|
|
|
|
sizeof (struct in_addr));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
2001-12-04 14:12:56 +08:00
|
|
|
/* set socket nonblocking */
|
2005-04-21 13:34:33 +08:00
|
|
|
ioarg = 1;
|
|
|
|
ioctl (scb->fd, FIONBIO, &ioarg);
|
1999-04-16 09:35:26 +08:00
|
|
|
|
2001-12-04 14:12:56 +08:00
|
|
|
/* Use Non-blocking connect. connect() will return 0 if connected already. */
|
|
|
|
n = connect (scb->fd, (struct sockaddr *) &sockaddr, sizeof (sockaddr));
|
1999-04-16 09:35:26 +08:00
|
|
|
|
2005-04-21 13:34:33 +08:00
|
|
|
if (n < 0
|
|
|
|
#ifdef USE_WIN32API
|
|
|
|
/* Under Windows, calling "connect" with a non-blocking socket
|
|
|
|
results in WSAEWOULDBLOCK, not WSAEINPROGRESS. */
|
|
|
|
&& WSAGetLastError() != WSAEWOULDBLOCK
|
|
|
|
#else
|
|
|
|
&& errno != EINPROGRESS
|
|
|
|
#endif
|
|
|
|
)
|
2001-12-04 14:12:56 +08:00
|
|
|
{
|
2005-04-21 13:34:33 +08:00
|
|
|
#ifdef USE_WIN32API
|
|
|
|
errno = WSAGetLastError();
|
|
|
|
#endif
|
2002-05-14 12:26:25 +08:00
|
|
|
net_close (scb);
|
2001-12-04 14:12:56 +08:00
|
|
|
return -1;
|
1999-04-16 09:35:26 +08:00
|
|
|
}
|
|
|
|
|
2001-12-04 14:12:56 +08:00
|
|
|
if (n)
|
|
|
|
{
|
|
|
|
/* looks like we need to wait for the connect */
|
|
|
|
struct timeval t;
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
fd_set rset, wset, eset;
|
2001-12-04 14:12:56 +08:00
|
|
|
int polls = 0;
|
|
|
|
FD_ZERO (&rset);
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
2005-01-14 09:59:20 +08:00
|
|
|
/* While we wait for the connect to complete,
|
2001-12-04 14:12:56 +08:00
|
|
|
poll the UI so it can update or the user can
|
2005-01-14 09:59:20 +08:00
|
|
|
interrupt. */
|
2004-06-26 03:46:08 +08:00
|
|
|
if (deprecated_ui_loop_hook)
|
2001-12-04 14:12:56 +08:00
|
|
|
{
|
2004-06-26 03:46:08 +08:00
|
|
|
if (deprecated_ui_loop_hook (0))
|
2001-12-04 14:12:56 +08:00
|
|
|
{
|
|
|
|
errno = EINTR;
|
2002-05-14 12:26:25 +08:00
|
|
|
net_close (scb);
|
2001-12-04 14:12:56 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
FD_SET (scb->fd, &rset);
|
|
|
|
wset = rset;
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
eset = rset;
|
2001-12-04 14:12:56 +08:00
|
|
|
t.tv_sec = 0;
|
|
|
|
t.tv_usec = 1000000 / POLL_INTERVAL;
|
|
|
|
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
/* POSIX systems return connection success or failure by signalling
|
|
|
|
wset. Windows systems return success in wset and failure in
|
|
|
|
eset.
|
|
|
|
|
|
|
|
We must call select here, rather than gdb_select, because
|
|
|
|
the serial structure has not yet been initialized - the
|
|
|
|
MinGW select wrapper will not know that this FD refers
|
|
|
|
to a socket. */
|
|
|
|
n = select (scb->fd + 1, &rset, &wset, &eset, &t);
|
2001-12-04 14:12:56 +08:00
|
|
|
polls++;
|
|
|
|
}
|
|
|
|
while (n == 0 && polls <= TIMEOUT * POLL_INTERVAL);
|
|
|
|
if (n < 0 || polls > TIMEOUT * POLL_INTERVAL)
|
|
|
|
{
|
|
|
|
if (polls > TIMEOUT * POLL_INTERVAL)
|
|
|
|
errno = ETIMEDOUT;
|
2002-05-14 12:26:25 +08:00
|
|
|
net_close (scb);
|
2001-12-04 14:12:56 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
1999-04-16 09:35:26 +08:00
|
|
|
|
2001-12-04 14:12:56 +08:00
|
|
|
/* Got something. Is it an error? */
|
|
|
|
{
|
2005-05-27 04:49:03 +08:00
|
|
|
int res, err;
|
|
|
|
socklen_t len;
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
len = sizeof (err);
|
2005-04-21 13:34:33 +08:00
|
|
|
/* On Windows, the fourth parameter to getsockopt is a "char *";
|
|
|
|
on UNIX systems it is generally "void *". The cast to "void *"
|
|
|
|
is OK everywhere, since in C "void *" can be implicitly
|
|
|
|
converted to any pointer type. */
|
|
|
|
res = getsockopt (scb->fd, SOL_SOCKET, SO_ERROR, (void *) &err, &len);
|
2001-12-04 14:12:56 +08:00
|
|
|
if (res < 0 || err)
|
|
|
|
{
|
|
|
|
if (err)
|
|
|
|
errno = err;
|
2002-05-14 12:26:25 +08:00
|
|
|
net_close (scb);
|
2001-12-04 14:12:56 +08:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2002-05-14 12:26:25 +08:00
|
|
|
|
2001-12-04 14:12:56 +08:00
|
|
|
/* turn off nonblocking */
|
2005-04-21 13:34:33 +08:00
|
|
|
ioarg = 0;
|
|
|
|
ioctl (scb->fd, FIONBIO, &ioarg);
|
2001-12-04 14:12:56 +08:00
|
|
|
|
2002-05-14 12:26:25 +08:00
|
|
|
if (use_udp == 0)
|
|
|
|
{
|
|
|
|
/* Disable Nagle algorithm. Needed in some cases. */
|
|
|
|
tmp = 1;
|
|
|
|
setsockopt (scb->fd, IPPROTO_TCP, TCP_NODELAY,
|
|
|
|
(char *)&tmp, sizeof (tmp));
|
|
|
|
}
|
|
|
|
|
2005-03-17 01:05:31 +08:00
|
|
|
#ifdef SIGPIPE
|
2001-12-04 14:12:56 +08:00
|
|
|
/* If we don't do this, then GDB simply exits
|
|
|
|
when the remote side dies. */
|
|
|
|
signal (SIGPIPE, SIG_IGN);
|
2005-03-17 01:05:31 +08:00
|
|
|
#endif
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
void
|
2002-05-14 12:26:25 +08:00
|
|
|
net_close (struct serial *scb)
|
1999-04-16 09:35:26 +08:00
|
|
|
{
|
|
|
|
if (scb->fd < 0)
|
|
|
|
return;
|
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
close (scb->fd);
|
1999-04-16 09:35:26 +08:00
|
|
|
scb->fd = -1;
|
|
|
|
}
|
|
|
|
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
int
|
2005-04-21 13:34:33 +08:00
|
|
|
net_read_prim (struct serial *scb, size_t count)
|
|
|
|
{
|
|
|
|
return recv (scb->fd, scb->buf, count, 0);
|
|
|
|
}
|
|
|
|
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
int
|
2005-04-21 13:34:33 +08:00
|
|
|
net_write_prim (struct serial *scb, const void *buf, size_t count)
|
|
|
|
{
|
|
|
|
return send (scb->fd, buf, count, 0);
|
|
|
|
}
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
void
|
1999-09-22 11:28:34 +08:00
|
|
|
_initialize_ser_tcp (void)
|
1999-04-16 09:35:26 +08:00
|
|
|
{
|
2005-04-21 13:34:33 +08:00
|
|
|
#ifdef USE_WIN32API
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
/* Do nothing; the TCP serial operations will be initialized in
|
|
|
|
ser-mingw.c. */
|
|
|
|
return;
|
|
|
|
#else
|
|
|
|
struct serial_ops *ops;
|
2005-04-21 13:34:33 +08:00
|
|
|
ops = XMALLOC (struct serial_ops);
|
2003-05-14 03:40:11 +08:00
|
|
|
memset (ops, 0, sizeof (struct serial_ops));
|
1999-09-22 11:28:34 +08:00
|
|
|
ops->name = "tcp";
|
|
|
|
ops->next = 0;
|
2002-05-14 12:26:25 +08:00
|
|
|
ops->open = net_open;
|
|
|
|
ops->close = net_close;
|
2005-04-21 13:34:33 +08:00
|
|
|
ops->readchar = ser_base_readchar;
|
2005-03-26 04:06:36 +08:00
|
|
|
ops->write = ser_base_write;
|
|
|
|
ops->flush_output = ser_base_flush_output;
|
|
|
|
ops->flush_input = ser_base_flush_input;
|
|
|
|
ops->send_break = ser_base_send_break;
|
|
|
|
ops->go_raw = ser_base_raw;
|
|
|
|
ops->get_tty_state = ser_base_get_tty_state;
|
|
|
|
ops->set_tty_state = ser_base_set_tty_state;
|
|
|
|
ops->print_tty_state = ser_base_print_tty_state;
|
|
|
|
ops->noflush_set_tty_state = ser_base_noflush_set_tty_state;
|
|
|
|
ops->setbaudrate = ser_base_setbaudrate;
|
|
|
|
ops->setstopbits = ser_base_setstopbits;
|
|
|
|
ops->drain_output = ser_base_drain_output;
|
|
|
|
ops->async = ser_base_async;
|
2005-04-21 13:34:33 +08:00
|
|
|
ops->read_prim = net_read_prim;
|
|
|
|
ops->write_prim = net_write_prim;
|
1999-09-22 11:28:34 +08:00
|
|
|
serial_add_interface (ops);
|
* NEWS: Mention native Windows support.
* Makefile.in (gdb_select_h, ser_tcp_h): New.
(ALLDEPFILES): Add ser-mingw.c.
(event-loop.o, inflow.o, mingw-hdep.o, posix-hdep.o, ser-base.o)
(ser-tcp.o, ser-unix.o): Update.
(ser-mingw.o): New rule.
* configure: Regenerated.
* configure.ac: Add ser-mingw.o for mingw32.
* ser-mingw.c: New file.
* event-loop.c: Include "gdb_select.h".
(gdb_select): Remove, moved to mingw-hdep.c and posix-hdep.c.
* ser-base.c: Include "gdb_select.h".
(ser_base_wait_for): Use gdb_select.
* serial.c (serial_for_fd): New function.
(serial_fdopen): Try "terminal" before "hardwire". Initialize
the allocated struct serial.
(serial_wait_handle): New function.
* serial.h (serial_for_fd, serial_wait_handle): New prototypes.
(struct serial_ops) [USE_WIN32API]: Add wait_handle.
* gdb_select.h: New file.
* ser-tcp.c: Include "ser-tcp.h". Remove unused "ser-unix.h" include.
(net_close, net_read_prim, net_write_prim): Make global.
(net_open): Likewise. Pass an exception set to select. Whitespace fix.
Document why we can not use gdb_select.
(_initialize_ser_tcp) [USE_WIN32API]: Do not register TCP support here.
* ser-tcp.h: New file.
* inflow.c (gdb_has_a_terminal): Don't initialize stdin_serial here.
(handle_sigio): Use gdb_select.
(initialize_stdin_serial): New function.
* terminal.h (initialize_stdin_serial): New prototype.
* top.c (gdb_init): Call initialize_stdin_serial.
* mingw-hdep.c (gdb_select): New function, moved from gdb_select in
event-loop.c. Add exception condition support. Use serial_for_fd
and serial_wait_handle. Fix timeout handling.
* posix-hdep.c: Include "gdb_select.h".
(gdb_select): New function.
* remote-st.c (connect_command): Use gdb_select.
* ser-unix.c: Include "gdb_select.h".
(hardwire_send_break, wait_for): Use gdb_select.
2006-02-11 06:01:43 +08:00
|
|
|
#endif /* USE_WIN32API */
|
1999-04-16 09:35:26 +08:00
|
|
|
}
|