Changeset 4386 for pjproject

Timestamp:

Feb 27, 2013 10:14:23 AM (12 years ago)

Author:

nanang

Message:

Re #1557: backported to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjnath/src/pjnath/turn_sock.c (modified) (2 diffs)

pjproject/branches/1.x/pjnath/src/pjnath/turn_sock.c

@@ -211 +211 @@
 
     if (turn_sock->active_sock) {
+        pj_activesock_set_user_data(turn_sock->active_sock, NULL);
         pj_activesock_close(turn_sock->active_sock);
         turn_sock->active_sock = NULL;
@@ -463 +464 @@
 
     turn_sock = (pj_turn_sock*) pj_activesock_get_user_data(asock);
+    if (!turn_sock)
+        return PJ_FALSE;
+
+    /* TURN session may have already been destroyed here.
+     * See ticket #1557 (http://trac.pjsip.org/repos/ticket/1557).
+     */
+    if (!turn_sock->sess) {
+        sess_fail(turn_sock, "TURN session already destroyed", status);
+        return PJ_FALSE;
+    }
 
     if (status != PJ_SUCCESS) {