From: mouring <mouring>
Date: Wed, 2 Apr 2003 15:18:22 +0000 (+0000)
Subject:  - (bal) if IP_TOS is not found or broken don't try to compile in
X-Git-Tag: V_3_6_1_P2~18
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/4d0cb2e5aacf92748b0479919dc3207b09de2be5

 - (bal) if IP_TOS is not found or broken don't try to compile in
   packet_set_tos() function call.  bug #527
---

diff --git a/ChangeLog b/ChangeLog
index ca93b69d..c34a7e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030402
+ - (bal) if IP_TOS is not found or broken don't try to compile in
+   packet_set_tos() function call.  bug #527
+
 20030401
  - (djm) OpenBSD CVS Sync
    - jmc@cvs.openbsd.org 2003/03/28 10:11:43
diff --git a/packet.c b/packet.c
index 3e21df72..254e452d 100644
--- a/packet.c
+++ b/packet.c
@@ -1314,6 +1314,8 @@ packet_not_very_much_data_to_write(void)
 		return buffer_len(&output) < 128 * 1024;
 }
 
+
+#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
 static void
 packet_set_tos(int interactive)
 {
@@ -1327,6 +1329,7 @@ packet_set_tos(int interactive)
 		error("setsockopt IP_TOS %d: %.100s:",
 		    tos, strerror(errno));
 }
+#endif
 
 /* Informs that the current session is interactive.  Sets IP flags for that. */