Changeset 3594

Timestamp:

Jun 22, 2011 8:00:20 AM (13 years ago)

Author:

bennylp

Message:

Closed #1313 (Account option to disable registration when account is added) and closed #1314 (New callback to notify application when registration or unregistration has been initiated). Thanks Tony Jago Million for the patch

Location:

pjproject/branches/1.x/pjsip

Files:

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

pjproject/branches/1.x/pjsip/include/pjsua-lib/pjsua.h

@@ -604 +604 @@
 
 
+    /**
+     * Notify application when registration or unregistration has been
+     * initiated. Note that this only notifies the initial registration
+     * and unregistration. Once registration session is active, subsequent
+     * refresh will not cause this callback to be called.
+     *
+     * @param acc_id        The account ID.
+     * @param renew         Non-zero for registration and zero for
+     *                      unregistration.
+     */
+    void (*on_reg_started)(pjsua_acc_id acc_id, pj_bool_t renew);
+    
     /**
      * Notify application when registration status has changed.
@@ -2553 +2565 @@
      */
     pjsua_call_hold_type call_hold_type;
+    
+    
+    /**
+     * Specify whether the account should register as soon as it is
+     * added to the UA. Application can set this to PJ_FALSE and control
+     * the registration manually with pjsua_acc_set_registration().
+     *
+     * Default: PJ_TRUE
+     */
+    pj_bool_t         register_on_acc_add;
 
 } pjsua_acc_config;

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -453 +453 @@
 
     /* If accounts has registration enabled, start registration */
-    if (pjsua_var.acc[id].cfg.reg_uri.slen)
-        pjsua_acc_set_registration(id, PJ_TRUE);
-    else {
+    if (pjsua_var.acc[id].cfg.reg_uri.slen) {
+        if (pjsua_var.acc[id].cfg.register_on_acc_add)
+            pjsua_acc_set_registration(id, PJ_TRUE);
+    } else {
         /* Otherwise subscribe to MWI, if it's enabled */
         if (pjsua_var.acc[id].cfg.mwi_enabled)
@@ -2010 +2011 @@
         pjsip_regc_get_info(pjsua_var.acc[acc_id].regc, &reg_info);
         pjsua_var.acc[acc_id].auto_rereg.reg_tp = reg_info.transport;
+        
+        if (pjsua_var.ua_cfg.cb.on_reg_started) {
+            (*pjsua_var.ua_cfg.cb.on_reg_started)(acc_id, renew);
+        }
     }
 

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_core.c

@@ -194 +194 @@
     pj_list_init(&cfg->sub_hdr_list);
     cfg->call_hold_type = PJSUA_CALL_HOLD_TYPE_DEFAULT;
+    cfg->register_on_acc_add = PJ_TRUE;
 }