Changeset 4172 for pjproject/trunk

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

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (1 diff)
• include/pjsua-lib/pjsua.h (modified) (1 diff)
• include/pjsua-lib/pjsua_internal.h (modified) (1 diff)
• src/pjsip-simple/mwi.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_acc.c (modified) (5 diffs)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• src/pjsua-lib/pjsua_pres.c (modified) (9 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -995 +995 @@
 
 
+/**
+ * Specify the default expiration time for Message Waiting Indication
+ * (RFC 3842) event subscription, for both client and server subscription.
+ * For client subscription, application can override this by specifying
+ * positive non-zero value in "expires" parameter when calling
+ * #pjsip_mwi_initiate(). For server subscription, we would take the
+ * expiration value from the Expires header sent by client in the SUBSCRIBE
+ * request if the header exists and its value is less than  this setting,
+ * otherwise this setting will be used.
+ *
+ * Default: 3600 seconds
+ */
+#ifndef PJSIP_MWI_DEFAULT_EXPIRES
+#   define PJSIP_MWI_DEFAULT_EXPIRES            3600
+#endif
+
+
 PJ_END_DECL
 

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

@@ -2616 +2616 @@
 
     /**
+     * Specify the default expiration time for Message Waiting Indication
+     * (RFC 3842) event subscription. This must not be zero.
+     *
+     * Default: PJSIP_MWI_DEFAULT_EXPIRES
+     */
+    unsigned        mwi_expires;
+
+    /**
      * If this flag is set, the presence information of this account will
      * be PUBLISH-ed to the server where the account belongs.

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

@@ -671 +671 @@
  * Start MWI subscription
  */
-void pjsua_start_mwi(pjsua_acc *acc);
+pj_status_t pjsua_start_mwi(pjsua_acc_id acc_id, pj_bool_t force_renew);
 
 /**

pjproject/trunk/pjsip/src/pjsip-simple/mwi.c

@@ -33 +33 @@
 
 #define THIS_FILE                   "mwi.c"
-#define MWI_DEFAULT_EXPIRES         3600
 
  /*
@@ -139 +138 @@
     /* Register event package to event module. */
     status = pjsip_evsub_register_pkg( &mod_mwi, &STR_MWI, 
-                                       MWI_DEFAULT_EXPIRES, 
+                                       PJSIP_MWI_DEFAULT_EXPIRES, 
                                        PJ_ARRAY_SIZE(accept), accept);
     if (status != PJ_SUCCESS) {

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);
         }
 

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

@@ -238 +238 @@
     cfg->call_hold_type = PJSUA_CALL_HOLD_TYPE_DEFAULT;
     cfg->register_on_acc_add = PJ_TRUE;
+    cfg->mwi_expires = PJSIP_MWI_DEFAULT_EXPIRES;
 }
 

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);
     }