Changeset 4180 for pjproject/trunk

Timestamp:

Jun 26, 2012 9:37:41 AM (12 years ago)

Author:

ming

Message:

Re #1540: Modify MWI subscription setting on run-time

• Add subscription state callback
• Terminate subscription when deleting acc

Location:

pjproject/trunk/pjsip

Files:

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

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

@@ -1171 +1171 @@
 
     /**
+     * This callback is called when message waiting indication subscription
+     * state has changed. Application can then query the subscription state
+     * by calling #pjsip_evsub_get_state().
+     *
+     * @param acc_id    The account ID.
+     * @param evsub     The subscription instance.
+     */
+    void (*on_mwi_state)(pjsua_acc_id acc_id, pjsip_evsub *evsub);
+
+    /**
      * This callback is called when a NOTIFY request for message summary / 
      * message waiting indication is received.

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

@@ -611 +611 @@
         }
         acc->regc = NULL;
+    }
+
+    /* Terminate mwi subscription */
+    if (acc->cfg.mwi_enabled) {
+        acc->cfg.mwi_enabled = PJ_FALSE;
+        pjsua_start_mwi(acc_id, PJ_FALSE);
     }
 

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

@@ -1959 +1959 @@
               pjsip_evsub_get_state_name(sub)));
 
+    /* Call callback */
+    if (pjsua_var.ua_cfg.cb.on_mwi_state) {
+        (*pjsua_var.ua_cfg.cb.on_mwi_state)(acc->index, sub);
+    }
+
     if (pjsip_evsub_get_state(sub) == PJSIP_EVSUB_STATE_TERMINATED) {
         /* Clear subscription */