#include "defs.h"
#include "serial.h"
+#include "ser-base.h"
#include "ser-unix.h"
#include <sys/types.h>
#include <signal.h>
#include "gdb_string.h"
-static int tcp_open (struct serial *scb, const char *name);
-static void tcp_close (struct serial *scb);
-extern int (*ui_loop_hook) (int);
+static int net_open (struct serial *scb, const char *name);
+static void net_close (struct serial *scb);
void _initialize_ser_tcp (void);
/* seconds to wait for connect */
#define TIMEOUT 15
-/* how many times per second to poll ui_loop_hook */
+/* how many times per second to poll deprecated_ui_loop_hook */
#define POLL_INTERVAL 2
/* Open a tcp socket */
static int
-tcp_open (struct serial *scb, const char *name)
+net_open (struct serial *scb, const char *name)
{
char *port_str, hostname[100];
int n, port, tmp;
+ int use_udp;
struct hostent *hostent;
struct sockaddr_in sockaddr;
+ 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;
+
port_str = strchr (name, ':');
if (!port_str)
- error ("tcp_open: No colon in host name!"); /* Shouldn't ever happen */
+ error (_("net_open: No colon in host name!")); /* Shouldn't ever happen */
tmp = min (port_str - name, (int) sizeof hostname - 1);
strncpy (hostname, name, tmp); /* Don't want colon */
return -1;
}
- scb->fd = socket (PF_INET, SOCK_STREAM, 0);
+ if (use_udp)
+ scb->fd = socket (PF_INET, SOCK_DGRAM, 0);
+ else
+ scb->fd = socket (PF_INET, SOCK_STREAM, 0);
+
if (scb->fd < 0)
return -1;
if (n < 0 && errno != EINPROGRESS)
{
- tcp_close (scb);
+ net_close (scb);
return -1;
}
do
{
- /* While we wait for the connect to complete
+ /* While we wait for the connect to complete,
poll the UI so it can update or the user can
- interrupt. */
- if (ui_loop_hook)
+ interrupt. */
+ if (deprecated_ui_loop_hook)
{
- if (ui_loop_hook (0))
+ if (deprecated_ui_loop_hook (0))
{
errno = EINTR;
- tcp_close (scb);
+ net_close (scb);
return -1;
}
}
{
if (polls > TIMEOUT * POLL_INTERVAL)
errno = ETIMEDOUT;
- tcp_close (scb);
+ net_close (scb);
return -1;
}
}
{
if (err)
errno = err;
- tcp_close (scb);
+ net_close (scb);
return -1;
}
}
-
+
/* turn off nonblocking */
tmp = 0;
ioctl (scb->fd, FIONBIO, &tmp);
+ if (use_udp == 0)
+ {
+ /* Disable Nagle algorithm. Needed in some cases. */
+ tmp = 1;
+ setsockopt (scb->fd, IPPROTO_TCP, TCP_NODELAY,
+ (char *)&tmp, sizeof (tmp));
+ }
+
+#ifdef SIGPIPE
/* If we don't do this, then GDB simply exits
when the remote side dies. */
signal (SIGPIPE, SIG_IGN);
+#endif
return 0;
}
static void
-tcp_close (struct serial *scb)
+net_close (struct serial *scb)
{
if (scb->fd < 0)
return;
_initialize_ser_tcp (void)
{
struct serial_ops *ops = XMALLOC (struct serial_ops);
- memset (ops, sizeof (struct serial_ops), 0);
+ memset (ops, 0, sizeof (struct serial_ops));
ops->name = "tcp";
ops->next = 0;
- ops->open = tcp_open;
- ops->close = tcp_close;
+ ops->open = net_open;
+ ops->close = net_close;
ops->readchar = ser_unix_readchar;
- ops->write = ser_unix_write;
- ops->flush_output = ser_unix_nop_flush_output;
- ops->flush_input = ser_unix_flush_input;
- ops->send_break = ser_unix_nop_send_break;
- ops->go_raw = ser_unix_nop_raw;
- ops->get_tty_state = ser_unix_nop_get_tty_state;
- ops->set_tty_state = ser_unix_nop_set_tty_state;
- ops->print_tty_state = ser_unix_nop_print_tty_state;
- ops->noflush_set_tty_state = ser_unix_nop_noflush_set_tty_state;
- ops->setbaudrate = ser_unix_nop_setbaudrate;
- ops->setstopbits = ser_unix_nop_setstopbits;
- ops->drain_output = ser_unix_nop_drain_output;
- ops->async = ser_unix_async;
+ 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;
serial_add_interface (ops);
}