Changeset 5911

Timestamp:

Nov 21, 2018 10:08:04 AM (6 years ago)

Author:

riza

Message:

Close #2162: If transport restart fail, don't proceed with updating contact on IP change process.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsip/sip_transport_udp.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_core.c (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -312 +312 @@
 
     pj_bool_t                is_restarting;
+    pj_status_t              restart_status;
 } pjsua_transport_data;
 

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -1149 +1149 @@
     pj_status_t status;
     char addr[PJ_INET6_ADDRSTRLEN+10];
+    int i;
 
     PJ_ASSERT_RETURN(transport != NULL, PJ_EINVAL);
@@ -1236 +1237 @@
     }
 
+    /* Re-init op_key. */
+    for (i = 0; i < tp->rdata_cnt; ++i) {
+        pj_ioqueue_op_key_init(&tp->rdata[i]->tp_info.op_key.op_key,
+                               sizeof(pj_ioqueue_op_key_t));
+    }
+
     /* Restart async read operation. */
     status = start_async_read(tp);

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -3566 +3566 @@
             continue;
 
-        if (acc->regc) {                    
+        if (acc->regc) {
+            int j = 0;
+            pj_status_t found_restart_tp_fail = PJ_FALSE;
+
             pjsip_regc_get_info(acc->regc, &regc_info);
+            
+            /* Check if transport restart listener succeed. */
+            for (; j < PJ_ARRAY_SIZE(pjsua_var.tpdata); ++j) {
+                if (pjsua_var.tpdata[j].data.ptr != NULL && 
+                  pjsua_var.tpdata[j].restart_status != PJ_SUCCESS &&
+                  pjsua_var.tpdata[j].type == regc_info.transport->key.type)
+                {
+                    if ((pjsua_var.tpdata[j].data.factory
+                                           == regc_info.transport->factory) ||
+                        (pjsua_var.tpdata[j].data.tp
+                                               == regc_info.transport)) 
+                    {
+                        found_restart_tp_fail = PJ_TRUE;
+                        break;
+                    }
+                }
+            }
+
+            if (found_restart_tp_fail) {
+                if (acc->ka_timer.id) {
+                    pjsip_endpt_cancel_timer(pjsua_var.endpt, &acc->ka_timer);
+                    acc->ka_timer.id = PJ_FALSE;
+
+                    if (acc->ka_transport) {
+                        pjsip_transport_dec_ref(acc->ka_transport);
+                        acc->ka_transport = NULL;
+                    }
+                }
+                    
+                continue;
+            }
+
             if ((regc_info.transport) &&
                 ((regc_info.transport->flag & PJSIP_TRANSPORT_DATAGRAM) == 0))
@@ -3730 +3765 @@
         pj_bool_t all_done = PJ_TRUE;
 
-        pjsua_var.tpdata[id].is_restarting = PJ_FALSE;  
+        pjsua_var.tpdata[id].is_restarting = PJ_FALSE;
+        pjsua_var.tpdata[id].restart_status = status;
         if (pjsua_var.ua_cfg.cb.on_ip_change_progress) {
             pjsua_ip_change_op_info info;
@@ -3782 +3818 @@
             if (pjsua_var.tpdata[i].data.ptr != NULL) {
                 pjsua_var.tpdata[i].is_restarting = PJ_TRUE;
+                pjsua_var.tpdata[i].restart_status = PJ_EUNKNOWN;
             }
         }
@@ -3791 +3828 @@
         PJSUA_UNLOCK();
     } else {
+        for (i = 0; i < PJ_ARRAY_SIZE(pjsua_var.tpdata); ++i) {
+            if (pjsua_var.tpdata[i].data.ptr != NULL) {
+                pjsua_var.tpdata[i].restart_status = PJ_SUCCESS;
+            }
+        }
         status = handle_ip_change_on_acc();
     }