Changeset 4573

Timestamp:

Jul 24, 2013 8:06:59 AM (11 years ago)

Author:

nanang

Message:

Fix #1691: Apply group lock mechanism in NAT detect to avoid deadlock.

File:

• pjproject/trunk/pjnath/src/pjnath/nat_detect.c (modified) (13 diffs)

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -76 +76 @@
 {
     pj_pool_t               *pool;
-    pj_mutex_t              *mutex;
+    pj_grp_lock_t           *grp_lock;
 
     pj_timer_heap_t         *timer_heap;
@@ -134 +134 @@
                              pj_timer_entry *te);
 static void sess_destroy(nat_detect_session *sess);
-
+static void sess_on_destroy(void *member);
 
 /*
@@ -234 +234 @@
     sess->cb = cb;
 
-    status = pj_mutex_create_recursive(pool, pool->obj_name, &sess->mutex);
-    if (status != PJ_SUCCESS)
-        goto on_error;
-    
+    status = pj_grp_lock_create(pool, NULL, &sess->grp_lock);
+    if (status != PJ_SUCCESS) {
+        /* Group lock not created yet, just destroy pool and return */
+        pj_pool_release(pool);
+        return status;
+    }
+
+    pj_grp_lock_add_ref(sess->grp_lock);
+    pj_grp_lock_add_handler(sess->grp_lock, pool, sess, &sess_on_destroy);
+
     pj_memcpy(&sess->server, server, sizeof(pj_sockaddr_in));
 
@@ -295 +301 @@
     ioqueue_cb.on_read_complete = &on_read_complete;
 
-    status = pj_ioqueue_register_sock(sess->pool, stun_cfg->ioqueue, 
-                                      sess->sock, sess, &ioqueue_cb,
-                                      &sess->key);
+    status = pj_ioqueue_register_sock2(sess->pool, stun_cfg->ioqueue, 
+                                       sess->sock, sess->grp_lock, sess,
+                                       &ioqueue_cb, &sess->key);
     if (status != PJ_SUCCESS)
         goto on_error;
@@ -308 +314 @@
     sess_cb.on_send_msg = &on_send_msg;
     status = pj_stun_session_create(stun_cfg, pool->obj_name, &sess_cb,
-                                    PJ_FALSE, NULL, &sess->stun_sess);
+                                    PJ_FALSE, sess->grp_lock, &sess->stun_sess);
     if (status != PJ_SUCCESS)
         goto on_error;
@@ -339 +345 @@
     if (sess->stun_sess) { 
         pj_stun_session_destroy(sess->stun_sess);
+        sess->stun_sess = NULL;
     }
 
     if (sess->key) {
         pj_ioqueue_unregister(sess->key);
+        sess->key = NULL;
+        sess->sock = PJ_INVALID_SOCKET;
     } else if (sess->sock && sess->sock != PJ_INVALID_SOCKET) {
         pj_sock_close(sess->sock);
-    }
-
-    if (sess->mutex) {
-        pj_mutex_destroy(sess->mutex);
-    }
-
+        sess->sock = PJ_INVALID_SOCKET;
+    }
+
+    if (sess->grp_lock) {
+        pj_grp_lock_dec_ref(sess->grp_lock);
+    }
+}
+
+static void sess_on_destroy(void *member)
+{
+    nat_detect_session *sess = (nat_detect_session*)member;
     if (sess->pool) {
         pj_pool_release(sess->pool);
     }
 }
-
 
 static void end_session(nat_detect_session *sess,
@@ -403 +416 @@
     pj_assert(sess != NULL);
 
-    pj_mutex_lock(sess->mutex);
+    pj_grp_lock_acquire(sess->grp_lock);
+
+    /* Ignore packet when STUN session has been destroyed */
+    if (!sess->stun_sess)
+        goto on_return;
 
     if (bytes_read < 0) {
@@ -436 +453 @@
 
 on_return:
-    pj_mutex_unlock(sess->mutex);
+    pj_grp_lock_release(sess->grp_lock);
 }
 
@@ -491 +508 @@
     sess = (nat_detect_session*) pj_stun_session_get_user_data(stun_sess);
 
-    pj_mutex_lock(sess->mutex);
+    pj_grp_lock_acquire(sess->grp_lock);
 
     /* Find errors in the response */
@@ -787 +804 @@
 
 on_return:
-    pj_mutex_unlock(sess->mutex);
+    pj_grp_lock_release(sess->grp_lock);
 }
 
@@ -866 +883 @@
 
     if (te->id == TIMER_DESTROY) {
-        pj_mutex_lock(sess->mutex);
+        pj_grp_lock_acquire(sess->grp_lock);
         pj_ioqueue_unregister(sess->key);
         sess->key = NULL;
         sess->sock = PJ_INVALID_SOCKET;
         te->id = 0;
-        pj_mutex_unlock(sess->mutex);
+        pj_grp_lock_release(sess->grp_lock);
 
         sess_destroy(sess);
@@ -879 +896 @@
         pj_bool_t next_timer;
 
-        pj_mutex_lock(sess->mutex);
+        pj_grp_lock_acquire(sess->grp_lock);
 
         next_timer = PJ_FALSE;
@@ -904 +921 @@
         }
 
-        pj_mutex_unlock(sess->mutex);
+        pj_grp_lock_release(sess->grp_lock);
 
     } else {