- stevesk@cvs.openbsd.org 2002/02/24 19:59:42

     [channels.c misc.c]
     disable Nagle in connect_to() and channel_post_port_listener() (port
     forwarding endpoints).  the intention is to preserve the on-the-wire
     appearance to applications at either end; the applications can then
     enable TCP_NODELAY according to their requirements. ok markus@

1 files changed, 3 insertions, 1 deletions

diff --git a/channels.c b/channels.c
index 50d6f16a..325f278f 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.168 2002/02/14 23:27:59 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.169 2002/02/24 19:59:42 stevesk Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1116,6 +1116,7 @@ channel_post_port_listener(Channel *c, fd_set * readset, fd_set * writeset)
 			error("accept: %.100s", strerror(errno));
 			return;
 		}
+		set_nodelay(newsock);
 		nc = channel_new(rtype,
 		    nextstate, newsock, newsock, -1,
 		    c->local_window_max, c->local_maxpacket,
@@ -2270,6 +2271,7 @@ connect_to(const char *host, u_short port)
 		return -1;
 	}
 	/* success */
+	set_nodelay(sock);
 	return sock;
 }