Changeset 1817 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls_ossl.c

Timestamp:

Feb 22, 2008 9:56:27 AM (16 years ago)

Author:

bennylp

Message:

Ticket #491: Crash in TCP/TLS transport when the listener is destroyed

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tls_ossl.c (modified) (10 diffs)

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

@@ -156 +156 @@
     pjsip_transport          base;
     pj_bool_t                is_server;
+
+    /* Do not save listener instance in the transport, because
+     * listener might be destroyed during transport's lifetime.
+     * See http://trac.pjsip.org/repos/ticket/491
     struct tls_listener     *listener;
+     */
+
+    /* TLS settings, copied from listener */
+    struct {
+        pj_time_val          timeout;
+    } setting;
+
     pj_bool_t                is_registered;
     pj_bool_t                is_closing;
@@ -591 +602 @@
             PJ_TODO(SUPPORT_SSL_ASYNCHRONOUS_CONNECT);
 
-            if (tls->listener->setting.timeout.sec == 0 &&
-                tls->listener->setting.timeout.msec == 0)
+            if (tls->setting.timeout.sec == 0 &&
+                tls->setting.timeout.msec == 0)
             {
                 p_timeout = NULL;
             } else {
-                timeout = tls->listener->setting.timeout;
+                timeout = tls->setting.timeout;
                 p_timeout = &timeout;
             }
@@ -723 +734 @@
             pj_assert(PJ_FD_COUNT(&rd_set) == 1 || PJ_FD_COUNT(&wr_set) == 1);
 
-            if (tls->listener->setting.timeout.sec == 0 &&
-                tls->listener->setting.timeout.msec == 0)
+            if (tls->setting.timeout.sec == 0 &&
+                tls->setting.timeout.msec == 0)
             {
                 p_timeout = NULL;
             } else {
-                timeout = tls->listener->setting.timeout;
+                timeout = tls->setting.timeout;
                 p_timeout = &timeout;
             }
@@ -1217 +1228 @@
     tls->sock = sock;
     tls->is_server = is_server;
-    tls->listener = listener;
+    /*tls->listener = listener;*/
     pj_list_init(&tls->delayed_list);
     tls->base.pool = pool;
+    tls->setting.timeout = listener->setting.timeout;
 
     pj_ansi_snprintf(tls->base.obj_name, PJ_MAX_OBJ_NAME, 
@@ -1404 +1416 @@
     /* Stop keep-alive timer. */
     if (tls->ka_timer.id) {
-        pjsip_endpt_cancel_timer(tls->listener->endpt, &tls->ka_timer);
+        pjsip_endpt_cancel_timer(tls->base.endpt, &tls->ka_timer);
         tls->ka_timer.id = PJ_FALSE;
     }
@@ -1492 +1504 @@
 
     /* Init rdata */
-    pool = pjsip_endpt_create_pool(tls->listener->endpt,
+    pool = pjsip_endpt_create_pool(tls->base.endpt,
                                    "rtd%p",
                                    PJSIP_POOL_RDATA_LEN,
@@ -1974 +1986 @@
         /* Stop keep-alive timer. */
         if (tls->ka_timer.id) {
-            pjsip_endpt_cancel_timer(tls->listener->endpt, &tls->ka_timer);
+            pjsip_endpt_cancel_timer(tls->base.endpt, &tls->ka_timer);
             tls->ka_timer.id = PJ_FALSE;
         }
@@ -2278 +2290 @@
     if (PJSIP_TLS_KEEP_ALIVE_INTERVAL) {
         pj_time_val delay = { PJSIP_TLS_KEEP_ALIVE_INTERVAL, 0 };
-        pjsip_endpt_schedule_timer(tls->listener->endpt, &tls->ka_timer, 
+        pjsip_endpt_schedule_timer(tls->base.endpt, &tls->ka_timer, 
                                    &delay);
         tls->ka_timer.id = PJ_TRUE;
@@ -2308 +2320 @@
         delay.msec = 0;
 
-        pjsip_endpt_schedule_timer(tls->listener->endpt, &tls->ka_timer, 
+        pjsip_endpt_schedule_timer(tls->base.endpt, &tls->ka_timer, 
                                    &delay);
         tls->ka_timer.id = PJ_TRUE;
@@ -2334 +2346 @@
     delay.msec = 0;
 
-    pjsip_endpt_schedule_timer(tls->listener->endpt, &tls->ka_timer, 
+    pjsip_endpt_schedule_timer(tls->base.endpt, &tls->ka_timer, 
                                &delay);
     tls->ka_timer.id = PJ_TRUE;