tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) [packet.c] Shuffle #ifdef to reduce conditionally compiled code

Browse Source
This commit is contained in:
Damien Miller 2003-11-22 15:02:42 +11:00
parent 841b9f1aad
commit 5924ceb22d
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -8,6 +8,7 @@
is enabled, rely on SIA to check for locked accounts if enabled. ok djm@ 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) [scp.c] Rename limitbw -> limit_rate to match upstreamed patch
- (djm) [sftp-int.c] Remove duplicated code from bogus sync - (djm) [sftp-int.c] Remove duplicated code from bogus sync
- (djm) [packet.c] Shuffle #ifdef to reduce conditionally compiled code
20031121 20031121
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -1509,4 +1510,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

7
packet.c
View File

@ -1403,10 +1403,10 @@ packet_not_very_much_data_to_write(void)
} }
#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
static void static void
packet_set_tos(int interactive) packet_set_tos(int interactive)
{ {
#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
int tos = interactive ? IPTOS_LOWDELAY : IPTOS_THROUGHPUT; int tos = interactive ? IPTOS_LOWDELAY : IPTOS_THROUGHPUT;
if (!packet_connection_is_on_socket() || if (!packet_connection_is_on_socket() ||
@ -1416,8 +1416,8 @@ packet_set_tos(int interactive)
sizeof(tos)) < 0) sizeof(tos)) < 0)
error("setsockopt IP_TOS %d: %.100s:", error("setsockopt IP_TOS %d: %.100s:",
tos, strerror(errno)); tos, strerror(errno));
}
#endif #endif
}
/* Informs that the current session is interactive. Sets IP flags for that. */ /* Informs that the current session is interactive. Sets IP flags for that. */
@ -1438,10 +1438,7 @@ packet_set_interactive(int interactive)
return; return;
if (interactive) if (interactive)
set_nodelay(connection_in); set_nodelay(connection_in);
#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
packet_set_tos(interactive); packet_set_tos(interactive);
#endif
} }
/* Returns true if the current connection is interactive. */ /* Returns true if the current connection is interactive. */