Changeset 1495 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Oct 12, 2007 12:14:27 PM (17 years ago)

Author:

bennylp

Message:

Ticket #399: Initial implementation of tool to perform NAT type detection/classification

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -20 +20 @@
 
 
-#define THIS_FILE       "pjsua.c"
+#define THIS_FILE       "pjsua_app.c"
 #define NO_LIMIT        (int)0x7FFFFFFF
 
@@ -2308 +2308 @@
 
 
+/* Callback upon NAT detection completion */
+static void nat_detect_cb(void *user_data,
+                          const pj_stun_nat_detect_result *res)
+{
+    PJ_UNUSED_ARG(user_data);
+
+    if (res->status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "NAT detection failed", res->status);
+    } else {
+        PJ_LOG(3, (THIS_FILE, "NAT detected as %s", res->nat_type_name));
+    }
+}
+
+
+/*
+ * Detect NAT type.
+ */
+static void detect_nat_type(void)
+{
+    pj_status_t status;
+
+    status = pjsua_detect_nat_type(NULL, &nat_detect_cb);
+    if (status != PJ_SUCCESS)
+        pjsua_perror(THIS_FILE, "Error", status);
+}
+
+
 /*
  * Main "user interface" loop.
@@ -2421 +2448 @@
             break;
 
+        case 'n':
+            detect_nat_type();
+            break;
+
         case 'i':
             /* Send instant messaeg */
@@ -3474 +3505 @@
     }
 
+    if (app_config.cfg.stun_domain.slen || app_config.cfg.stun_host.slen)
+        detect_nat_type();
+
     console_app_main(&uri_arg);