summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2003-04-02 15:18:22 +0000
committerBen Lindstrom <mouring@eviladmin.org>2003-04-02 15:18:22 +0000
commitc8a49d743ae2ab739ca4266e7013bc9c3079aaee (patch)
tree73209aa1d5c6ce9b0771decdb1699bd0a4647cce
parenta0ab669c133a756bd5b8f4eef82693e367c49532 (diff)
- (bal) if IP_TOS is not found or broken don't try to compile in
packet_set_tos() function call. bug #527
-rw-r--r--ChangeLog6
-rw-r--r--packet.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ebde74795..2c241812a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120030402
2 - (bal) if IP_TOS is not found or broken don't try to compile in
3 packet_set_tos() function call. bug #527
4
120030401 520030401
2 - (djm) OpenBSD CVS Sync 6 - (djm) OpenBSD CVS Sync
3 - jmc@cvs.openbsd.org 2003/03/28 10:11:43 7 - jmc@cvs.openbsd.org 2003/03/28 10:11:43
@@ -1295,4 +1299,4 @@
1295 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1299 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1296 ok provos@ 1300 ok provos@
1297 1301
1298$Id: ChangeLog,v 1.2648 2003/04/01 11:47:16 djm Exp $ 1302$Id: ChangeLog,v 1.2649 2003/04/02 15:18:22 mouring Exp $
diff --git a/packet.c b/packet.c
index 3e21df722..254e452d0 100644
--- a/packet.c
+++ b/packet.c
@@ -1314,6 +1314,8 @@ packet_not_very_much_data_to_write(void)
1314 return buffer_len(&output) < 128 * 1024; 1314 return buffer_len(&output) < 128 * 1024;
1315} 1315}
1316 1316
1317
1318#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
1317static void 1319static void
1318packet_set_tos(int interactive) 1320packet_set_tos(int interactive)
1319{ 1321{
@@ -1327,6 +1329,7 @@ packet_set_tos(int interactive)
1327 error("setsockopt IP_TOS %d: %.100s:", 1329 error("setsockopt IP_TOS %d: %.100s:",
1328 tos, strerror(errno)); 1330 tos, strerror(errno));
1329} 1331}
1332#endif
1330 1333
1331/* Informs that the current session is interactive. Sets IP flags for that. */ 1334/* Informs that the current session is interactive. Sets IP flags for that. */
1332 1335