diff options
author | Damien Miller <djm@mindrot.org> | 2002-02-05 11:52:13 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-02-05 11:52:13 +1100 |
commit | 398e1cfa23843c8a54864b00384ea84e669dd6d9 (patch) | |
tree | e28bcc27faade5b32eead8fae809ca063ca0faa6 /packet.c | |
parent | 1e2c600892c322e3c117bc111f0f8fbdce757a69 (diff) |
- (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 'packet.c')
-rw-r--r-- | packet.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.85 2002/01/18 18:14:17 stevesk Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.86 2002/01/24 21:09:25 stevesk Exp $"); |
41 | 41 | ||
42 | #include "xmalloc.h" | 42 | #include "xmalloc.h" |
43 | #include "buffer.h" | 43 | #include "buffer.h" |
@@ -1191,7 +1191,6 @@ packet_set_interactive(int interactive) | |||
1191 | int lowdelay = IPTOS_LOWDELAY; | 1191 | int lowdelay = IPTOS_LOWDELAY; |
1192 | int throughput = IPTOS_THROUGHPUT; | 1192 | int throughput = IPTOS_THROUGHPUT; |
1193 | #endif | 1193 | #endif |
1194 | int on = 1; | ||
1195 | 1194 | ||
1196 | if (called) | 1195 | if (called) |
1197 | return; | 1196 | return; |
@@ -1219,9 +1218,7 @@ packet_set_interactive(int interactive) | |||
1219 | strerror(errno)); | 1218 | strerror(errno)); |
1220 | } | 1219 | } |
1221 | #endif | 1220 | #endif |
1222 | if (setsockopt(connection_in, IPPROTO_TCP, TCP_NODELAY, (void *) &on, | 1221 | set_nodelay(connection_in); |
1223 | sizeof(on)) < 0) | ||
1224 | error("setsockopt TCP_NODELAY: %.100s", strerror(errno)); | ||
1225 | } else if (packet_connection_is_ipv4()) { | 1222 | } else if (packet_connection_is_ipv4()) { |
1226 | /* | 1223 | /* |
1227 | * Set IP options for a non-interactive connection. Use | 1224 | * Set IP options for a non-interactive connection. Use |