From a28048a20f46f718c3df3af95e230ab72234f915 Mon Sep 17 00:00:00 2001 From: Gert Doering Date: Wed, 19 Dec 2012 22:12:41 +0100 Subject: 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 Acked-by: David Sommerseth Message-Id: 20121219212619.GN22465@greenie.muc.de URL: http://article.gmane.org/gmane.network.openvpn.devel/7207 Signed-off-by: David Sommerseth (cherry picked from commit d39f31d96378aa5eeade74670ffd9e08bf4c7234) --- src/openvpn/socket.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index 9cb01fa..4e7e7f8 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -237,7 +237,11 @@ struct link_socket #if PASSTOS_CAPABILITY /* used to get/set TOS. */ +#if defined(TARGET_LINUX) uint8_t ptos; +#else /* all the BSDs, Solaris, MacOS use plain "int" -> see "man ip" there */ + int ptos; +#endif bool ptos_defined; #endif -- cgit