===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/channels.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- src/usr.bin/ssh/channels.c	1999/12/12 19:20:02	1.33
+++ src/usr.bin/ssh/channels.c	1999/12/27 09:48:38	1.34
@@ -16,7 +16,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: channels.c,v 1.33 1999/12/12 19:20:02 markus Exp $");
+RCSID("$Id: channels.c,v 1.34 1999/12/27 09:48:38 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -251,7 +251,7 @@
 				packet_put_int(ch->remote_id);
 				packet_send();
 				ch->type = SSH_CHANNEL_CLOSED;
-				debug("Closing channel %d after input drain.", i);
+				debug("Closing channel %d after input drain.", ch->self);
 				break;
 			}
 			break;
@@ -443,17 +443,16 @@
 			 * for connections from clients.
 			 */
 			if (FD_ISSET(ch->sock, readset)) {
-				int nchan;
-				len = sizeof(addr);
-				newsock = accept(ch->sock, &addr, &len);
+				addrlen = sizeof(addr);
+				newsock = accept(ch->sock, &addr, &addrlen);
 				if (newsock < 0) {
 					error("accept from auth socket: %.100s", strerror(errno));
 					break;
 				}
-				nchan = channel_allocate(SSH_CHANNEL_OPENING, newsock,
+				newch = channel_allocate(SSH_CHANNEL_OPENING, newsock,
 					xstrdup("accepted auth socket"));
 				packet_start(SSH_SMSG_AGENT_OPEN);
-				packet_put_int(nchan);
+				packet_put_int(newch);
 				packet_send();
 			}
 			break;
@@ -547,8 +546,8 @@
 					len = 512;
 			} else {
 				/* Keep the packets at reasonable size. */
-				if (len > 16384)
-					len = 16384;
+				if (len > packet_get_maxsize()/2)
+					len = packet_get_maxsize()/2;
 			}
 			packet_start(SSH_MSG_CHANNEL_DATA);
 			packet_put_int(ch->remote_id);