Changeset 2590 for pjproject

Timestamp:

Apr 13, 2009 6:30:49 PM (16 years ago)

Author:

bennylp

Message:

More ticket #780: destroy TURN session if it receives 437 (Allocation Mismatch) response

File:

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

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

@@ -1242 +1242 @@
         }
 
-        /* Otherwise if this is REFRESH response, notify application
+        /* Otherwise if this is not ALLOCATE response, notify application
          * that session has been TERMINATED.
          */
-        if (method==PJ_STUN_REFRESH_METHOD) {
+        if (method!=PJ_STUN_ALLOCATE_METHOD) {
             set_state(sess, PJ_TURN_STATE_DEALLOCATED);
             sess_shutdown(sess, status);
@@ -1459 +1459 @@
             const pj_str_t *err_msg = NULL;
 
-            if (status == PJ_SUCCESS) {
+            pj_assert(status != PJ_SUCCESS);
+
+            if (response) {
                 const pj_stun_errcode_attr *err_attr;
                 err_attr = (const pj_stun_errcode_attr*)
@@ -1467 +1469 @@
                     status = PJ_STATUS_FROM_STUN_CODE(err_attr->err_code);
                     err_msg = &err_attr->reason;
-                } else {
-                    status = PJNATH_EINSTUNMSG;
                 }
             }
@@ -1494 +1494 @@
         } else {
             /* Failed ChannelBind response */
-            pj_str_t err_msg = {"", 0};
-
-            if (status == PJ_SUCCESS) {
+            pj_str_t reason = {"", 0};
+            int err_code = 0;
+            char errbuf[PJ_ERR_MSG_SIZE];
+
+            pj_assert(status != PJ_SUCCESS);
+
+            if (response) {
                 const pj_stun_errcode_attr *err_attr;
                 err_attr = (const pj_stun_errcode_attr*)
@@ -1502 +1506 @@
                                                  PJ_STUN_ATTR_ERROR_CODE, 0);
                 if (err_attr) {
+                    err_code = err_attr->err_code;
                     status = PJ_STATUS_FROM_STUN_CODE(err_attr->err_code);
-                    err_msg = err_attr->reason;
-                } else {
-                    status = PJNATH_EINSTUNMSG;
+                    reason = err_attr->reason;
                 }
+            } else {
+                err_code = status;
+                reason = pj_strerror(status, errbuf, sizeof(errbuf));
             }
 
-            PJ_LOG(4,(sess->obj_name, "ChannelBind failed: %.*s",
-                      (int)err_msg.slen, err_msg.ptr));
+            PJ_LOG(1,(sess->obj_name, "ChannelBind failed: %d/%.*s",
+                      err_code, (int)reason.slen, reason.ptr));
+
+            if (err_code == PJ_STUN_SC_ALLOCATION_MISMATCH) {
+                /* Allocation mismatch means allocation no longer exists */
+                on_session_fail(sess, PJ_STUN_CHANNEL_BIND_METHOD,
+                                status, &reason);
+                return;
+            }
         }
 
@@ -1529 +1542 @@
             pj_str_t reason;
 
-            if (status != PJ_SUCCESS) {
-                err_code = status;
-                reason = pj_strerror(status, errbuf, sizeof(errbuf));
-            } else {
+            pj_assert(status != PJ_SUCCESS);
+
+            if (response) {
                 const pj_stun_errcode_attr *eattr;
 
@@ -1545 +1557 @@
                     reason = pj_str("?");
                 }
+            } else {
+                err_code = status;
+                reason = pj_strerror(status, errbuf, sizeof(errbuf));
             }
 
@@ -1562 +1577 @@
                     invalidate_perm(sess, perm);
                 }
+            }
+
+            if (err_code == PJ_STUN_SC_ALLOCATION_MISMATCH) {
+                /* Allocation mismatch means allocation no longer exists */
+                on_session_fail(sess, PJ_STUN_CREATE_PERM_METHOD,
+                                status, &reason);
+                return;
             }
         }