Changeset 4999 for pjproject/trunk

Timestamp:

Mar 19, 2015 4:59:23 AM (10 years ago)

Author:

riza

Message:

Re #1825: Implement new on_reg_started2 callback

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -478 +478 @@
     struct pjsip_regc_cbparam   *cbparam;   /**< Parameters returned by
                                                  registration callback. */
+    pjsip_regc                  *regc;      /**< Client registration 
+                                                 structure. */  
+    pj_bool_t                    renew;     /**< Non-zero for registration and 
+                                                 zero for unregistration. */
 } pjsua_reg_info;
 
@@ -908 +912 @@
      */
     void (*on_reg_started)(pjsua_acc_id acc_id, pj_bool_t renew);
+
+    /**
+     * This is the alternative version of the \a on_reg_started() callback with
+     * \a pjsua_reg_info argument.
+     *
+     * @param acc_id        The account ID.
+     * @param info          The registration info.
+     */
+    void (*on_reg_started2)(pjsua_acc_id acc_id, 
+                            pjsua_reg_info *info);
     
     /**

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

@@ -2280 +2280 @@
     if (pjsua_var.ua_cfg.cb.on_reg_state2) {
         pjsua_reg_info reg_info;
-
+        pjsip_regc_info rinfo;
+
+        pjsip_regc_get_info(param->regc, &rinfo);
         reg_info.cbparam = param;
+        reg_info.regc = param->regc;
+        reg_info.renew = (rinfo.interval != 0);
         (*pjsua_var.ua_cfg.cb.on_reg_state2)(acc->index, &reg_info);
     }
@@ -2589 +2593 @@
         if (pjsua_var.ua_cfg.cb.on_reg_started) {
             (*pjsua_var.ua_cfg.cb.on_reg_started)(acc_id, renew);
+        }
+        if (pjsua_var.ua_cfg.cb.on_reg_started2) {
+            pjsua_reg_info rinfo;
+
+            rinfo.cbparam = NULL;
+            rinfo.regc = pjsua_var.acc[acc_id].regc;
+            rinfo.renew = renew;
+            (*pjsua_var.ua_cfg.cb.on_reg_started2)(acc_id, &rinfo);
         }
     }