Changeset 5513 for pjproject/branches/projects/uwp/pjsip/include/pjsua2/endpoint.hpp

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/pjsua2/endpoint.hpp (modified) (4 diffs)

pjproject/branches/projects/uwp/pjsip/include/pjsua2/endpoint.hpp

@@ -903 +903 @@
      */
     pj_stun_nat_type natGetType() throw(Error);
+
+    /**
+     * Update the STUN servers list. The libInit() must have been called
+     * before calling this function.
+     *
+     * @param prmServers        Array of STUN servers to try. The endpoint
+     *                          will try to resolve and contact each of the
+     *                          STUN server entry until it finds one that is
+     *                          usable. Each entry may be a domain name, host
+     *                          name, IP address, and it may contain an
+     *                          optional port number. For example:
+     *                          - "pjsip.org" (domain name)
+     *                          - "sip.pjsip.org" (host name)
+     *                          - "pjsip.org:33478" (domain name and a non-
+     *                             standard port number)
+     *                          - "10.0.0.1:3478" (IP address and port number)
+     * @param prmWait           Specify if the function should block until
+     *                          it gets the result. In this case, the
+     *                          function will block while the resolution
+     *                          is being done, and the callback
+     *                          onNatCheckStunServersComplete() will be called
+     *                          before this function returns.
+     *
+     */
+    void natUpdateStunServers(const StringVector &prmServers,
+                              bool prmWait) throw(Error);
 
     /**
@@ -1190 +1216 @@
      * Callback when the Endpoint has finished performing STUN server
      * checking that is initiated when calling libInit(), or by
-     * calling natCheckStunServers().
+     * calling natCheckStunServers() or natUpdateStunServers().
      *
      * @param prm       Callback parameters.
@@ -1311 +1337 @@
     static void on_mwi_info(pjsua_acc_id acc_id,
                             pjsua_mwi_info *mwi_info);
-
+    static void on_acc_find_for_incoming(const pjsip_rx_data *rdata,
+                                         pjsua_acc_id* acc_id);
     static void on_buddy_state(pjsua_buddy_id buddy_id);
     // Call callbacks
@@ -1376 +1403 @@
                               pjmedia_transport *base_tp,
                               unsigned flags);
+    static void
+    on_create_media_transport_srtp(pjsua_call_id call_id,
+                                   unsigned media_idx,
+                                   pjmedia_srtp_setting *srtp_opt);
 
 private: