Changeset 3060

Timestamp:

Jan 14, 2010 9:05:08 AM (15 years ago)

Author:

bennylp

Message:

Misc (#1026): remove the code that silently set SO_SNDBUF/SO_RCVBUF as it's not that useful and it would print error message on many platforms that don't support it, causing many questions from users

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -51 +51 @@
  * More experiments are needed probably.
  */
+/* 2010/01/14
+ *  Too many people complained about seeing "Error setting SNDBUF" log,
+ *  so lets just remove this. People who want to have SNDBUF set can
+ *  still do so by declaring these two macros in config_site.h
+ */
 #ifndef PJSIP_UDP_SO_SNDBUF_SIZE
-#   define PJSIP_UDP_SO_SNDBUF_SIZE     (24*1024*1024)
+/*#   define PJSIP_UDP_SO_SNDBUF_SIZE   (24*1024*1024)*/
+#   define PJSIP_UDP_SO_SNDBUF_SIZE     0
 #endif
 
 #ifndef PJSIP_UDP_SO_RCVBUF_SIZE
-#   define PJSIP_UDP_SO_RCVBUF_SIZE     (24*1024*1024)
+/*#   define PJSIP_UDP_SO_RCVBUF_SIZE   (24*1024*1024)*/
+#   define PJSIP_UDP_SO_RCVBUF_SIZE     0
 #endif
 
@@ -551 +558 @@
                            const pjsip_host_port *a_name)
 {
+#if PJSIP_UDP_SO_RCVBUF_SIZE || PJSIP_UDP_SO_SNDBUF_SIZE
     long sobuf_size;
     pj_status_t status;
+#endif
 
     /* Adjust socket rcvbuf size */
+#if PJSIP_UDP_SO_RCVBUF_SIZE
     sobuf_size = PJSIP_UDP_SO_RCVBUF_SIZE;
     status = pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_RCVBUF(),
@@ -564 +574 @@
                   status));
     }
+#endif
 
     /* Adjust socket sndbuf size */
+#if PJSIP_UDP_SO_SNDBUF_SIZE
     sobuf_size = PJSIP_UDP_SO_SNDBUF_SIZE;
     status = pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_SNDBUF(),
@@ -575 +587 @@
                   status));
     }
+#endif
 
     /* Set the socket. */