* inftarg.c (child_thread_alive): New function to see if a

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

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 029a6259822333f65b387c0386b88d523f2d764c..2483ccc438646755700990d6f1837c279c436d79 100644 (file)
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -59,6 +59,7 @@ tcp_open(scb, name)
   int tmp;
   char hostname[100];
   struct protoent *protoent;
+  int i;
 
   port_str = strchr (name, ':');
 
@@ -79,28 +80,38 @@ tcp_open(scb, name)
       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, (struct sockaddr *) &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");