Changeset 3480

Timestamp:

Mar 23, 2011 10:23:31 AM (14 years ago)

Author:

ming

Message:

Re #1221: Move setting the socket option to pjlib level (sock_bsd) instead of in the SIP transport.

Location:

pjproject/trunk

Files:

• pjlib/src/pj/sock_bsd.c (modified) (1 diff)
• pjsip/src/pjsip/sip_transport_tcp.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transport_tls.c (modified) (2 diffs)
• pjsip/src/pjsip/sip_transport_tls_ossl.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/sock_bsd.c

@@ -550 +550 @@
         return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
     else {
+        pj_int32_t val = 1;
+        if (type == pj_SOCK_STREAM()) {
+            pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_NOSIGPIPE(),
+                               &val, sizeof(val));
+        }
 #if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
     PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
-        pj_int32_t val = 1;
         if (type == pj_SOCK_DGRAM()) {
             pj_sock_setsockopt(*sock, pj_SOL_SOCKET(), SO_NOSIGPIPE, 

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -545 +545 @@
     pj_activesock_cb tcp_callback;
     const pj_str_t ka_pkt = PJSIP_TCP_KEEP_ALIVE_DATA;
-    pj_int32_t val = 1;
     pj_status_t status;
     
@@ -633 +632 @@
     pj_ioqueue_op_key_init(&tcp->ka_op_key.key, sizeof(pj_ioqueue_op_key_t));
     pj_strdup(tcp->base.pool, &tcp->ka_pkt, &ka_pkt);
-    
-    /* Prevent SIGPIPE */
-    pj_sock_setsockopt(tcp->sock, pj_SOL_SOCKET(), pj_SO_NOSIGPIPE(),
-                       &val, sizeof(val));
 
     /* Done setting up basic transport. */

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -528 +528 @@
     struct tls_transport *tls;
     const pj_str_t ka_pkt = PJSIP_TLS_KEEP_ALIVE_DATA;
-    pj_int32_t val = 1;
     pj_status_t status;
     
@@ -617 +616 @@
     pj_ioqueue_op_key_init(&tls->ka_op_key.key, sizeof(pj_ioqueue_op_key_t));
     pj_strdup(tls->base.pool, &tls->ka_pkt, &ka_pkt);
-
-    /* Prevent SIGPIPE */
-    pj_sock_setsockopt(tls->sock, pj_SOL_SOCKET(), pj_SO_NOSIGPIPE(),
-                       &val, sizeof(val));
     
     /* Done setting up basic transport. */

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls_ossl.c

@@ -1230 +1230 @@
     pj_ioqueue_callback tls_callback;
     int rc;
-    pj_int32_t val = 1;
     pj_status_t status;
     
@@ -1333 +1332 @@
     tls->ka_timer.user_data = (void*) tls;
     tls->ka_timer.cb = &tls_keep_alive_timer;
-
-    /* Prevent SIGPIPE */
-    pj_sock_setsockopt(tls->sock, pj_SOL_SOCKET(), pj_SO_NOSIGPIPE(),
-                       &val, sizeof(val));