Changeset 4172 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.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_pres.c (modified) (9 diffs)

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

@@ -2012 +2012 @@
 };
 
-void pjsua_start_mwi(pjsua_acc *acc)
-{
+pj_status_t pjsua_start_mwi(pjsua_acc_id acc_id, pj_bool_t force_renew)
+{
+    pjsua_acc *acc;
     pj_pool_t *tmp_pool = NULL;
     pj_str_t contact;
     pjsip_tx_data *tdata;
-    pj_status_t status;
+    pj_status_t status = PJ_SUCCESS;
+
+    PJ_ASSERT_RETURN(acc_id>=0 && acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc)
+                     && pjsua_var.acc[acc_id].valid, PJ_EINVAL);
+
+    acc = &pjsua_var.acc[acc_id];
 
     if (!acc->cfg.mwi_enabled) {
         if (acc->mwi_sub) {
             /* Terminate MWI subscription */
-            pjsip_tx_data *tdata;
             pjsip_evsub *sub = acc->mwi_sub;
 
@@ -2036 +2041 @@
             }
         }
-        return;
-    }
-
+        return status;
+    }
+
+    /* Subscription is already active */
     if (acc->mwi_sub) {
-        /* Subscription is already active */
-        return;
-
+        if (!force_renew)
+            return PJ_SUCCESS;
+        
+        /* Update MWI subscription */
+        pj_assert(acc->mwi_dlg);
+        pjsip_dlg_inc_lock(acc->mwi_dlg);
+        
+        status = pjsip_mwi_initiate(acc->mwi_sub, acc->cfg.mwi_expires, &tdata);
+        if (status == PJ_SUCCESS) {
+            pjsua_process_msg_data(tdata, NULL);
+            status = pjsip_pres_send_request(acc->mwi_sub, tdata);
+        }
+
+        pjsip_dlg_dec_lock(acc->mwi_dlg);
+        return status;
     }
 
@@ -2060 +2078 @@
             pjsua_perror(THIS_FILE, "Unable to generate Contact header", 
                          status);
-            pj_pool_release(tmp_pool);
-            pj_log_pop_indent();
-            return;
+            goto on_return;
         }
     }
@@ -2074 +2090 @@
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Unable to create dialog", status);
-        if (tmp_pool) pj_pool_release(tmp_pool);
-        pj_log_pop_indent();
-        return;
+        goto on_return;
     }
 
@@ -2089 +2103 @@
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, "Error creating MWI subscription", status);
-        if (tmp_pool) pj_pool_release(tmp_pool);
         if (acc->mwi_dlg) pjsip_dlg_dec_lock(acc->mwi_dlg);
-        pj_log_pop_indent();
-        return;
+        goto on_return;
     }
 
@@ -2121 +2133 @@
     pjsip_evsub_set_mod_data(acc->mwi_sub, pjsua_var.mod.id, acc);
 
-    status = pjsip_mwi_initiate(acc->mwi_sub, -1, &tdata);
+    status = pjsip_mwi_initiate(acc->mwi_sub, acc->cfg.mwi_expires, &tdata);
     if (status != PJ_SUCCESS) {
         if (acc->mwi_dlg) pjsip_dlg_dec_lock(acc->mwi_dlg);
@@ -2131 +2143 @@
         pjsua_perror(THIS_FILE, "Unable to create initial MWI SUBSCRIBE", 
                      status);
-        if (tmp_pool) pj_pool_release(tmp_pool);
-        pj_log_pop_indent();
-        return;
+        goto on_return;
     }
 
@@ -2148 +2158 @@
         pjsua_perror(THIS_FILE, "Unable to send initial MWI SUBSCRIBE", 
                      status);
-        if (tmp_pool) pj_pool_release(tmp_pool);
-        pj_log_pop_indent();
-        return;
+        goto on_return;
     }
 
     pjsip_dlg_dec_lock(acc->mwi_dlg);
+
+on_return:
     if (tmp_pool) pj_pool_release(tmp_pool);
 
     pj_log_pop_indent();
+    return status;
 }
 
@@ -2270 +2281 @@
         /* Re-subscribe MWI subscription if it's terminated prematurely */
         if (acc->cfg.mwi_enabled && !acc->mwi_sub)
-            pjsua_start_mwi(acc);
+            pjsua_start_mwi(acc->index, PJ_FALSE);
     }