Changeset 3999 for pjproject/trunk/pjnath/src/pjnath/ice_session.c

Timestamp:

Mar 30, 2012 7:10:13 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)

Location:

pjproject/trunk

Files:

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

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -2855 +2855 @@
     pj_ice_sess_comp *comp;
     pj_ice_sess_cand *cand;
+    pj_uint8_t transport_id;
+    pj_sockaddr addr;
 
     PJ_ASSERT_RETURN(ice && comp_id, PJ_EINVAL);
@@ -2870 +2872 @@
     if (comp == NULL) {
         status = PJNATH_EICEINCOMPID;
+        pj_mutex_unlock(ice->mutex);
         goto on_return;
     }
@@ -2875 +2878 @@
     if (comp->valid_check == NULL) {
         status = PJNATH_EICEINPROGRESS;
+        pj_mutex_unlock(ice->mutex);
         goto on_return;
     }
 
     cand = comp->valid_check->lcand;
-    status = (*ice->cb.on_tx_pkt)(ice, comp_id, cand->transport_id, 
+    transport_id = cand->transport_id;
+    pj_sockaddr_cp(&addr, &comp->valid_check->rcand->addr);
+
+    /* Release the mutex now to avoid deadlock (see ticket #1451). */
+    pj_mutex_unlock(ice->mutex);
+
+    status = (*ice->cb.on_tx_pkt)(ice, comp_id, transport_id, 
                                   data, data_len, 
-                                  &comp->valid_check->rcand->addr, 
+                                  &addr, 
                                   sizeof(pj_sockaddr_in));
 
 on_return:
-    pj_mutex_unlock(ice->mutex);
     return status;
 }