- deraadt@cvs.openbsd.org 2001/03/06 00:33:04

[openssh.git] / packet.c

diff --git a/packet.c b/packet.c
index a1a5d8a76c7ae8549e05067c4733853a4fb0ce6a..1a634cff45e35b7af5e2517f59860040df446455 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.54 2001/02/28 21:27:47 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.56 2001/03/03 21:41:07 millert Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
@@ -389,7 +389,7 @@ packet_start2(int type)
 void
 packet_start(int type)
 {
-       DBG(debug("packet_start[%d]",type));
+       DBG(debug("packet_start[%d]", type));
        if (use_ssh2_packet_format)
                packet_start2(type);
        else
@@ -660,10 +660,13 @@ int
 packet_read(int *payload_len_ptr)
 {
        int type, len;
-       fd_set set;
+       fd_set *setp;
        char buf[8192];
        DBG(debug("packet_read()"));
 
+       setp = (fd_set *)xmalloc(howmany(connection_in+1, NFDBITS) *
+           sizeof(fd_mask));
+
        /* Since we are blocking, ensure that all written packets have been sent. */
        packet_write_wait();
 
@@ -678,17 +681,20 @@ packet_read(int *payload_len_ptr)
                    || type == SSH_CMSG_EXIT_CONFIRMATION))
                        packet_integrity_check(*payload_len_ptr, 0, type);
                /* If we got a packet, return it. */
-               if (type != SSH_MSG_NONE)
+               if (type != SSH_MSG_NONE) {
+                       xfree(setp);
                        return type;
+               }
                /*
                 * Otherwise, wait for some data to arrive, add it to the
                 * buffer, and try again.
                 */
-               FD_ZERO(&set);
-               FD_SET(connection_in, &set);
+               memset(setp, 0, howmany(connection_in + 1, NFDBITS) *
+                   sizeof(fd_mask));
+               FD_SET(connection_in, setp);
 
                /* Wait for some data to arrive. */
-               while (select(connection_in + 1, &set, NULL, NULL, NULL) == -1 &&
+               while (select(connection_in + 1, setp, NULL, NULL, NULL) == -1 &&
                    (errno == EAGAIN || errno == EINTR))
                        ;
 
@@ -942,7 +948,7 @@ packet_read_poll2(int *payload_len_ptr)
        }
 
 #ifdef PACKET_DEBUG
-       fprintf(stderr, "read/plain[%d]:\r\n",type);
+       fprintf(stderr, "read/plain[%d]:\r\n", type);
        buffer_dump(&incoming_packet);
 #endif
        return (u_char)type;
@@ -1194,17 +1200,21 @@ packet_write_poll()
 void
 packet_write_wait()
 {
+       fd_set *setp;
+
+       setp = (fd_set *)xmalloc(howmany(connection_out + 1, NFDBITS) *
+           sizeof(fd_mask));
        packet_write_poll();
        while (packet_have_data_to_write()) {
-               fd_set set;
-
-               FD_ZERO(&set);
-               FD_SET(connection_out, &set);
-               while (select(connection_out + 1, NULL, &set, NULL, NULL) == -1 &&
+               memset(setp, 0, howmany(connection_out + 1, NFDBITS) *
+                   sizeof(fd_mask));
+               FD_SET(connection_out, setp);
+               while (select(connection_out + 1, NULL, setp, NULL, NULL) == -1 &&
                    (errno == EAGAIN || errno == EINTR))
                        ;
                packet_write_poll();
        }
+       xfree(setp);
 }
 
 /* Returns true if there is buffered data to write to the connection. */