1 files changed, 17 insertions, 2 deletions

diff --git a/packet.c b/packet.c
index 3e21df722..dae1226a6 100644
--- a/packet.c
+++ b/packet.c
@@ -77,6 +77,8 @@ RCSID("$OpenBSD: packet.c,v 1.104 2003/04/01 10:22:21 markus Exp $");
 static int connection_in = -1;
 static int connection_out = -1;
 
+static int setup_timeout = -1;
+
 /* Protocol flags for the remote side. */
 static u_int remote_protocol_flags = 0;
 
@@ -131,7 +133,7 @@ static u_char extra_pad = 0;
  * packet_set_encryption_key is called.
  */
 void
-packet_set_connection(int fd_in, int fd_out)
+packet_set_connection(int fd_in, int fd_out, int new_setup_timeout)
 {
         Cipher *none = cipher_by_name("none");
 
@@ -139,6 +141,7 @@ packet_set_connection(int fd_in, int fd_out)
                 fatal("packet_set_connection: cannot load cipher 'none'");
         connection_in = fd_in;
         connection_out = fd_out;
+        setup_timeout = new_setup_timeout;
         cipher_init(&send_context, none, "", 0, NULL, 0, CIPHER_ENCRYPT);
         cipher_init(&receive_context, none, "", 0, NULL, 0, CIPHER_DECRYPT);
         newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL;
@@ -745,6 +748,7 @@ packet_read_seqnr(u_int32_t *seqnr_p)
         int type, len;
         fd_set *setp;
         char buf[8192];
+        struct timeval tv, *tvp;
         DBG(debug("packet_read()"));
 
         setp = (fd_set *)xmalloc(howmany(connection_in+1, NFDBITS) *
@@ -776,11 +780,21 @@ packet_read_seqnr(u_int32_t *seqnr_p)
                     sizeof(fd_mask));
                 FD_SET(connection_in, setp);
 
+                if (setup_timeout > 0) {
+                  tvp = &tv;
+                  tv.tv_sec = setup_timeout;
+                  tv.tv_usec = 0;
+                } else
+                  tvp = 0;
+
                 /* Wait for some data to arrive. */
-                while (select(connection_in + 1, setp, NULL, NULL, NULL) == -1 &&
+                while (select(connection_in + 1, setp, NULL, NULL, tvp) == -1 &&
                     (errno == EAGAIN || errno == EINTR))
                         ;
 
+                if (!FD_ISSET(connection_in, setp))
+                  fatal("packet_read: Setup timeout expired, giving up");
+
                 /* Read data from the socket. */
                 len = read(connection_in, buf, sizeof(buf));
                 if (len == 0) {
@@ -1344,6 +1358,7 @@ packet_set_interactive(int interactive)
 
         /* Only set socket options if using a socket.  */
         if (!packet_connection_is_on_socket())
+                return;
         if (interactive)
                 set_nodelay(connection_in);
 #if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)