On 19/12/12 22:26, Gert Doering wrote: > Hi, > > On Mon, Dec 17, 2012 at 11:03:55PM +0100, Jeremie Le Hen wrote: >> I thereby kindly ask you to bring this patch in the source tree. I >> don't know about your release procedure, but it would be really nice if >> it could hit the tree before 2.3 is released. > > Thanks for the excessive links to documentation - it helps verifying > things. I agree that this is a useful last-minute correction and should > go in (feature-ACK). > > I don't particularily like the way your patch is coded, though, as it's > "all of them but Linux" that have "int" here (except Windows, which uses > DWORD, but the docs say "use QoS API instead") - too many #ifdefs. > > http://msdn.microsoft.com/en-us/library/windows/desktop/ms738586(v=vs.85).aspx > > so I'd propose to #ifdef it differently, patch appended. >
> From b6e0f27b4e6965de14cf0ec3e901a52d256cc88a Mon Sep 17 00:00:00 2001
> From: Gert Doering <g...@greenie.muc.de>
> Date: Wed, 19 Dec 2012 22:12:41 +0100
> Subject: [PATCH] Fix parameter type for IP_TOS setsockopt on non-Linux
> systems.
>
> Linux uses uint8_t, all BSD based stacks and Solaris use "int" (Windows
> documentation says "DWORD" and "do not use, use QoS API instead").
>
> Bug reported and fix provided by Torsten Vielhak and Jeremie Le Hen.
>
> Signed-off-by: Gert Doering <g...@greenie.muc.de>
> ---
> src/openvpn/socket.h | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
ACK. Applied to master and beta/2.3
commit d39f31d96378aa5eeade74670ffd9e08bf4c7234 (master)
commit a28048a20f46f718c3df3af95e230ab72234f915 (beta/2.3)
Author: Gert Doering <g...@greenie.muc.de>
List-Post: openvpn-devel@lists.sourceforge.net
Date: Wed Dec 19 22:12:41 2012 +0100
Fix parameter type for IP_TOS setsockopt on non-Linux systems.
Signed-off-by: Gert Doering <g...@greenie.muc.de>
Acked-by: David Sommerseth <dav...@redhat.com>
Message-Id: 20121219212619.gn22...@greenie.muc.de
URL: http://article.gmane.org/gmane.network.openvpn.devel/7207
Signed-off-by: David Sommerseth <dav...@redhat.com>
--
kind regards,
David Sommerseth
signature.asc
Description: OpenPGP digital signature
