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

Timestamp:

Oct 16, 2007 1:34:14 AM (17 years ago)

Author:

bennylp

Message:

More ticket #399: added callback to report NAT detection result, and sends NAT type in SDP

File:

• pjproject/trunk/pjnath/src/pjnath/nat_detect.c (modified) (9 diffs)

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

@@ -33 +33 @@
 {
     "Unknown",
-    "Open Internet",
+    "ErrUnknown",
+    "Open",
     "Blocked",
     "Symmetric UDP",
@@ -130 +131 @@
 
 
+/*
+ * Get the NAT name from the specified NAT type.
+ */
+PJ_DEF(const char*) pj_stun_get_nat_name(pj_stun_nat_type type)
+{
+    PJ_ASSERT_RETURN(type >= 0 && type <= PJ_STUN_NAT_TYPE_PORT_RESTRICTED,
+                     "*Invalid*");
+
+    return nat_type_names[type];
+}
+
 static int test_executed(nat_detect_session *sess)
 {
@@ -388 +400 @@
         {
             /* Permanent error */
-            end_session(sess, -bytes_read, PJ_STUN_NAT_TYPE_UNKNOWN);
+            end_session(sess, -bytes_read, PJ_STUN_NAT_TYPE_ERR_UNKNOWN);
             goto on_return;
         }
@@ -407 +419 @@
     if (status != PJ_EPENDING) {
         pj_assert(status != PJ_SUCCESS);
-        end_session(sess, status, PJ_STUN_NAT_TYPE_UNKNOWN);
+        end_session(sess, status, PJ_STUN_NAT_TYPE_ERR_UNKNOWN);
     }
 
@@ -628 +640 @@
                  */
                 end_session(sess, sess->result[ST_TEST_2].status, 
-                            PJ_STUN_NAT_TYPE_UNKNOWN);
+                            PJ_STUN_NAT_TYPE_ERR_UNKNOWN);
                 break;
             }
@@ -691 +703 @@
                              */
                             end_session(sess, sess->result[ST_TEST_3].status,
-                                        PJ_STUN_NAT_TYPE_UNKNOWN);
+                                        PJ_STUN_NAT_TYPE_ERR_UNKNOWN);
                             break;
                         }
@@ -708 +720 @@
                      */
                     end_session(sess, sess->result[ST_TEST_1B].status,
-                                PJ_STUN_NAT_TYPE_UNKNOWN);
+                                PJ_STUN_NAT_TYPE_ERR_UNKNOWN);
                     break;
                 }
@@ -717 +729 @@
                  */
                 end_session(sess, sess->result[ST_TEST_2].status, 
-                            PJ_STUN_NAT_TYPE_UNKNOWN);
+                            PJ_STUN_NAT_TYPE_ERR_UNKNOWN);
                 break;
             }
@@ -727 +739 @@
          */
         end_session(sess, sess->result[ST_TEST_1].status, 
-                    PJ_STUN_NAT_TYPE_UNKNOWN);
+                    PJ_STUN_NAT_TYPE_ERR_UNKNOWN);
         break;
     }