Changeset 1936 for pjproject/trunk/pjnath/src/pjnath/nat_detect.c

Timestamp:

Apr 22, 2008 6:32:16 PM (16 years ago)

Author:

bennylp

Message:

Report NAT type as unknown rather than UDP blocked when test 1B failed (could happen when port 3479 is blocked). Thanks Helmut Wolf for the info.

File:

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

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -735 +735 @@
                     /*
                      * Strangely test 1B has failed. Maybe connectivity was
-                     * lost?
+                     * lost? Or perhaps port 3489 (the usual port number in
+                     * CHANGED-ADDRESS) is blocked?
                      */
-                    end_session(sess, PJ_SUCCESS, PJ_STUN_NAT_TYPE_BLOCKED);
+                    switch (sess->result[ST_TEST_3].status) {
+                    case PJ_SUCCESS:
+                        /* Although test 1B failed, test 3 was successful.
+                         * It could be that port 3489 is blocked, while the
+                         * NAT itself looks to be a Restricted one.
+                         */
+                        end_session(sess, PJ_SUCCESS, 
+                                    PJ_STUN_NAT_TYPE_RESTRICTED);
+                        break;
+                    default:
+                        /* Can't distinguish between Symmetric and Port
+                         * Restricted, so set the type to Unknown
+                         */
+                        end_session(sess, PJ_SUCCESS, 
+                                    PJ_STUN_NAT_TYPE_ERR_UNKNOWN);
+                        break;
+                    }
                     break;
                 default: