Changeset 1363 for pjproject/trunk

Timestamp:

Jun 11, 2007 6:22:54 PM (17 years ago)

Author:

bennylp

Message:

Ticket #334: Added on_pager_status2() callback to receive the full SIP message of IM delivery status (thanks Paul Levin)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (2 diffs)
• src/pjsua-lib/pjsua_im.c (modified) (2 diffs)

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

@@ -799 +799 @@
     /**
      * Notify application about the delivery status of outgoing pager
-     * request.
+     * request. See also on_pager_status2() callback for the version with
+     * \a pjsip_rx_data in the argument list.
      *
      * @param call_id       Containts the ID of the call where the IM was
@@ -830 +831 @@
                             pjsip_status_code status,
                             const pj_str_t *reason);
+
+    /**
+     * Notify application about the delivery status of outgoing pager
+     * request.
+     *
+     * @param call_id       Containts the ID of the call where the IM was
+     *                      sent, or PJSUA_INVALID_ID if the IM was sent
+     *                      outside call context.
+     * @param to            Destination URI.
+     * @param body          Message body.
+     * @param user_data     Arbitrary data that was specified when sending
+     *                      IM message.
+     * @param status        Delivery status.
+     * @param reason        Delivery status reason.
+     * @param rdata         The incoming MESSAGE response, or NULL if the
+     *                      message transaction fails because of time out 
+     *                      or transport error.
+     */
+    void (*on_pager_status2)(pjsua_call_id call_id,
+                             const pj_str_t *to,
+                             const pj_str_t *body,
+                             void *user_data,
+                             pjsip_status_code status,
+                             const pj_str_t *reason,
+                             pjsip_rx_data *rdata);
 
     /**

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

@@ -353 +353 @@
         }
 
-        if (pjsua_var.ua_cfg.cb.on_pager_status)
+        if (pjsua_var.ua_cfg.cb.on_pager_status) {
             pjsua_var.ua_cfg.cb.on_pager_status(im_data->call_id, 
                                                 &im_data->to,
@@ -361 +361 @@
                                                     tsx->status_code,
                                                 &tsx->status_text);
+        }
+
+        if (pjsua_var.ua_cfg.cb.on_pager_status2) {
+            pjsip_rx_data *rdata;
+
+            if (e->body.tsx_state.type == PJSIP_EVENT_RX_MSG)
+                rdata = e->body.tsx_state.src.rdata;
+            else
+                rdata = NULL;
+
+            pjsua_var.ua_cfg.cb.on_pager_status2(im_data->call_id, 
+                                                 &im_data->to,
+                                                 &im_data->body,
+                                                 im_data->user_data,
+                                                 (pjsip_status_code) 
+                                                    tsx->status_code,
+                                                 &tsx->status_text,
+                                                 rdata);
+        }
     }
 }