Changeset 5375 for pjproject/trunk/pjnath/src/pjnath/turn_sock.c

Timestamp:

Jul 4, 2016 1:12:24 PM (8 years ago)

Author:

nanang

Message:

Fix #1942: TURN socket should not start TURN allocation in state PJ_TURN_STATE_RESOLVED when previous state is already PJ_TURN_STATE_ALLOCATING.

File:

• pjproject/trunk/pjnath/src/pjnath/turn_sock.c (modified) (1 diff)

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;
     }