Changeset 2371

Timestamp:

Nov 27, 2008 12:42:07 PM (15 years ago)

Author:

bennylp

Message:

More ticket #10: changed to signature of the redirection callbacks to make it more natural to use

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/include/pjsip-ua/sip_inv.h (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (2 diffs)
• pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2394 +2394 @@
  * Redirection handler.
  */
-static void call_on_redirected(pjsua_call_id call_id, const pjsip_uri *target,
-                               pjsip_redirect_op *cmd, const pjsip_event *e)
-{
-    *cmd = app_config.redir_op;
-
+static pjsip_redirect_op call_on_redirected(pjsua_call_id call_id, 
+                                            const pjsip_uri *target,
+                                            const pjsip_event *e)
+{
     PJ_UNUSED_ARG(e);
 
-    if (*cmd == PJSIP_REDIRECT_PENDING) {
+    if (app_config.redir_op == PJSIP_REDIRECT_PENDING) {
         char uristr[PJSIP_MAX_URL_SIZE];
         int len;
@@ -2416 +2415 @@
                   call_id, len, uristr));
     }
+
+    return app_config.redir_op;
 }
 

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

@@ -231 +231 @@
      * @param inv       The invite session.
      * @param target    The current target to be tried.
-     * @param cmd       Action to be performed for the target. Set this
+     * @param e         The event that caused this callback to be called.
+     *                  This could be the receipt of 3xx response, or
+     *                  4xx/5xx response received for the INVITE sent to
+     *                  subsequent targets, or NULL if this callback is
+     *                  called from within #pjsip_inv_process_redirect()
+     *                  context.
+     *
+     * @return          Action to be performed for the target. Set this
      *                  parameter to one of the value below:
      *                  - PJSIP_REDIRECT_ACCEPT: immediately accept the
-     *                    redirection (default value). When set, the
+     *                    redirection to this target. When set, the
      *                    session will immediately resend INVITE request
-     *                    to the target.
+     *                    to the target after this callback returns.
      *                  - PJSIP_REDIRECT_REJECT: immediately reject this
      *                    target. The session will continue retrying with
@@ -252 +259 @@
      *                    to either accept or reject the redirection upon
      *                    getting user decision.
-     * @param e         The event that caused this callback to be called.
-     *                  This could be the receipt of 3xx response, or
-     *                  4xx/5xx response received for the INVITE sent to
-     *                  subsequent targets, or NULL if this callback is
-     *                  called from within #pjsip_inv_process_redirect()
-     *                  context.
-     */
-    void (*on_redirected)(pjsip_inv_session *inv, const pjsip_uri *target,
-                          pjsip_redirect_op *cmd, const pjsip_event *e);
+     */
+    pjsip_redirect_op (*on_redirected)(pjsip_inv_session *inv, 
+                                       const pjsip_uri *target,
+                                       const pjsip_event *e);
 
 } pjsip_inv_callback;

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

@@ -1080 +1080 @@
      * @param call_id   The call ID.
      * @param target    The current target to be tried.
-     * @param cmd       Action to be performed for the target. Set this
+     * @param e         The event that caused this callback to be called.
+     *                  This could be the receipt of 3xx response, or
+     *                  4xx/5xx response received for the INVITE sent to
+     *                  subsequent targets, or NULL if this callback is
+     *                  called from within #pjsua_call_process_redirect()
+     *                  context.
+     *
+     * @return          Action to be performed for the target. Set this
      *                  parameter to one of the value below:
      *                  - PJSIP_REDIRECT_ACCEPT: immediately accept the
@@ -1101 +1108 @@
      *                    to either accept or reject the redirection upon
      *                    getting user decision.
-     * @param e         The event that caused this callback to be called.
-     *                  This could be the receipt of 3xx response, or
-     *                  4xx/5xx response received for the INVITE sent to
-     *                  subsequent targets, or NULL if this callback is
-     *                  called from within #pjsua_call_process_redirect()
-     *                  context.
-     */
-    void (*on_call_redirected)(pjsua_call_id call_id, const pjsip_uri *target,
-                               pjsip_redirect_op *cmd, const pjsip_event *e);
+     */
+    pjsip_redirect_op (*on_call_redirected)(pjsua_call_id call_id, 
+                                            const pjsip_uri *target,
+                                            const pjsip_event *e);
 
 } pjsua_callback;

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

@@ -1938 +1938 @@
                                  const pj_str_t *reason, pjsip_event *e)
 {
-    pjsip_redirect_op op = PJSIP_REDIRECT_ACCEPT;
+    pjsip_redirect_op op;
     pjsip_target *target;
 
@@ -1981 +1981 @@
     pjsip_target_set_set_current(&inv->dlg->target_set, target);
 
-    (*mod_inv.cb.on_redirected)(inv, target->uri, &op, e);
+    op = (*mod_inv.cb.on_redirected)(inv, target->uri, e);
 
 

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

@@ -69 +69 @@
  * Redirection handler.
  */
-static void pjsua_call_on_redirected(pjsip_inv_session *inv, 
-                                     const pjsip_uri *target,
-                                     pjsip_redirect_op *cmd, 
-                                     const pjsip_event *e);
+static pjsip_redirect_op pjsua_call_on_redirected(pjsip_inv_session *inv,
+                                                  const pjsip_uri *target,
+                                                  const pjsip_event *e);
 
 
@@ -3815 +3814 @@
 
 /* Redirection handler */
-static void pjsua_call_on_redirected(pjsip_inv_session *inv, 
-                                     const pjsip_uri *target,
-                                     pjsip_redirect_op *cmd, 
-                                     const pjsip_event *e)
+static pjsip_redirect_op pjsua_call_on_redirected(pjsip_inv_session *inv,
+                                                  const pjsip_uri *target,
+                                                  const pjsip_event *e)
 {
     pjsua_call *call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id];
+    pjsip_redirect_op op;
 
     PJSUA_LOCK();
 
     if (pjsua_var.ua_cfg.cb.on_call_redirected) {
-        (*pjsua_var.ua_cfg.cb.on_call_redirected)(call->index, target, cmd, e);
+        op = (*pjsua_var.ua_cfg.cb.on_call_redirected)(call->index, 
+                                                         target, e);
     } else {
         PJ_LOG(4,(THIS_FILE, "Unhandled redirection for call %d "
@@ -3831 +3831 @@
                   "call.",
                   call->index));
-        *cmd = PJSIP_REDIRECT_STOP;
+        op = PJSIP_REDIRECT_STOP;
     }
 
     PJSUA_UNLOCK();
-}
-
+
+    return op;
+}
+