From 5924ceb22d8eb5e03bad93b7c0b9c6e30ed0814b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 22 Nov 2003 15:02:42 +1100 Subject: [PATCH] - (djm) [packet.c] Shuffle #ifdef to reduce conditionally compiled code --- ChangeLog | 3 ++- packet.c | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ae79cb62..9f4a1f8d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ is enabled, rely on SIA to check for locked accounts if enabled. ok djm@ - (djm) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch - (djm) [sftp-int.c] Remove duplicated code from bogus sync + - (djm) [packet.c] Shuffle #ifdef to reduce conditionally compiled code 20031121 - (djm) OpenBSD CVS Sync @@ -1509,4 +1510,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3124 2003/11/22 03:48:49 djm Exp $ +$Id: ChangeLog,v 1.3125 2003/11/22 04:02:42 djm Exp $ diff --git a/packet.c b/packet.c index 16d5f972c..daae9ffaa 100644 --- a/packet.c +++ b/packet.c @@ -1403,10 +1403,10 @@ packet_not_very_much_data_to_write(void) } -#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN) static void packet_set_tos(int interactive) { +#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN) int tos = interactive ? IPTOS_LOWDELAY : IPTOS_THROUGHPUT; if (!packet_connection_is_on_socket() || @@ -1416,8 +1416,8 @@ packet_set_tos(int interactive) sizeof(tos)) < 0) error("setsockopt IP_TOS %d: %.100s:", tos, strerror(errno)); -} #endif +} /* Informs that the current session is interactive. Sets IP flags for that. */ @@ -1438,10 +1438,7 @@ packet_set_interactive(int interactive) return; if (interactive) set_nodelay(connection_in); -#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN) packet_set_tos(interactive); -#endif - } /* Returns true if the current connection is interactive. */