Changeset 3322 for pjproject

Timestamp:

Sep 28, 2010 4:57:01 AM (14 years ago)

Author:

nanang

Message:

Close #1138:

• Added new pjsua registration status callback on_reg_state2(), it includes the whole info from the lower layer registration callback pjsip_regc_cb().

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -412 +412 @@
 
 /**
+ * Structure to be passed on registration callback.
+ */
+typedef struct pjsua_reg_info
+{
+    struct pjsip_regc_cbparam   *cbparam;   /**< Parameters returned by 
+                                                 registration callback. */
+} pjsua_reg_info;
+
+
+/**
  * This structure describes application callback to receive various event
  * notification from PJSUA-API. All of these callbacks are OPTIONAL, 
@@ -583 +593 @@
      * registration details.
      *
-     * @param acc_id        Account ID.
+     * @param acc_id        The account ID.
      */
     void (*on_reg_state)(pjsua_acc_id acc_id);
+
+    /**
+     * Notify application when registration status has changed.
+     * Application may inspect the registration info to get the
+     * registration status details.
+     *
+     * @param acc_id        The account ID.
+     * @param info          The registration info.
+     */
+    void (*on_reg_state2)(pjsua_acc_id acc_id, pjsua_reg_info *info);
 
     /**

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

@@ -1514 +1514 @@
     }
 
-    if (pjsua_var.ua_cfg.cb.on_reg_state)
+    /* Call the registration status callback */
+
+    if (pjsua_var.ua_cfg.cb.on_reg_state) {
         (*pjsua_var.ua_cfg.cb.on_reg_state)(acc->index);
-
+    }
+
+    if (pjsua_var.ua_cfg.cb.on_reg_state2) {
+        pjsua_reg_info reg_info;
+
+        reg_info.cbparam = param;
+        (*pjsua_var.ua_cfg.cb.on_reg_state2)(acc->index, &reg_info);
+    }
+    
     PJSUA_UNLOCK();
 }