Changeset 3128 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.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-ua/sip_reg.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -204 +204 @@
     info->auto_reg = regc->auto_reg;
     info->interval = regc->expires;
+    info->transport = regc->last_transport;
     
     if (regc->has_tsx)
@@ -1203 +1204 @@
         regc->current_op = REGC_REGISTERING;
 
+    /* Prevent deletion of tdata, e.g: when something wrong in sending,
+     * we need tdata to retrieve the transport.
+     */
+    pjsip_tx_data_add_ref(tdata);
+
     status = pjsip_endpt_send_request(regc->endpt, tdata, REGC_TSX_TIMEOUT,
                                       regc, &tsx_callback);
@@ -1209 +1215 @@
     }
 
+    /* Get last transport used and add reference to it */
+    if (tdata->tp_info.transport != regc->last_transport) {
+        if (regc->last_transport) {
+            pjsip_transport_dec_ref(regc->last_transport);
+            regc->last_transport = NULL;
+        }
+
+        if (tdata->tp_info.transport) {
+            regc->last_transport = tdata->tp_info.transport;
+            pjsip_transport_add_ref(regc->last_transport);
+        }
+    }
+
+    /* Release tdata */
+    pjsip_tx_data_dec_ref(tdata);
+
     pj_lock_release(regc->lock);