Changeset 5641

Timestamp:

Aug 16, 2017 4:53:44 AM (7 years ago)

Author:

ming

Message:

Fixed #2037: Add on_rx_offer2() callback for SIP invite
Thanks to Andrey Kovalenko for the suggestion and the initial version of the patch.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip-ua/sip_inv.h (modified) (2 diffs)
• src/pjsip-ua/sip_inv.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip-ua/sip_inv.h

@@ -98 +98 @@
 
 /**
+ * Structure to hold parameters when calling the callback
+ * #on_rx_offer2().
+ */
+struct pjsip_inv_on_rx_offer_cb_param
+{
+    const pjmedia_sdp_session   *offer;     /** Remote offer.               */
+    const pjsip_rx_data         *rdata;     /** The received request.       */
+};
+
+
+/**
  * This structure contains callbacks to be registered by application to 
  * receieve notifications from the framework about various events in
@@ -155 +166 @@
      * will be sent with the SIP message.
      *
+     * Note: if callback #on_rx_offer2() is implemented, this callback will
+     * not be called.
+     *
      * @param inv       The invite session.
      * @param offer     Remote offer.
      */
     void (*on_rx_offer)(pjsip_inv_session *inv,
-                        const pjmedia_sdp_session *offer);
+                        const pjmedia_sdp_session *offer);
+
+    /**
+     * This callback is called when the invite session has received 
+     * new offer from peer. Variant of #on_rx_offer() callback.
+     *
+     * @param inv       The invite session.
+     * @param param     The callback parameters.
+     */
+    void (*on_rx_offer2)(pjsip_inv_session *inv,
+                         struct pjsip_inv_on_rx_offer_cb_param *param);
 
     /**

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -2104 +2104 @@
 
         /* Inform application about remote offer. */
-        if (mod_inv.cb.on_rx_offer && inv->notify) {
-
-            (*mod_inv.cb.on_rx_offer)(inv, sdp_info->sdp);
-
+        if (mod_inv.cb.on_rx_offer2 && inv->notify) {
+            struct pjsip_inv_on_rx_offer_cb_param param;
+
+            param.offer = sdp_info->sdp;
+            param.rdata = rdata;
+            (*mod_inv.cb.on_rx_offer2)(inv, &param);
+        } else if (mod_inv.cb.on_rx_offer && inv->notify) {
+            (*mod_inv.cb.on_rx_offer)(inv, sdp_info->sdp);
         }