Changeset 3903 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

Dec 8, 2011 8:18:02 AM (12 years ago)

Author:

nanang

Message:

Re #1419: updated call transfer to allow both the transferee and the transfer destination to update the current call setting:

• for transferee (attended & unattended): via new PJSUA-LIB callback on_call_transfer_request2()
• for transfer destination (attended only): via new PJSUA-LIB callback on_call_replace_request2()

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (5 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -965 +965 @@
      * if it wants to.
      */
-    if (replaced_dlg != NULL && pjsua_var.ua_cfg.cb.on_call_replace_request) {
+    if (replaced_dlg != NULL &&
+        (pjsua_var.ua_cfg.cb.on_call_replace_request ||
+         pjsua_var.ua_cfg.cb.on_call_replace_request2))
+    {
         pjsua_call *replaced_call;
         int st_code = 200;
@@ -973 +976 @@
         replaced_call = (pjsua_call*) replaced_dlg->mod_data[pjsua_var.mod.id];
 
+        /* Copy call setting from the replaced call */
+        call->opt = replaced_call->opt;
+
         /* Notify application */
-        pjsua_var.ua_cfg.cb.on_call_replace_request(replaced_call->index,
-                                                    rdata, &st_code, &st_text);
+        if (pjsua_var.ua_cfg.cb.on_call_replace_request) {
+            pjsua_var.ua_cfg.cb.on_call_replace_request(replaced_call->index,
+                                                        rdata,
+                                                        &st_code, &st_text);
+        }
+
+        if (pjsua_var.ua_cfg.cb.on_call_replace_request2) {
+            pjsua_var.ua_cfg.cb.on_call_replace_request2(replaced_call->index,
+                                                         rdata,
+                                                         &st_code, &st_text,
+                                                         &call->opt);
+        }
 
         /* Must specify final response */
@@ -3875 +3891 @@
     pjsip_status_code code;
     pjsip_evsub *sub;
+    pjsua_call_setting call_opt;
 
     pj_log_push_indent();
@@ -3911 +3928 @@
     /* Notify callback */
     code = PJSIP_SC_ACCEPTED;
-    if (pjsua_var.ua_cfg.cb.on_call_transfer_request)
+    if (pjsua_var.ua_cfg.cb.on_call_transfer_request) {
         (*pjsua_var.ua_cfg.cb.on_call_transfer_request)(existing_call->index,
                                                         &refer_to->hvalue, 
                                                         &code);
+    }
+
+    call_opt = existing_call->opt;
+    if (pjsua_var.ua_cfg.cb.on_call_transfer_request2) {
+        (*pjsua_var.ua_cfg.cb.on_call_transfer_request2)(existing_call->index,
+                                                         &refer_to->hvalue, 
+                                                         &code,
+                                                         &call_opt);
+    }
 
     if (code < 200)
@@ -4041 +4067 @@
     /* Now make the outgoing call. */
     tmp = pj_str(uri);
-    status = pjsua_call_make_call(existing_call->acc_id, &tmp, 0,
+    status = pjsua_call_make_call(existing_call->acc_id, &tmp, &call_opt,
                                   existing_call->user_data, &msg_data, 
                                   &new_call);