* gdb.base/Makefile.in (clean): Remove callf-info.exp.

[deliverable/binutils-gdb.git] / gdb / ser-tcp.c

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 5afe63e3d63e50e01005aff868ae2b90284c0259..2483ccc438646755700990d6f1837c279c436d79 100644 (file)
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -38,8 +38,9 @@ static void tcp_raw PARAMS ((serial_t scb));
 static int wait_for PARAMS ((serial_t scb, int timeout));
 static int tcp_readchar PARAMS ((serial_t scb, int timeout));
 static int tcp_setbaudrate PARAMS ((serial_t scb, int rate));
+static int tcp_setstopbits PARAMS ((serial_t scb, int num));
 static int tcp_write PARAMS ((serial_t scb, const char *str, int len));
-static void tcp_restore PARAMS ((serial_t scb));
+/* FIXME: static void tcp_restore PARAMS ((serial_t scb)); */
 static void tcp_close PARAMS ((serial_t scb));
 static serial_ttystate tcp_get_tty_state PARAMS ((serial_t scb));
 static int tcp_set_tty_state PARAMS ((serial_t scb, serial_ttystate state));
@@ -58,6 +59,7 @@ tcp_open(scb, name)
   int tmp;
   char hostname[100];
   struct protoent *protoent;
+  int i;
 
   port_str = strchr (name, ':');
 
@@ -73,33 +75,43 @@ tcp_open(scb, name)
 
   if (!hostent)
     {
-      fprintf (stderr, "%s: unknown host\n", hostname);
+      fprintf_unfiltered (gdb_stderr, "%s: unknown host\n", hostname);
       errno = ENOENT;
       return -1;
     }
 
-  scb->fd = socket (PF_INET, SOCK_STREAM, 0);
-  if (scb->fd < 0)
-    return -1;
+  for (i = 1; i <= 15; i++)
+    {
+      scb->fd = socket (PF_INET, SOCK_STREAM, 0);
+      if (scb->fd < 0)
+       return -1;
 
-  /* Allow rapid reuse of this port. */
-  tmp = 1;
-  setsockopt (scb->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&tmp, sizeof(tmp));
+      /* Allow rapid reuse of this port. */
+      tmp = 1;
+      setsockopt (scb->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&tmp, sizeof(tmp));
 
-  /* Enable TCP keep alive process. */
-  tmp = 1;
-  setsockopt (scb->fd, SOL_SOCKET, SO_KEEPALIVE, (char *)&tmp, sizeof(tmp));
+      /* Enable TCP keep alive process. */
+      tmp = 1;
+      setsockopt (scb->fd, SOL_SOCKET, SO_KEEPALIVE, (char *)&tmp, sizeof(tmp));
 
-  sockaddr.sin_family = PF_INET;
-  sockaddr.sin_port = htons(port);
-  memcpy (&sockaddr.sin_addr.s_addr, hostent->h_addr,
-         sizeof (struct in_addr));
+      sockaddr.sin_family = PF_INET;
+      sockaddr.sin_port = htons(port);
+      memcpy (&sockaddr.sin_addr.s_addr, hostent->h_addr,
+             sizeof (struct in_addr));
 
-  if (connect (scb->fd, &sockaddr, sizeof(sockaddr)))
-    {
-      close(scb->fd);
+      if (!connect (scb->fd, (struct sockaddr *) &sockaddr, sizeof(sockaddr)))
+       break;
+
+      close (scb->fd);
       scb->fd = -1;
-      return -1;
+
+/* We retry for ECONNREFUSED because that is often a temporary condition, which
+   happens when the server is being restarted.  */
+
+      if (errno != ECONNREFUSED)
+       return -1;
+
+      sleep (1);
     }
 
   protoent = getprotobyname ("tcp");
@@ -140,6 +152,13 @@ tcp_set_tty_state(scb, ttystate)
   return 0;
 }
 
+static int
+tcp_return_0 (scb)
+     serial_t scb;
+{
+  return 0;
+}
+
 static void
 tcp_raw(scb)
      serial_t scb;
@@ -211,7 +230,12 @@ tcp_readchar(scb, timeout)
   if (status < 0)
     return status;
 
-  scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ);
+  while (1)
+    {
+      scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ);
+      if (scb->bufcnt != -1 || errno != EINTR)
+       break;
+    }
 
   if (scb->bufcnt <= 0)
     if (scb->bufcnt == 0)
@@ -226,6 +250,24 @@ tcp_readchar(scb, timeout)
   return *scb->bufp++;
 }
 
+static int
+tcp_noflush_set_tty_state (scb, new_ttystate, old_ttystate)
+     serial_t scb;
+     serial_ttystate new_ttystate;
+     serial_ttystate old_ttystate;
+{
+  return 0;
+}
+
+static void
+tcp_print_tty_state (scb, ttystate)
+     serial_t scb;
+     serial_ttystate ttystate;
+{
+  /* Nothing to print.  */
+  return;
+}
+
 static int
 tcp_setbaudrate(scb, rate)
      serial_t scb;
@@ -234,6 +276,14 @@ tcp_setbaudrate(scb, rate)
   return 0;                    /* Never fails! */
 }
 
+static int
+tcp_setstopbits(scb, num)
+     serial_t scb;
+     int num;
+{
+  return 0;                    /* Never fails! */
+}
+
 static int
 tcp_write(scb, str, len)
      serial_t scb;
@@ -273,10 +323,16 @@ static struct serial_ops tcp_ops =
   tcp_close,
   tcp_readchar,
   tcp_write,
+  tcp_return_0, /* flush output */
+  tcp_return_0, /* flush input */
+  tcp_return_0, /* send break */
   tcp_raw,
   tcp_get_tty_state,
   tcp_set_tty_state,
+  tcp_print_tty_state,
+  tcp_noflush_set_tty_state,
   tcp_setbaudrate,
+  tcp_setstopbits,
 };
 
 void