summaryrefslogtreecommitdiffstats
path: root/packet.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-02-05 01:52:13 +0100
committerDamien Miller <djm@mindrot.org>2002-02-05 01:52:13 +0100
commit398e1cfa23843c8a54864b00384ea84e669dd6d9 (patch)
treee28bcc27faade5b32eead8fae809ca063ca0faa6 /packet.c
parent[configure.ac] fix logic on when ssh-rand-helper is installed. (diff)
downloadopenssh-398e1cfa23843c8a54864b00384ea84e669dd6d9.tar.xz
openssh-398e1cfa23843c8a54864b00384ea84e669dd6d9.zip
- (djm) OpenBSD CVS Sync
- stevesk@cvs.openbsd.org 2002/01/24 21:09:25 [channels.c misc.c misc.h packet.c] add set_nodelay() to set TCP_NODELAY on a socket (prep for nagle tuning). no nagle changes just yet; ok djm@ markus@
Diffstat (limited to '')
-rw-r--r--packet.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/packet.c b/packet.c
index 960675a93..3a498f631 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.85 2002/01/18 18:14:17 stevesk Exp $");
+RCSID("$OpenBSD: packet.c,v 1.86 2002/01/24 21:09:25 stevesk Exp $");
#include "xmalloc.h"
#include "buffer.h"
@@ -1191,7 +1191,6 @@ packet_set_interactive(int interactive)
int lowdelay = IPTOS_LOWDELAY;
int throughput = IPTOS_THROUGHPUT;
#endif
- int on = 1;
if (called)
return;
@@ -1219,9 +1218,7 @@ packet_set_interactive(int interactive)
strerror(errno));
}
#endif
- if (setsockopt(connection_in, IPPROTO_TCP, TCP_NODELAY, (void *) &on,
- sizeof(on)) < 0)
- error("setsockopt TCP_NODELAY: %.100s", strerror(errno));
+ set_nodelay(connection_in);
} else if (packet_connection_is_ipv4()) {
/*
* Set IP options for a non-interactive connection. Use