Changeset 3128 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

Timestamp:

Mar 30, 2010 11:13:59 AM (14 years ago)

Author:

nanang

Message:

Ticket #1044:

• Added initial version of automatic re-registration after registration failure and automatic call disconnection after re-registration attempt fails.
• Published auto re-registration setting to pjsua app.
• Updated pjsip_regc_send() to retrieve the transport earlier (was only in tsx_callback()).
• Fixed TCP and TLS transport to prevent transport deletion in transport disconnection callback.
• Fixed wrong keep-alive settings used by TLS transport (was using TCP keep-alive settings).

File:

• pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c (modified) (2 diffs)

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

@@ -178 +178 @@
         return;
 
+    /* Prevent immediate transport destroy by application, as transport
+     * state notification callback may be stacked and transport instance
+     * must remain valid at any point in the callback.
+     */
+    pjsip_transport_add_ref(&tcp->base);
+
     /* Notify application of transport disconnected state */
     state_cb = pjsip_tpmgr_get_status_cb(tcp->base.tpmgr);
@@ -194 +200 @@
      */
     pjsip_transport_shutdown(&tcp->base);
+
+    /* Now, it is ok to destroy the transport. */
+    pjsip_transport_dec_ref(&tcp->base);
 }