Changeset 5380

Timestamp:

Jul 13, 2016 9:57:26 AM (8 years ago)

Author:

nanang

Message:

Re #1942:

• Reverted back r5375, otherwise retrying next server will not work as it is using the ALLOCATING -> RESOLVED.
• Don't set state to RESOLVED when pj_stun_session_send_msg() fails to avoid infinite loop, simply return the error code and let application destroy the TURN client session (which is already done by TURN socket).
• Handle allocation error when delayed allocation fails (otherwise TURN client session may never get destroyed?).

Location:

pjproject/trunk/pjnath/src/pjnath

Files:

• turn_session.c (modified) (2 diffs)
• turn_sock.c (modified) (1 diff)

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

@@ -785 +785 @@
          * let the application do it if it wants to.
          */
-        set_state(sess, PJ_TURN_STATE_RESOLVED);
+        /* Set state back to RESOLVED may cause infinite loop (see #1942). */
+        //set_state(sess, PJ_TURN_STATE_RESOLVED);
     }
 
@@ -1750 +1751 @@
     /* Run pending allocation */
     if (sess->pending_alloc) {
-        pj_turn_session_alloc(sess, NULL);
+        pj_status_t status;
+        status = pj_turn_session_alloc(sess, NULL);
+        if (status != PJ_SUCCESS)
+            on_session_fail(sess, PJ_STUN_ALLOCATE_METHOD, status, NULL);
     }
 }

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -735 +735 @@
     if (turn_sock == NULL) {
         /* We've been destroyed */
-        return;
-    }
-
-    if (old_state == PJ_TURN_STATE_ALLOCATING &&
-        new_state == PJ_TURN_STATE_RESOLVED)
-    {
-        /* TURN session won't destroy itself upon allocation failure, it will
-         * just revert back TURN state to PJ_TURN_STATE_RESOLVED. So, let's
-         * avoid infinite loop here (see ticket #1942).
-         */
         return;
     }