Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsua2/endpoint.cpp

Timestamp:

Dec 28, 2016 3:40:07 AM (8 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/src/pjsua2/endpoint.cpp (modified) (10 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsua2/endpoint.cpp

@@ -46 +46 @@
 
 UaConfig::UaConfig()
+: mainThreadOnly(false)
 {
     pjsua_config ua_cfg;
@@ -490 +491 @@
     entry.level = level;
     entry.msg = string(data, len);
-    entry.threadId = (long)pj_thread_this();
+    entry.threadId = (long)(size_t)pj_thread_this();
     entry.threadName = string(pj_thread_get_name(pj_thread_this()));
 
@@ -602 +603 @@
     }
 
+    pjsua_call *call = &pjsua_var.calls[call_id];
+    if (!call->incoming_data) {
+        /* This happens when the incoming call callback has been called from 
+         * inside the on_create_media_transport() callback. So we simply 
+         * return here to avoid calling the callback twice. 
+         */
+        return;
+    }
+
     /* call callback */
     OnIncomingCallParam prm;
@@ -608 +618 @@
 
     acc->onIncomingCall(prm);
+
+    /* Free cloned rdata. */
+    pjsip_rx_data_free_cloned(call->incoming_data);
+    call->incoming_data = NULL;
 
     /* disconnect if callback doesn't handle the call */
@@ -816 +830 @@
 }
 
+void Endpoint::on_acc_find_for_incoming(const pjsip_rx_data *rdata,
+                                        pjsua_acc_id* acc_id)
+{
+    OnSelectAccountParam prm;
+
+    pj_assert(rdata && acc_id);
+    prm.rdata.fromPj(*((pjsip_rx_data *)rdata));
+    prm.accountIndex = *acc_id;
+    
+    instance_->onSelectAccount(prm);
+    
+    *acc_id = prm.accountIndex;
+}
+
 void Endpoint::on_buddy_state(pjsua_buddy_id buddy_id)
 {
@@ -894 +922 @@
     /* Check if application modifies the SDP */
     if (orig_sdp != prm.sdp.wholeSdp) {
-        pjmedia_sdp_parse(pool, (char*)prm.sdp.wholeSdp.c_str(),
-                          prm.sdp.wholeSdp.size(), &sdp);
+        pjmedia_sdp_session *new_sdp;
+        pj_str_t dup_new_sdp;
+        pj_str_t new_sdp_str = {(char*)prm.sdp.wholeSdp.c_str(),
+                                (pj_ssize_t)prm.sdp.wholeSdp.size()};
+
+        pj_strdup(pool, &dup_new_sdp, &new_sdp_str);        
+        pjmedia_sdp_parse(pool, dup_new_sdp.ptr,
+                          dup_new_sdp.slen, &new_sdp);
+        pj_memcpy(sdp, new_sdp, sizeof(*sdp));
     }
 }
@@ -1204 +1239 @@
     Call *call = Call::lookup(call_id);
     if (!call) {
-        return base_tp;
+        pjsua_call *in_call = &pjsua_var.calls[call_id];
+        if (in_call->incoming_data) {
+            /* This can happen when there is an incoming call but the
+             * on_incoming_call() callback hasn't been called. So we need to 
+             * call the callback here.
+             */
+            on_incoming_call(in_call->acc_id, call_id, in_call->incoming_data);
+
+            /* New call should already be created by app. */
+            call = Call::lookup(call_id);
+            if (!call) {
+                return base_tp;
+            }
+        } else {
+            return base_tp;
+        }
     }
     
@@ -1215 +1265 @@
     
     return (pjmedia_transport *)prm.mediaTp;
+}
+
+void Endpoint::on_create_media_transport_srtp(pjsua_call_id call_id,
+                                              unsigned media_idx,
+                                              pjmedia_srtp_setting *srtp_opt)
+{
+    Call *call = Call::lookup(call_id);
+    if (!call) {
+        pjsua_call *in_call = &pjsua_var.calls[call_id];
+        if (in_call->incoming_data) {
+            /* This can happen when there is an incoming call but the
+             * on_incoming_call() callback hasn't been called. So we need to 
+             * call the callback here.
+             */
+            on_incoming_call(in_call->acc_id, call_id, in_call->incoming_data);
+
+            /* New call should already be created by app. */
+            call = Call::lookup(call_id);
+            if (!call) {
+                return;
+            }
+        } else {
+            return;
+        }
+    }
+    
+    OnCreateMediaTransportSrtpParam prm;
+    prm.mediaIdx = media_idx;
+    prm.srtpUse  = srtp_opt->use;
+    for (unsigned i = 0; i < srtp_opt->crypto_count; i++) {
+        SrtpCrypto crypto;
+        
+        crypto.key   = pj2Str(srtp_opt->crypto[i].key);
+        crypto.name  = pj2Str(srtp_opt->crypto[i].name);
+        crypto.flags = srtp_opt->crypto[i].flags;
+        prm.cryptos.push_back(crypto);
+    }
+    
+    call->onCreateMediaTransportSrtp(prm);
+    
+    srtp_opt->use = prm.srtpUse;
+    srtp_opt->crypto_count = prm.cryptos.size();
+    for (unsigned i = 0; i < srtp_opt->crypto_count; i++) {
+        srtp_opt->crypto[i].key   = str2Pj(prm.cryptos[i].key);
+        srtp_opt->crypto[i].name  = str2Pj(prm.cryptos[i].name);
+        srtp_opt->crypto[i].flags = prm.cryptos[i].flags;
+    }
 }
 
@@ -1278 +1375 @@
     ua_cfg.cb.on_mwi_info       = &Endpoint::on_mwi_info;
     ua_cfg.cb.on_buddy_state    = &Endpoint::on_buddy_state;
+    ua_cfg.cb.on_acc_find_for_incoming  = &Endpoint::on_acc_find_for_incoming;
 
     /* Call callbacks */
@@ -1511 +1609 @@
 }
 
+void Endpoint::natUpdateStunServers(const StringVector &servers,
+                                    bool wait) throw(Error)
+{
+    pj_str_t srv[MAX_STUN_SERVERS];
+    unsigned i, count = 0;
+
+    for (i=0; i<servers.size() && i<MAX_STUN_SERVERS; ++i) {
+        srv[count].ptr = (char*)servers[i].c_str();
+        srv[count].slen = servers[i].size();
+        ++count;
+    }
+
+    PJSUA2_CHECK_EXPR(pjsua_update_stun_servers(count, srv, wait) );
+}
+
 void Endpoint::natCheckStunServers(const StringVector &servers,
                                    bool wait,