Changeset 2371 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

Timestamp:

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

Author:

bennylp

Message:

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

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c (modified) (3 diffs)

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;
+}
+