Changeset 3908 for pjproject

Timestamp:

Dec 13, 2011 4:59:15 AM (13 years ago)

Author:

nanang

Message:

Close #1424: Added new pjsua callback: on_call_rx_offer().

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -810 +810 @@
                              pjsua_call_id new_call_id);
 
+
+    /**
+     * Notify application when call has received new offer from remote
+     * (i.e. re-INVITE/UPDATE with SDP is received). Application can
+     * decide to accept/reject the offer by setting the code (default
+     * is 200). If the offer is accepted, application can update the 
+     * call setting to be applied in the answer. When this callback is
+     * not defined, the default behavior is to accept the offer using
+     * current call setting.
+     *
+     * @param call_id   The call index.
+     * @param offer     The new offer received.
+     * @param reserved  Reserved param, currently not used.
+     * @param code      Status code to be returned for answering the
+     *                  offer. On input, it contains status code 200.
+     *                  Currently, valid values are only 200 and 488.
+     * @param opt       The current call setting, application can update
+     *                  this setting for answering the offer.
+     */
+    void (*on_call_rx_offer)(pjsua_call_id call_id,
+                             const pjmedia_sdp_session *offer,
+                             void *reserved,
+                             pjsip_status_code *code,
+                             pjsua_call_setting *opt);
 
     /**

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

@@ -3556 +3556 @@
     pj_log_push_indent();
 
+    if (pjsua_var.ua_cfg.cb.on_call_rx_offer) {
+        pjsip_status_code code = PJSIP_SC_OK;
+        pjsua_call_setting opt = call->opt;
+        
+        (*pjsua_var.ua_cfg.cb.on_call_rx_offer)(call->index, offer, NULL,
+                                                &code, &opt);
+
+        if (code != PJSIP_SC_OK) {
+            PJ_LOG(4,(THIS_FILE, "Rejecting updated media offer on call %d",
+                      call->index));
+            goto on_return;
+        }
+
+        call->opt = opt;
+    }
+
     /* Re-init media for the new remote offer before creating SDP */
     status = pjsua_media_channel_init(call->index, PJSIP_ROLE_UAS,