merge 5.9p1

1 files changed, 28 insertions, 16 deletions

diff --git a/packet.c b/packet.c
index b4e01f716..ba9341731 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.172 2010/11/13 23:27:50 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.173 2011/05/06 21:14:05 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -422,10 +422,8 @@ packet_set_state(int mode, u_int32_t seqnr, u_int64_t blocks, u_int32_t packets,
         state->bytes = bytes;
 }
 
-/* returns 1 if connection is via ipv4 */
-
-int
-packet_connection_is_ipv4(void)
+static int
+packet_connection_af(void)
 {
         struct sockaddr_storage to;
         socklen_t tolen = sizeof(to);
@@ -439,9 +437,9 @@ packet_connection_is_ipv4(void)
 #ifdef IPV4_IN_IPV6
         if (to.ss_family == AF_INET6 &&
             IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&to)->sin6_addr))
-                return 1;
+                return AF_INET;
 #endif
-        return 0;
+        return to.ss_family;
 }
 
 /* Sets the connection into non-blocking mode. */
@@ -1752,16 +1750,30 @@ packet_not_very_much_data_to_write(void)
 static void
 packet_set_tos(int tos)
 {
-#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
-        if (!packet_connection_is_on_socket() ||
-            !packet_connection_is_ipv4())
+#ifndef IP_TOS_IS_BROKEN
+        if (!packet_connection_is_on_socket())
                 return;
-        debug3("%s: set IP_TOS 0x%02x", __func__, tos);
-        if (setsockopt(active_state->connection_in, IPPROTO_IP, IP_TOS, &tos,
-            sizeof(tos)) < 0)
-                error("setsockopt IP_TOS %d: %.100s:",
-                    tos, strerror(errno));
-#endif
+        switch (packet_connection_af()) {
+# ifdef IP_TOS
+        case AF_INET:
+                debug3("%s: set IP_TOS 0x%02x", __func__, tos);
+                if (setsockopt(active_state->connection_in,
+                    IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0)
+                        error("setsockopt IP_TOS %d: %.100s:",
+                            tos, strerror(errno));
+                break;
+# endif /* IP_TOS */
+# ifdef IPV6_TCLASS
+        case AF_INET6:
+                debug3("%s: set IPV6_TCLASS 0x%02x", __func__, tos);
+                if (setsockopt(active_state->connection_in,
+                    IPPROTO_IPV6, IPV6_TCLASS, &tos, sizeof(tos)) < 0)
+                        error("setsockopt IPV6_TCLASS %d: %.100s:",
+                            tos, strerror(errno));
+                break;
+# endif /* IPV6_TCLASS */
+        }
+#endif /* IP_TOS_IS_BROKEN */
 }
 
 /* Informs that the current session is interactive.  Sets IP flags for that. */