From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 9 Jan 2013 00:12:02 +0000 (-0700)
Subject: Bug 3731: TOS setsockopt() requires int value
X-Git-Tag: SQUID_3_3_0_3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e1e6bf3bfaf0dc269323a011abdc8e3c206d324;p=thirdparty%2Fsquid.git

Bug 3731: TOS setsockopt() requires int value

FreeBSD is confirmed errors on 8-bit variable size. Other BSD are
documented in a way that implies they do as well, although not at this
stage confirmed to be failing.

Linux seems to be the only confirmed system working with 8-bit size sent
to setsockopt(). So we revert this to 'int' (32-bit or 64-bit) as was
working in Squid 3.1.
---

diff --git a/src/ip/Qos.cci b/src/ip/Qos.cci
index 7551e66e20..97a5918a40 100644
--- a/src/ip/Qos.cci
+++ b/src/ip/Qos.cci
@@ -5,8 +5,13 @@
 int
 Ip::Qos::setSockTos(const Comm::ConnectionPointer &conn, tos_t tos)
 {
-#ifdef IP_TOS
-    int x = setsockopt(conn->fd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos_t));
+#if defined(IP_TOS)
+    // Bug 3731: FreeBSD produces 'invalid option'
+    // unless we pass it a 32-bit variable storing 8-bits of data.
+    // NP: it is documented as 'int' for all systems, even those like Linux which accept 8-bit char
+    //     so we convert to a int before setting.
+    int bTos = tos;
+    int x = setsockopt(conn->fd, IPPROTO_IP, IP_TOS, &bTos, sizeof(bTos));
     if (x < 0)
         debugs(50, 2, "Ip::Qos::setSockTos: setsockopt(IP_TOS) on " << conn << ": " << xstrerror());
     return x;