Changeset 1817 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.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_tcp.c (modified) (8 diffs)

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

@@ -104 +104 @@
     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 tcp_listener     *listener;
+     */
+
     pj_bool_t                is_registered;
     pj_bool_t                is_closing;
@@ -525 +531 @@
     tcp->sock = sock;
     tcp->is_server = is_server;
-    tcp->listener = listener;
+    /*tcp->listener = listener;*/
     pj_list_init(&tcp->delayed_list);
     tcp->base.pool = pool;
@@ -674 +680 @@
     /* Stop keep-alive timer. */
     if (tcp->ka_timer.id) {
-        pjsip_endpt_cancel_timer(tcp->listener->endpt, &tcp->ka_timer);
+        pjsip_endpt_cancel_timer(tcp->base.endpt, &tcp->ka_timer);
         tcp->ka_timer.id = PJ_FALSE;
     }
@@ -757 +763 @@
 
     /* Init rdata */
-    pool = pjsip_endpt_create_pool(tcp->listener->endpt,
+    pool = pjsip_endpt_create_pool(tcp->base.endpt,
                                    "rtd%p",
                                    PJSIP_POOL_RDATA_LEN,
@@ -1195 +1201 @@
     /* Stop keep-alive timer. */
     if (tcp->ka_timer.id) {
-        pjsip_endpt_cancel_timer(tcp->listener->endpt, &tcp->ka_timer);
+        pjsip_endpt_cancel_timer(tcp->base.endpt, &tcp->ka_timer);
         tcp->ka_timer.id = PJ_FALSE;
     }
@@ -1435 +1441 @@
     if (PJSIP_TCP_KEEP_ALIVE_INTERVAL) {
         pj_time_val delay = { PJSIP_TCP_KEEP_ALIVE_INTERVAL, 0 };
-        pjsip_endpt_schedule_timer(tcp->listener->endpt, &tcp->ka_timer, 
+        pjsip_endpt_schedule_timer(tcp->base.endpt, &tcp->ka_timer, 
                                    &delay);
         tcp->ka_timer.id = PJ_TRUE;
@@ -1463 +1469 @@
         delay.msec = 0;
 
-        pjsip_endpt_schedule_timer(tcp->listener->endpt, &tcp->ka_timer, 
+        pjsip_endpt_schedule_timer(tcp->base.endpt, &tcp->ka_timer, 
                                    &delay);
         tcp->ka_timer.id = PJ_TRUE;
@@ -1490 +1496 @@
     delay.msec = 0;
 
-    pjsip_endpt_schedule_timer(tcp->listener->endpt, &tcp->ka_timer, 
+    pjsip_endpt_schedule_timer(tcp->base.endpt, &tcp->ka_timer, 
                                &delay);
     tcp->ka_timer.id = PJ_TRUE;