Changeset 3128 for pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.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_tls.c (modified) (8 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -185 +185 @@
         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(&tls->base);
+
     /* Notify application of transport disconnected state */
     state_cb = pjsip_tpmgr_get_status_cb(tls->base.tpmgr);
@@ -201 +207 @@
      */
     pjsip_transport_shutdown(&tls->base);
+
+    /* Now, it is ok to destroy the transport. */
+    pjsip_transport_dec_ref(&tls->base);
 }
 
@@ -518 +527 @@
 {
     struct tls_transport *tls;
-    const pj_str_t ka_pkt = PJSIP_TCP_KEEP_ALIVE_DATA;
+    const pj_str_t ka_pkt = PJSIP_TLS_KEEP_ALIVE_DATA;
     pj_status_t status;
     
@@ -579 +588 @@
     sockaddr_to_host_port(pool, &tls->base.local_name, 
                           (pj_sockaddr_in*)&tls->base.local_addr);
-    sockaddr_to_host_port(pool, &tls->base.remote_name, remote);
+    if (tls->remote_name.slen) {
+        tls->base.remote_name.host = tls->remote_name;
+        tls->base.remote_name.port = pj_sockaddr_in_get_port(remote);
+    } else {
+        sockaddr_to_host_port(pool, &tls->base.remote_name, remote);
+    }
 
     tls->base.endpt = listener->endpt;
@@ -1076 +1090 @@
     } else {
         /* Start keep-alive timer */
-        if (PJSIP_TCP_KEEP_ALIVE_INTERVAL) {
-            pj_time_val delay = {PJSIP_TCP_KEEP_ALIVE_INTERVAL, 0};
+        if (PJSIP_TLS_KEEP_ALIVE_INTERVAL) {
+            pj_time_val delay = {PJSIP_TLS_KEEP_ALIVE_INTERVAL, 0};
             pjsip_endpt_schedule_timer(listener->endpt, 
                                        &tls->ka_timer, 
@@ -1508 +1522 @@
 
     /* Start keep-alive timer */
-    if (PJSIP_TCP_KEEP_ALIVE_INTERVAL) {
-        pj_time_val delay = { PJSIP_TCP_KEEP_ALIVE_INTERVAL, 0 };
+    if (PJSIP_TLS_KEEP_ALIVE_INTERVAL) {
+        pj_time_val delay = { PJSIP_TLS_KEEP_ALIVE_INTERVAL, 0 };
         pjsip_endpt_schedule_timer(tls->base.endpt, &tls->ka_timer, 
                                    &delay);
@@ -1541 +1555 @@
     PJ_TIME_VAL_SUB(now, tls->last_activity);
 
-    if (now.sec > 0 && now.sec < PJSIP_TCP_KEEP_ALIVE_INTERVAL) {
+    if (now.sec > 0 && now.sec < PJSIP_TLS_KEEP_ALIVE_INTERVAL) {
         /* There has been activity, so don't send keep-alive */
-        delay.sec = PJSIP_TCP_KEEP_ALIVE_INTERVAL - now.sec;
+        delay.sec = PJSIP_TLS_KEEP_ALIVE_INTERVAL - now.sec;
         delay.msec = 0;
 
@@ -1571 +1585 @@
 
     /* Register next keep-alive */
-    delay.sec = PJSIP_TCP_KEEP_ALIVE_INTERVAL;
+    delay.sec = PJSIP_TLS_KEEP_ALIVE_INTERVAL;
     delay.msec = 0;