summaryrefslogtreecommitdiff
path: root/packet.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 12:05:22 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 12:05:22 +1100
commit314dd4b2f33c22330f3f4272b1605fb0d8fbc58b (patch)
tree821bb43145d5df6847b75b5b6e0a3cefdad2df5d /packet.c
parentb24c2f8e33781be43702d8cfc69d4fbd0547e638 (diff)
downloadopenssh-git-314dd4b2f33c22330f3f4272b1605fb0d8fbc58b.tar.gz
- dtucker@cvs.openbsd.org 2006/03/13 08:33:00
[packet.c] Set TCP_NODELAY for all connections not just "interactive" ones. Fixes poor performance and protocol stalls under some network conditions (mindrot bugs #556 and #981). Patch originally from markus@, ok djm@
Diffstat (limited to 'packet.c')
-rw-r--r--packet.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/packet.c b/packet.c
index 24d2bb31..ca6861e5 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.121 2006/02/08 14:38:18 stevesk Exp $");
+RCSID("$OpenBSD: packet.c,v 1.122 2006/03/13 08:33:00 dtucker Exp $");
#include "openbsd-compat/sys-queue.h"
#include <netinet/in_systm.h>
@@ -1482,8 +1482,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);
+ set_nodelay(connection_in);
packet_set_tos(interactive);
}