Changeset 4172 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Jun 19, 2012 2:35:18 PM (12 years ago)

Author:

nanang

Message:

Close #1540:

• added pjsua_acc_config.mwi_expires, also compile-time macro PJSIP_MWI_DEFAULT_EXPIRES
• updated pjsua_acc_modify() to update MWI subscription when mwi_expires & mwi_enabled of pjsua_acc_config is modified

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (5 diffs)

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

@@ -470 +470 @@
         /* Otherwise subscribe to MWI, if it's enabled */
         if (pjsua_var.acc[id].cfg.mwi_enabled)
-            pjsua_start_mwi(&pjsua_var.acc[id]);
+            pjsua_start_mwi(id, PJ_TRUE);
     }
 
@@ -680 +680 @@
     pj_bool_t update_reg = PJ_FALSE;
     pj_bool_t unreg_first = PJ_FALSE;
+    pj_bool_t update_mwi = PJ_FALSE;
     pj_status_t status = PJ_SUCCESS;
 
@@ -839 +840 @@
 
     /* MWI */
-    acc->cfg.mwi_enabled = cfg->mwi_enabled;
+    if (acc->cfg.mwi_enabled != cfg->mwi_enabled) {
+        acc->cfg.mwi_enabled = cfg->mwi_enabled;
+        update_mwi = PJ_TRUE;
+    }
+    if (acc->cfg.mwi_expires != cfg->mwi_expires && cfg->mwi_expires > 0) {
+        acc->cfg.mwi_expires = cfg->mwi_expires;
+        update_mwi = PJ_TRUE;
+    }
 
     /* PIDF tuple ID */
@@ -1133 +1141 @@
         if (acc->cfg.reg_uri.slen)
             pjsua_acc_set_registration(acc->index, PJ_TRUE);
-        else {
-            /* Otherwise subscribe to MWI, if it's enabled */
-            if (acc->cfg.mwi_enabled)
-                pjsua_start_mwi(acc);
-        }
+    }
+
+    /* Update MWI subscription */
+    if (update_mwi) {
+        pjsua_start_mwi(acc_id, PJ_TRUE);
     }
 
@@ -1876 +1884 @@
             /* Subscribe to MWI, if it's enabled */
             if (acc->cfg.mwi_enabled)
-                pjsua_start_mwi(acc);
+                pjsua_start_mwi(acc->index, PJ_FALSE);
         }