Changeset 1501 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.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/pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)

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

@@ -1886 +1886 @@
 
 /*
+ * NAT type detection callback.
+ */
+static void on_nat_detect(const pj_stun_nat_detect_result *res)
+{
+    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));
+    }
+}
+
+
+/*
  * Print buddy list.
  */
@@ -2313 +2326 @@
 
 
-/* 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.
@@ -2454 +2440 @@
 
         case 'n':
-            detect_nat_type();
+            pjsua_detect_nat_type();
             break;
 
@@ -3308 +3294 @@
     app_config.cfg.cb.on_call_transfer_status = &on_call_transfer_status;
     app_config.cfg.cb.on_call_replaced = &on_call_replaced;
+    app_config.cfg.cb.on_nat_detect = &on_nat_detect;
 
     /* Initialize pjsua */
@@ -3509 +3496 @@
         return status;
     }
-
-    if (app_config.cfg.stun_domain.slen || app_config.cfg.stun_host.slen)
-        detect_nat_type();
 
     console_app_main(&uri_arg);