Changeset 5513 for pjproject/branches/projects/uwp/pjnath/src/pjnath/ice_session.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjnath/src/pjnath/ice_session.c (modified) (7 diffs)

pjproject/branches/projects/uwp/pjnath/src/pjnath/ice_session.c

@@ -397 +397 @@
     /* Initialize transport datas */
     for (i=0; i<PJ_ARRAY_SIZE(ice->tp_data); ++i) {
-        ice->tp_data[i].transport_id = i;
+        ice->tp_data[i].transport_id = 0;
         ice->tp_data[i].has_req_data = PJ_FALSE;
     }
@@ -724 +724 @@
     pj_status_t status = PJ_SUCCESS;
     char address[PJ_INET6_ADDRSTRLEN];
+    unsigned i;
 
     PJ_ASSERT_RETURN(ice && comp_id && 
@@ -748 +749 @@
         rel_addr = base_addr;
     pj_memcpy(&lcand->rel_addr, rel_addr, addr_len);
+
+    /* Update transport data */
+    for (i = 0; i < PJ_ARRAY_SIZE(ice->tp_data); ++i) {
+        /* Check if this transport has been registered */
+        if (ice->tp_data[i].transport_id == transport_id)
+            break;
+
+        if (ice->tp_data[i].transport_id == 0) {
+            /* Found an empty slot, register this transport here */
+            ice->tp_data[i].transport_id = transport_id;
+            break;
+        }
+    }
+    pj_assert(i < PJ_ARRAY_SIZE(ice->tp_data) &&
+              ice->tp_data[i].transport_id == transport_id);
 
     pj_ansi_strcpy(ice->tmp.txt, pj_sockaddr_print(&lcand->addr, address,
@@ -1662 +1678 @@
             pj_ice_sess_cand *lcand = &ice->lcand[i];
             pj_ice_sess_cand *rcand = &ice->rcand[j];
-            pj_ice_sess_check *chk = &clist->checks[clist->count];
+            pj_ice_sess_check *chk = NULL;
 
             if (clist->count >= PJ_ICE_MAX_CHECKS) {
@@ -1668 +1684 @@
                 return PJ_ETOOMANY;
             } 
+
+           chk = &clist->checks[clist->count];
 
             /* A local candidate is paired with a remote candidate if
@@ -1875 +1893 @@
             status = perform_check(ice, clist, i, ice->is_nominating);
             if (status != PJ_SUCCESS) {
-                pj_grp_lock_release(ice->grp_lock);
-                pj_log_pop_indent();
-                return status;
+                check_set_state(ice, check, PJ_ICE_SESS_CHECK_STATE_FAILED,
+                                status);
+                on_check_complete(ice, check);
             }
 
@@ -1895 +1913 @@
                 status = perform_check(ice, clist, i, ice->is_nominating);
                 if (status != PJ_SUCCESS) {
-                    pj_grp_lock_release(ice->grp_lock);
-                    pj_log_pop_indent();
-                    return status;
+                    check_set_state(ice, check,
+                                    PJ_ICE_SESS_CHECK_STATE_FAILED, status);
+                    on_check_complete(ice, check);
                 }