Changeset 5513 for pjproject/branches/projects/uwp/pjsip/include/pjsua-lib/pjsua_internal.h

Timestamp:

Dec 28, 2016 3:40:07 AM (7 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (8 diffs)

pjproject/branches/projects/uwp/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -173 +173 @@
                 pj_bool_t        hangup;  /**< Call is hangup?              */
             } out_call;
-            struct {
+            struct {            
                 call_answer      answers;/**< A list of call answers.       */
+                pj_bool_t        hangup;/**< Call is hangup?                */
                 pjsip_dialog    *replaced_dlg; /**< Replaced dialog.        */
             } inc_call;
@@ -190 +191 @@
     pj_bool_t            reinv_pending;/**< Pending until CONFIRMED state.  */
     pj_bool_t            reinv_ice_sent;/**< Has reinvite for ICE upd sent? */
+    pjsip_rx_data       *incoming_data;/**< Cloned incoming call rdata.
+                                            On pjsua2, when handling incoming 
+                                            call, onCreateMediaTransport() will
+                                            not be called since the call isn't
+                                            created yet. This temporary 
+                                            variable is used to handle such 
+                                            case, see ticket #1916.         */
 };
 
@@ -276 +284 @@
 
     pj_uint16_t      next_rtp_port; /**< Next RTP port to be used.      */
+    pjsip_transport_type_e tp_type; /**< Transport type (for local acc or
+                                         transport binding)             */
 } pjsua_acc;
 
@@ -360 +370 @@
     pj_stun_resolve_cb   cb;        /**< App callback       */
     pj_bool_t            blocking;  /**< Blocking?          */
+    pj_thread_t         *waiter;    /**< Waiting thread     */
+    pj_timer_entry       timer;     /**< Destroy timer      */
     pj_status_t          status;    /**< Session status     */
     pj_sockaddr          addr;      /**< Result             */
     pj_stun_sock        *stun_sock; /**< Testing STUN sock  */
+    pj_bool_t            async_wait;/**< Async resolution 
+                                         of STUN entry      */
 } pjsua_stun_resolve;
 
@@ -429 +443 @@
     pj_status_t          stun_status; /**< STUN server status.          */
     pjsua_stun_resolve   stun_res;  /**< List of pending STUN resolution*/
-    pj_dns_resolver     *resolver;  /**< DNS resolver.                  */
+    unsigned             stun_srv_idx; /**< Resolved STUN server index  */
+    pj_dns_resolver     *resolver;  /**< DNS resolver.                  */   
 
     /* Detected NAT type */
@@ -479 +494 @@
     pjmedia_port        *null_port; /**< Null port.                     */
     pj_bool_t            snd_is_on; /**< Media flow is currently active */
+    unsigned             snd_mode;  /**< Sound device mode.             */
 
     /* Video device */
@@ -599 +615 @@
  */
 /* Resolve the STUN server */
-pj_status_t resolve_stun_server(pj_bool_t wait);
+pj_status_t resolve_stun_server(pj_bool_t wait, pj_bool_t retry_if_cur_error);
 
 /** 
@@ -609 +625 @@
 /* acc use stun? */
 pj_bool_t pjsua_sip_acc_is_using_stun(pjsua_acc_id acc_id);
+pj_bool_t pjsua_media_acc_is_using_stun(pjsua_acc_id acc_id);
+
+/* acc use IPv6? */
+pj_bool_t pjsua_sip_acc_is_using_ipv6(pjsua_acc_id acc_id);
 
 /* Get local transport address suitable to be used for Via or Contact address