Changeset 2419 for pjproject/trunk

Timestamp:

Jan 12, 2009 10:06:04 AM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #689: Deadlock caused by ICE media transport (thanks Alain Totouom for the report)

File:

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

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

@@ -2458 +2458 @@
     pj_ice_msg_data *msg_data = NULL;
     unsigned i;
-    pj_status_t stun_status;
 
     PJ_ASSERT_RETURN(ice, PJ_EINVAL);
@@ -2466 +2465 @@
     comp = find_comp(ice, comp_id);
     if (comp == NULL) {
-        status = PJNATH_EICEINCOMPID;
-        goto on_return;
+        pj_mutex_unlock(ice->mutex);
+        return PJNATH_EICEINCOMPID;
     }
 
@@ -2479 +2478 @@
     if (msg_data == NULL) {
         pj_assert(!"Invalid transport ID");
-        status = PJ_EINVAL;
-        goto on_return;
-    }
-
-    stun_status = pj_stun_msg_check((const pj_uint8_t*)pkt, pkt_size, 
-                                    PJ_STUN_IS_DATAGRAM);
-    if (stun_status == PJ_SUCCESS) {
+        pj_mutex_unlock(ice->mutex);
+        return PJ_EINVAL;
+    }
+
+    status = pj_stun_msg_check((const pj_uint8_t*)pkt, pkt_size, 
+                               PJ_STUN_IS_DATAGRAM);
+    if (status == PJ_SUCCESS) {
         status = pj_stun_session_on_rx_pkt(comp->stun_sess, pkt, pkt_size,
                                            PJ_STUN_IS_DATAGRAM, msg_data,
@@ -2494 +2493 @@
                   ice->tmp.errmsg));
         }
+        pj_mutex_unlock(ice->mutex);
     } else {
+        /* Not a STUN packet. Call application's callback instead, but release
+         * the mutex now or otherwise we may get deadlock.
+         */
+        pj_mutex_unlock(ice->mutex);
+
         (*ice->cb.on_rx_data)(ice, comp_id, transport_id, pkt, pkt_size, 
                               src_addr, src_addr_len);
-    }
-    
-
-on_return:
-    pj_mutex_unlock(ice->mutex);
+        status = PJ_SUCCESS;
+    }
+
     return status;
 }