Changeset 2864 for pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h

Timestamp:

Aug 12, 2009 11:03:23 AM (15 years ago)

Author:

bennylp

Message:

Ticket #866: Allow application to specify more than one STUN servers for more robustness, and continue application startup if STUN resolution fails

PJSUA-LIB:

• New fields in pjsua_config to specify more than one STUN servers (the stun_srv_cnt and stun_srv array)
• The existing stun_host and stun_domain fields are deprecated, but backward compatibility is maintained. If stun_srv_cnt is zero, the library will import the entries from stun_host and stun_domain
• The library will now resolve the STUN server entries one by one and test it before using it
• New auxiliary API pjsua_resolve_stun_servers() to perform resolution and test against array of STUN servers

pjsua application:

• The "stun-srv" command line options can now be specified more than once

File:

• pjproject/trunk/pjsip/include/pjsua-lib/pjsua_internal.h (modified) (4 diffs)

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

@@ -213 +213 @@
 } pjsua_conf_setting;
 
+typedef struct pjsua_stun_resolve
+{
+    PJ_DECL_LIST_MEMBER(struct pjsua_stun_resolve);
+
+    pj_pool_t           *pool;      /**< Pool               */
+    unsigned             count;     /**< # of entries       */
+    pj_str_t            *srv;       /**< Array of entries   */
+    unsigned             idx;       /**< Current index      */
+    void                *token;     /**< App token          */
+    pj_stun_resolve_cb   cb;        /**< App callback       */
+    pj_bool_t            blocking;  /**< Blocking?          */
+    pj_status_t          status;    /**< Session status     */
+    pj_sockaddr          addr;      /**< Result             */
+    pj_stun_sock        *stun_sock; /**< Testing STUN sock  */
+} pjsua_stun_resolve;
+
 
 /**
@@ -242 +258 @@
     pj_sockaddr          stun_srv;  /**< Resolved STUN server address   */
     pj_status_t          stun_status; /**< STUN server status.          */
+    pjsua_stun_resolve   stun_res;  /**< List of pending STUN resolution*/
     pj_dns_resolver     *resolver;  /**< DNS resolver.                  */
 
@@ -351 +368 @@
 #endif
 
+/******
+ * STUN resolution
+ */
+/* Resolve the STUN server */
+pj_status_t resolve_stun_server(pj_bool_t wait);
+
 /** 
  * Normalize route URI (check for ";lr" and append one if it doesn't
@@ -356 +379 @@
  */
 pj_status_t normalize_route_uri(pj_pool_t *pool, pj_str_t *uri);
-
-/**
- * Resolve STUN server.
- */
-pj_status_t pjsua_resolve_stun_server(pj_bool_t wait);
 
 /**