Changeset 5899 for pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

Timestamp:

Oct 17, 2018 4:38:39 AM (6 years ago)

Author:

nanang

Message:

Close #2158:

• Added OnCallTransferRequestParam?.newCall to allow application to instantiate a new Call for the new outgoing call in transfer scenario.
• Also added OnCallReplacedParam?.newCall mainly for informational purpose (that app should instantiate new Call for replace scenario).

File:

• pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp (modified) (3 diffs)

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

@@ -1192 +1192 @@
     prm.statusCode = *code;
     prm.opt.fromPj(*opt);
+    prm.newCall = NULL;
     
     call->onCallTransferRequest(prm);
@@ -1197 +1198 @@
     *code = prm.statusCode;
     *opt = prm.opt.toPj();
+    if (*code/100 <= 2) {
+        if (prm.newCall) {
+            /* We don't manage (e.g: create, delete) the call child,
+             * so let's just override any existing child.
+             */
+            call->child = prm.newCall;
+            call->child->id = PJSUA_INVALID_ID;
+        } else {
+            PJ_LOG(4,(THIS_FILE,
+                      "Warning: application reuses Call instance in "
+                      "call transfer (call ID:%d)", call_id));
+        }
+    }
 }
 
@@ -1255 +1269 @@
     OnCallReplacedParam prm;
     prm.newCallId = new_call_id;
+    prm.newCall = NULL;
     
     call->onCallReplaced(prm);
+
+    if (prm.newCall) {
+        /* Sanity checks */
+        pj_assert(prm.newCall->id == new_call_id);
+        pj_assert(prm.newCall->acc.getId() == call->acc.getId());
+        pj_assert(pjsua_call_get_user_data(new_call_id) == prm.newCall);
+    } else {
+        PJ_LOG(4,(THIS_FILE,
+                  "Warning: application has not created new Call instance "
+                  "for call replace (old call ID:%d, new call ID: %d)",
+                  old_call_id, new_call_id));
+    }
 }