Changeset 3478

Timestamp:

Mar 23, 2011 6:08:36 AM (14 years ago)

Author:

ming

Message:

Fixed #1221: Crash when SIP transport tried to write to a broken pipe.

Location:

pjproject/trunk

Files:

• pjlib/include/pj/sock.h (modified) (3 diffs)
• pjlib/src/pj/sock_bsd.c (modified) (1 diff)
• pjlib/src/pj/sock_common.c (modified) (1 diff)
• pjlib/src/pj/sock_symbian.cpp (modified) (1 diff)
• pjsip-apps/src/pjsua/main.c (modified) (2 diffs)
• 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/include/pj/sock.h

@@ -298 +298 @@
 extern const pj_uint16_t PJ_SO_REUSEADDR;
 
+/** Do not generate SIGPIPE. @see pj_SO_NOSIGPIPE */
+extern const pj_uint16_t PJ_SO_NOSIGPIPE;
+
 /** Set the protocol-defined priority for all packets to be sent on socket.
  */
@@ -334 +337 @@
     PJ_DECL(pj_uint16_t) pj_SO_REUSEADDR(void);
 
+    /** Get #PJ_SO_NOSIGPIPE constant */
+    PJ_DECL(pj_uint16_t) pj_SO_NOSIGPIPE(void);
+
     /** Get #PJ_SO_PRIORITY constant */
     PJ_DECL(pj_uint16_t) pj_SO_PRIORITY(void);
@@ -366 +372 @@
     /** Get #PJ_SO_REUSEADDR constant */
 #   define pj_SO_REUSEADDR() PJ_SO_REUSEADDR
+
+    /** Get #PJ_SO_NOSIGPIPE constant */
+#   define pj_SO_NOSIGPIPE() PJ_SO_NOSIGPIPE
 
     /** Get #PJ_SO_PRIORITY constant */

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

@@ -136 +136 @@
 const pj_uint16_t PJ_TCP_NODELAY= TCP_NODELAY;
 const pj_uint16_t PJ_SO_REUSEADDR= SO_REUSEADDR;
+#ifdef SO_NOSIGPIPE
+const pj_uint16_t PJ_SO_NOSIGPIPE = SO_NOSIGPIPE;
+#else
+const pj_uint16_t PJ_SO_NOSIGPIPE = 0xFFFF;
+#endif
 #if defined(SO_PRIORITY)
 const pj_uint16_t PJ_SO_PRIORITY = SO_PRIORITY;

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

@@ -1138 +1138 @@
 }
 
+PJ_DEF(pj_uint16_t) pj_SO_NOSIGPIPE(void)
+{
+    return PJ_SO_NOSIGPIPE;
+}
+
 PJ_DEF(pj_uint16_t) pj_SO_PRIORITY(void)
 {

pjproject/trunk/pjlib/src/pj/sock_symbian.cpp

@@ -54 +54 @@
 const pj_uint16_t PJ_SOL_UDP    = 0xFFFF;
 const pj_uint16_t PJ_SOL_IPV6   = 0xFFFF;
+const pj_uint16_t PJ_SO_NOSIGPIPE = 0xFFFF;
 
 /* TOS */

pjproject/trunk/pjsip-apps/src/pjsua/main.c

@@ -67 +67 @@
 }
 
+static void setup_socket_signal()
+{
+}
+
 #else
+#include <signal.h>
 
 static void setup_signal_handler(void)
 {
+}
+
+static void setup_socket_signal()
+{
+    signal(SIGPIPE, SIG_IGN);
 }
 
@@ -77 +87 @@
 int main(int argc, char *argv[])
 {
+    setup_socket_signal();
+
     do {
         app_restart = PJ_FALSE;

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;
     
@@ -632 +633 @@
     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 +618 @@
     pj_strdup(tls->base.pool, &tls->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. */
     *p_tls = tls;

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;
     
@@ -1332 +1333 @@
     tls->ka_timer.user_data = (void*) tls;
     tls->ka_timer.cb = &tls_keep_alive_timer;
+
+    /* Prevent SIGPIPE */
+    pj_sock_setsockopt(tcp->sock, pj_SOL_SOCKET(), pj_SO_NOSIGPIPE(),
+                       &val, sizeof(val));