From 02dba30b6c6c5b420d25f629024736ebbca0755f Mon Sep 17 00:00:00 2001
From: Benny Prijono <bennylp@teluu.com>
Date: Thu, 15 Oct 2009 03:48:20 +0000
Subject: Ticket #972: setsockopt compatibility problems on Windows (thanks
 Yann and John Ridges for the reports)  - set PJ_SOL_IP, PJ_SOL_TCP, and
 PJ_SOL_UDP to IPPROTO_IP, IPPROTO_TCP, and IPPROTO_UDP respectively on
 Windows  - also added PJ_TCP_NODELAY and PJ_SO_REUSEADDR

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2946 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjlib/src/pj/sock_bsd.c       | 18 ++++++++++++++++--
 pjlib/src/pj/sock_common.c    | 10 ++++++++++
 pjlib/src/pj/sock_symbian.cpp |  6 +++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'pjlib/src/pj')

diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c
index b5a30fad..eabd2bb2 100644
--- a/pjlib/src/pj/sock_bsd.c
+++ b/pjlib/src/pj/sock_bsd.c
@@ -60,26 +60,37 @@ const pj_uint16_t PJ_SOCK_RDM	= SOCK_RDM;
 const pj_uint16_t PJ_SOL_SOCKET	= SOL_SOCKET;
 #ifdef SOL_IP
 const pj_uint16_t PJ_SOL_IP	= SOL_IP;
+#elif defined(PJ_WIN32) && PJ_WIN32
+const pj_uint16_t PJ_SOL_IP	= IPPROTO_IP;
 #else
 const pj_uint16_t PJ_SOL_IP	= 0xFFFF;
 #endif /* SOL_IP */
+
 #if defined(SOL_TCP)
 const pj_uint16_t PJ_SOL_TCP	= SOL_TCP;
 #elif defined(IPPROTO_TCP)
 const pj_uint16_t PJ_SOL_TCP	= IPPROTO_TCP;
+#elif defined(PJ_WIN32) && PJ_WIN32
+const pj_uint16_t PJ_SOL_TCP	= IPPROTO_TCP;
 #else
 const pj_uint16_t PJ_SOL_TCP	= 0xFFFF;
 #endif /* SOL_TCP */
+
 #ifdef SOL_UDP
 const pj_uint16_t PJ_SOL_UDP	= SOL_UDP;
+#elif defined(PJ_WIN32) && PJ_WIN32
+const pj_uint16_t PJ_SOL_UDP	= IPPROTO_UDP;
 #else
 const pj_uint16_t PJ_SOL_UDP	= 0xFFFF;
-#endif
+#endif /* SOL_UDP */
+
 #ifdef SOL_IPV6
 const pj_uint16_t PJ_SOL_IPV6	= SOL_IPV6;
+#elif defined(PJ_WIN32) && PJ_WIN32
+const pj_uint16_t PJ_SOL_IPV6	= IPPROTO_IPV6;
 #else
 const pj_uint16_t PJ_SOL_IPV6	= 0xFFFF;
-#endif
+#endif /* SOL_IPV6 */
 
 /* IP_TOS */
 #ifdef IP_TOS
@@ -116,6 +127,9 @@ const pj_uint16_t PJ_IPTOS_MINCOST	= 0x02;
 const pj_uint16_t PJ_SO_TYPE    = SO_TYPE;
 const pj_uint16_t PJ_SO_RCVBUF  = SO_RCVBUF;
 const pj_uint16_t PJ_SO_SNDBUF  = SO_SNDBUF;
+const pj_uint16_t PJ_TCP_NODELAY= TCP_NODELAY;
+const pj_uint16_t PJ_SO_REUSEADDR= SO_REUSEADDR;
+
 /* Multicasting is not supported e.g. in PocketPC 2003 SDK */
 #ifdef IP_MULTICAST_IF
 const pj_uint16_t PJ_IP_MULTICAST_IF    = IP_MULTICAST_IF;
diff --git a/pjlib/src/pj/sock_common.c b/pjlib/src/pj/sock_common.c
index 48435196..0e098c48 100644
--- a/pjlib/src/pj/sock_common.c
+++ b/pjlib/src/pj/sock_common.c
@@ -1062,6 +1062,16 @@ PJ_DEF(pj_uint16_t) pj_SO_SNDBUF(void)
     return PJ_SO_SNDBUF;
 }
 
+PJ_DEF(pj_uint16_t) pj_TCP_NODELAY(void)
+{
+    return PJ_TCP_NODELAY;
+}
+
+PJ_DEF(pj_uint16_t) pj_SO_REUSEADDR(void)
+{
+    return PJ_SO_REUSEADDR;
+}
+
 PJ_DEF(pj_uint16_t) pj_IP_MULTICAST_IF(void)
 {
     return PJ_IP_MULTICAST_IF;
diff --git a/pjlib/src/pj/sock_symbian.cpp b/pjlib/src/pj/sock_symbian.cpp
index 60621724..138ee867 100644
--- a/pjlib/src/pj/sock_symbian.cpp
+++ b/pjlib/src/pj/sock_symbian.cpp
@@ -47,7 +47,7 @@ const pj_uint16_t PJ_SOCK_DGRAM	= KSockDatagram;
 const pj_uint16_t PJ_SOCK_RAW	= 0xFFFF;
 const pj_uint16_t PJ_SOCK_RDM	= 0xFFFF;
 
-/* setsockop() is not really supported. */
+/* we don't support setsockopt(), these are just dummy values */
 const pj_uint16_t PJ_SOL_SOCKET	= 0xFFFF;
 const pj_uint16_t PJ_SOL_IP	= 0xFFFF;
 const pj_uint16_t PJ_SOL_TCP	= 0xFFFF;
@@ -61,6 +61,10 @@ const pj_uint16_t PJ_IPTOS_THROUGHPUT	= 0;
 const pj_uint16_t PJ_IPTOS_RELIABILITY	= 0;
 const pj_uint16_t PJ_IPTOS_MINCOST	= 0;
 
+/* Misc */
+const pj_uint16_t PJ_TCP_NODELAY = 0xFFFF;
+const pj_uint16_t PJ_SO_REUSEADDR = 0xFFFF;
+
 /* ioctl() is also not supported. */
 const pj_uint16_t PJ_SO_TYPE    = 0xFFFF;
 const pj_uint16_t PJ_SO_RCVBUF  = 0xFFFF;
-- 
cgit v1.2.3