Changeset 5131

Timestamp:

Jul 13, 2015 7:56:19 AM (9 years ago)

Author:

ming

Message:

Fixed #1867: Add pjsua callback to notify when STUN resolution completes

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (5 diffs)
• include/pjsua2/endpoint.hpp (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• src/pjsua2/endpoint.cpp (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -284 +284 @@
 typedef struct pjsua_msg_data pjsua_msg_data;
 
+/** Forward declaration for pj_stun_resolve_result */
+typedef struct pj_stun_resolve_result pj_stun_resolve_result;
+
 
 /**
@@ -558 +561 @@
 (*pjsua_med_tp_state_cb)(pjsua_call_id call_id,
                          const pjsua_med_tp_state_info *info);
+
+
+/**
+ * Typedef of callback to be registered to #pjsua_resolve_stun_servers()
+ * and to be called when STUN resolution completes.
+ */
+typedef void (*pj_stun_resolve_cb)(const pj_stun_resolve_result *result);
 
 
@@ -1352 +1362 @@
                                      pjsua_acc_id* acc_id);
 
+    /**
+     * Calling #pjsua_init() will initiate an async process to resolve and
+     * contact each of the STUN server entries to find which is usable.
+     * This callback is called when the process is complete, and can be
+     * used by the application to start creating and registering accounts.
+     * This way, the accounts can avoid call setup delay caused by pending
+     * STUN resolution.
+     *
+     * See also #pj_stun_resolve_cb.
+     */
+    pj_stun_resolve_cb on_stun_resolution_complete;
+
 } pjsua_callback;
 
@@ -1970 +1992 @@
  * This structure will be passed in #pj_stun_resolve_cb callback.
  */
-typedef struct pj_stun_resolve_result
+struct pj_stun_resolve_result
 {
     /**
@@ -1997 +2019 @@
     pj_sockaddr      addr;
 
-} pj_stun_resolve_result;
-
-
-/**
- * Typedef of callback to be registered to #pjsua_resolve_stun_servers().
- */
-typedef void (*pj_stun_resolve_cb)(const pj_stun_resolve_result *result);
+};
+
 
 /**

pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp

@@ -1182 +1182 @@
     /**
      * Callback when the Endpoint has finished performing STUN server
-     * checking that is initiated with natCheckStunServers().
+     * checking that is initiated when calling libInit(), or by
+     * calling natCheckStunServers().
      *
      * @param prm       Callback parameters.

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1472 +1472 @@
         }
     }
+    
+    if (pjsua_var.ua_cfg.cb.on_stun_resolution_complete)
+        (*pjsua_var.ua_cfg.cb.on_stun_resolution_complete)(result);
 }
 

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -1278 +1278 @@
     ua_cfg.cb.on_call_media_event       = &Endpoint::on_call_media_event;
     ua_cfg.cb.on_create_media_transport = &Endpoint::on_create_media_transport;
+    ua_cfg.cb.on_stun_resolution_complete = 
+        &Endpoint::stun_resolve_cb;
 
     /* Init! */