* printcmd.c (disassemble_command): Adjust low function bound

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

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 9eb9647eb5752def8128afd637803dab0489be6d..23153a9d0dec8591da7d1538d60f1a49c4cdf2bd 100644 (file)
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -15,7 +15,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "serial.h"
@@ -25,8 +25,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/socket.h>
+
+#ifndef __CYGWIN32__
 #include <netinet/tcp.h>
+#endif
+
 #include "signals.h"
+#include "gdb_string.h"
 
 struct tcp_ttystate
 {
@@ -38,11 +43,16 @@ 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));
 /* 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));
+static int tcp_return_0 PARAMS ((serial_t));
+static int tcp_noflush_set_tty_state PARAMS ((serial_t, serial_ttystate,
+                                             serial_ttystate));
+static void tcp_print_tty_state PARAMS ((serial_t, serial_ttystate));
 
 /* Open up a raw tcp socket */
 
@@ -58,13 +68,14 @@ tcp_open(scb, name)
   int tmp;
   char hostname[100];
   struct protoent *protoent;
+  int i;
 
   port_str = strchr (name, ':');
 
   if (!port_str)
     error ("tcp_open: No colon in host name!"); /* Shouldn't ever happen */
 
-  tmp = min (port_str - name, sizeof hostname - 1);
+  tmp = min (port_str - name, (int) sizeof hostname - 1);
   strncpy (hostname, name, tmp); /* Don't want colon */
   hostname[tmp] = '\000';      /* Tie off host name */
   port = atoi (port_str + 1);
@@ -78,28 +89,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, &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");
@@ -218,7 +239,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)
@@ -259,6 +285,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;
@@ -307,6 +341,7 @@ static struct serial_ops tcp_ops =
   tcp_print_tty_state,
   tcp_noflush_set_tty_state,
   tcp_setbaudrate,
+  tcp_setstopbits,
 };
 
 void