Changeset 4534

Timestamp:

Jun 13, 2013 8:56:51 AM (11 years ago)

Author:

nanang

Message:

Close #1675: Added callback to allow application to specify account to handle incoming message.

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -1277 +1277 @@
                                                     unsigned flags);
 
+    /**
+     * This callback can be used by application to override the account
+     * to be used to handle an incoming message. Initially, the account to
+     * be used will be calculated automatically by the library. This initial
+     * account will be used if application does not implement this callback,
+     * or application sets an invalid account upon returning from this
+     * callback.
+     *
+     * Note that currently the incoming messages requiring account assignment
+     * are INVITE, MESSAGE, SUBSCRIBE, and unsolicited NOTIFY. This callback
+     * may be called before the callback of the SIP event itself, i.e:
+     * incoming call, pager, subscription, or unsolicited-event.
+     *
+     * @param rdata     The incoming message.
+     * @param acc_id    On input, initial account ID calculated automatically
+     *                  by the library. On output, the account ID prefered
+     *                  by application to handle the incoming message.
+     */
+    void (*on_acc_find_for_incoming)(const pjsip_rx_data *rdata,
+                                     pjsua_acc_id* acc_id);
+
 } pjsua_callback;
 

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

@@ -2618 +2618 @@
     pjsip_uri *uri;
     pjsip_sip_uri *sip_uri;
+    pjsua_acc_id id = PJSUA_INVALID_ID;
     unsigned i;
 
@@ -2624 +2625 @@
 
     uri = rdata->msg_info.to->uri;
+
+    PJSUA_LOCK();
 
     /* Use Req URI if To URI is not SIP */
@@ -2632 +2635 @@
             uri = rdata->msg_info.msg->line.req.uri;
         else
-            return pjsua_var.default_acc;
+            goto on_return;
     }
 
@@ -2639 +2642 @@
         !PJSIP_URI_SCHEME_IS_SIPS(uri)) 
     {
-        return pjsua_var.default_acc;
-    }
-
-
-    PJSUA_LOCK();
+        goto on_return;
+    }
 
     sip_uri = (pjsip_sip_uri*)pjsip_uri_get_uri(uri);
@@ -2656 +2656 @@
         {
             /* Match ! */
-            PJSUA_UNLOCK();
-            return acc_id;
+            id = acc_id;
+            goto on_return;
         }
     }
@@ -2668 +2668 @@
         if (acc->valid && pj_stricmp(&acc->srv_domain, &sip_uri->host)==0) {
             /* Match ! */
-            PJSUA_UNLOCK();
-            return acc_id;
+            id = acc_id;
+            goto on_return;
         }
     }
@@ -2691 +2691 @@
 
             /* Match ! */
-            PJSUA_UNLOCK();
-            return acc_id;
-        }
-    }
+            id = acc_id;
+            goto on_return;
+        }
+    }
+
+on_return:
+    PJSUA_UNLOCK();
 
     /* Still no match, use default account */
-    PJSUA_UNLOCK();
-    return pjsua_var.default_acc;
+    if (id == PJSUA_INVALID_ID)
+        id = pjsua_var.default_acc;
+
+    /* Invoke account find callback */
+    if (pjsua_var.ua_cfg.cb.on_acc_find_for_incoming)
+        (*pjsua_var.ua_cfg.cb.on_acc_find_for_incoming)(rdata, &id);
+
+    /* Verify if the specified account id is valid */
+    if (!pjsua_acc_is_valid(id))
+        id = pjsua_var.default_acc;
+
+    return id;
 }