FS-5223 and FS-6603, don't trust docs... sheesh

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 4d1fcfb511de6311af6140703603ffcdcc47cad6..60fffd18f962902dc9edc6e32e5d6b85d8e25a7c 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue Jun 17 21:14:36 CDT 2014
+date

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su.c b/libs/sofia-sip/libsofia-sip-ua/su/su.c
index 41b08afc8dadec33a0c754bcc58ac2080504d19d..b2de1b3e8fd4b17986d573afd65c62eb9a189a7f 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/su/su.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su.c
@@ -351,12 +351,14 @@ int su_getsocktype(su_socket_t s)
 int su_setreuseaddr(su_socket_t s, int reuse)
 {
 #ifdef SO_REUSEPORT
-  return setsockopt(s, SOL_SOCKET, SO_REUSEPORT,
-                   (void *)&reuse, (socklen_t)sizeof(reuse));
-#else 
-  return setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
-                   (void *)&reuse, (socklen_t)sizeof(reuse));
+       if (setsockopt(s, SOL_SOCKET, SO_REUSEPORT,
+                                  (void *)&reuse, (socklen_t)sizeof(reuse)) < 0)
+               return -1;
 #endif
+       if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                                  (void *)&reuse, (socklen_t)sizeof(reuse)) < 0)
+               return -1;
+       return 0;
 }