Changeset 5151

Timestamp:

Aug 7, 2015 5:44:40 AM (9 years ago)

Author:

ming

Message:

Fixed #1877: Race condition between stopping ICE and sending data in ICE stream transport

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (4 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -1150 +1150 @@
 {
     PJ_ASSERT_RETURN(ice_st, PJ_EINVAL);
+    
+    /* Protect with group lock, since this may cause race condition with
+     * pj_ice_strans_sendto().
+     * See ticket #1877.
+     */
+    pj_grp_lock_acquire(ice_st->grp_lock);
 
     if (ice_st->ice) {
@@ -1157 +1163 @@
 
     ice_st->state = PJ_ICE_STRANS_STATE_INIT;
+
+    pj_grp_lock_release(ice_st->grp_lock);
+
     return PJ_SUCCESS;
 }
@@ -1183 +1192 @@
     if (def_cand >= comp->cand_cnt)
         return PJ_EINVALIDOP;
+
+    /* Protect with group lock, since this may cause race condition with
+     * pj_ice_strans_stop_ice().
+     * See ticket #1877.
+     */
+    pj_grp_lock_acquire(ice_st->grp_lock);
 
     /* If ICE is available, send data with ICE, otherwise send with the
@@ -1191 +1206 @@
      */
     if (ice_st->ice && ice_st->state == PJ_ICE_STRANS_STATE_RUNNING) {
-        if (comp->turn_sock) {
-            pj_turn_sock_lock(comp->turn_sock);
-        }
         status = pj_ice_sess_send_data(ice_st->ice, comp_id, data, data_len);
-        if (comp->turn_sock) {
-            pj_turn_sock_unlock(comp->turn_sock);
-        }
+        
+        pj_grp_lock_release(ice_st->grp_lock);
+        
         return status;
-
-    } else if (comp->cand_list[def_cand].status == PJ_SUCCESS) {
+    } 
+    
+    pj_grp_lock_release(ice_st->grp_lock);
+    
+    if (comp->cand_list[def_cand].status == PJ_SUCCESS) {
 
         if (comp->cand_list[def_cand].type == PJ_ICE_CAND_TYPE_RELAYED) {