Changeset 4551

Timestamp:

Jul 5, 2013 8:00:06 AM (11 years ago)

Author:

nanang

Message:

Fix #1685: When TURN destroy is requested in state RESOLVING, pending the destroy until resolver callback is invoked.

File:

• pjproject/trunk/pjnath/src/pjnath/turn_session.c (modified) (5 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -121 +121 @@
     pj_status_t          last_status;
     pj_bool_t            pending_destroy;
-    pj_bool_t            destroy_notified;
 
     pj_stun_session     *stun;
@@ -132 +131 @@
     pj_timer_entry       timer;
 
-    pj_dns_srv_async_query *dns_async;
     pj_uint16_t          default_port;
 
@@ -396 +394 @@
         break;
     case PJ_TURN_STATE_RESOLVING:
-        if (sess->dns_async != NULL) {
-            pj_dns_srv_cancel_query(sess->dns_async, PJ_FALSE);
-            sess->dns_async = NULL;
-        }
+        /* Wait for DNS callback invoked, it will call the this function
+         * again. If the callback happens to get pending_destroy==FALSE,
+         * the TURN allocation will call this function again.
+         */
+        sess->pending_destroy = PJ_TRUE;
+        can_destroy = PJ_FALSE;
         break;
     case PJ_TURN_STATE_RESOLVED:
@@ -620 +620 @@
         status = pj_dns_srv_resolve(domain, &res_name, default_port, 
                                     sess->pool, resolver, opt, sess, 
-                                    &dns_srv_resolver_cb, &sess->dns_async);
+                                    &dns_srv_resolver_cb, NULL);
         if (status != PJ_SUCCESS) {
             set_state(sess, PJ_TURN_STATE_NULL);
@@ -1683 +1683 @@
     unsigned i, cnt, tot_cnt;
 
-    /* Clear async resolver */
-    sess->dns_async = NULL;
-
     /* Check failure */
-    if (status != PJ_SUCCESS) {
+    if (status != PJ_SUCCESS || sess->pending_destroy) {
+        set_state(sess, PJ_TURN_STATE_DESTROYING);
         sess_shutdown(sess, status);
         return;