Changeset 1476 for pjproject

Timestamp:

Oct 5, 2007 6:41:04 AM (17 years ago)

Author:

bennylp

Message:

Related to ticket #95: bug in TLS transport: keep-alive timer is not cancelled when transport is destroyed

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_transport_tcp.c (modified) (1 diff)
• sip_transport_tls_ossl.c (modified) (2 diffs)

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

@@ -663 +663 @@
     /* Mark transport as closing */
     tcp->is_closing = PJ_TRUE;
+
+    /* Stop keep-alive timer. */
+    if (tcp->ka_timer.id) {
+        pjsip_endpt_cancel_timer(tcp->listener->endpt, &tcp->ka_timer);
+        tcp->ka_timer.id = PJ_FALSE;
+    }
 
     /* Cancel all delayed transmits */

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

@@ -1398 +1398 @@
     ++tls->is_closing;
 
+    /* Stop keep-alive timer. */
+    if (tls->ka_timer.id) {
+        pjsip_endpt_cancel_timer(tls->listener->endpt, &tls->ka_timer);
+        tls->ka_timer.id = PJ_FALSE;
+    }
+
     /* Cancel all delayed transmits */
     while (!pj_list_empty(&tls->delayed_list)) {
@@ -1958 +1964 @@
         SSL_shutdown(tls->ssl);
         tls->ssl_shutdown_called = PJ_TRUE;
+
+        /* Stop keep-alive timer. */
+        if (tls->ka_timer.id) {
+            pjsip_endpt_cancel_timer(tls->listener->endpt, &tls->ka_timer);
+            tls->ka_timer.id = PJ_FALSE;
+        }
 
         PJ_LOG(4,(transport->obj_name, "TLS transport shutdown"));