Changeset 1285 for pjproject/trunk

Timestamp:

May 21, 2007 1:48:35 PM (18 years ago)

Author:

bennylp

Message:

Ticket #283: Added another pjsua IM callback with the message passed as argument (thanks Paul Levin)

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -749 +749 @@
      * existing call.
      *
+     * See also \a on_pager2() callback for the version with \a pjsip_rx_data
+     * passed as one of the argument.
+     *
      * @param call_id       Containts the ID of the call where the IM was
      *                      sent, or PJSUA_INVALID_ID if the IM was sent
@@ -774 +777 @@
                      const pj_str_t *to, const pj_str_t *contact,
                      const pj_str_t *mime_type, const pj_str_t *body);
+
+    /**
+     * This is the alternative version of the \a on_pager() callback with
+     * \a pjsip_rx_data argument.
+     *
+     * @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 from          URI of the sender.
+     * @param to            URI of the destination message.
+     * @param contact       The Contact URI of the sender, if present.
+     * @param mime_type     MIME type of the message.
+     * @param body          The message content.
+     * @param rdata         The incoming MESSAGE request.
+     */
+    void (*on_pager2)(pjsua_call_id call_id, const pj_str_t *from,
+                      const pj_str_t *to, const pj_str_t *contact,
+                      const pj_str_t *mime_type, const pj_str_t *body,
+                      pjsip_rx_data *rdata);
 
     /**

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

@@ -210 +210 @@
                                             &mime_type, &text_body);
         }
-    }
-
+
+        if (pjsua_var.ua_cfg.cb.on_pager2) {
+            (*pjsua_var.ua_cfg.cb.on_pager2)(call_id, from, to, &contact, 
+                                             &mime_type, &text_body, rdata);
+        }
+    }
 }