Changeset 2661 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

Timestamp:

Apr 28, 2009 10:19:49 PM (15 years ago)

Author:

bennylp

Message:

Ticket #760: Enhancements to PUBLISH management (thanks Johan Lantz for the suggestion)

• Changes in PJSUA-LIB
  • retry with fresh request on 412/Conditional Request Failed response
  • changed default Expires in PUBLISH request to none (we will not put Expires), to avoid getting 423/Interval Too Brief response
  • if the PUBLISH fails for any reason, it will be retried on every PJSUA_PRES_TIMER (default 300 seconds), similar to how failed SUBSCRIBE will be retried
• Changes to publish.h:
  • added API to add headers in every PUBLISH request
• Added test scenario in Python unit tests

File:

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

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

@@ -962 +962 @@
 
     if (param->code/100 != 2 || param->status != PJ_SUCCESS) {
+
+        pjsip_publishc_destroy(param->pubc);
+        acc->publish_sess = NULL;
+
         if (param->status != PJ_SUCCESS) {
             char errmsg[PJ_ERR_MSG_SIZE];
@@ -969 +973 @@
                       "Client publication (PUBLISH) failed, status=%d, msg=%s",
                        param->status, errmsg));
+        } else if (param->code == 412) {
+            /* 412 (Conditional Request Failed)
+             * The PUBLISH refresh has failed, retry with new one.
+             */
+            pjsua_pres_init_publish_acc(acc->index);
+            
         } else {
             PJ_LOG(1,(THIS_FILE, 
@@ -976 +986 @@
         }
 
-        pjsip_publishc_destroy(param->pubc);
-        acc->publish_sess = NULL;
+    } else {
+        if (param->expiration == -1) {
+            /* Could happen if server "forgot" to include Expires header
+             * in the response. We will not renew, so destroy the pubc.
+             */
+            pjsip_publishc_destroy(param->pubc);
+            acc->publish_sess = NULL;
+        }
     }
 }
@@ -1092 +1108 @@
                                      &acc_cfg->id, &acc_cfg->id,
                                      &acc_cfg->id, 
-                                     PJSUA_PRES_TIMER);
+                                     PJSUA_PUBLISH_EXPIRATION);
         if (status != PJ_SUCCESS) {
             acc->publish_sess = NULL;
@@ -1607 +1623 @@
                           pj_timer_entry *entry)
 {
+    unsigned i;
     pj_time_val delay = { PJSUA_PRES_TIMER, 0 };
+
+    /* Retry failed PUBLISH requests */
+    for (i=0; i<PJ_ARRAY_SIZE(pjsua_var.acc); ++i) {
+        pjsua_acc *acc = &pjsua_var.acc[i];
+        if (acc->cfg.publish_enabled && acc->publish_sess==NULL)
+            pjsua_pres_init_publish_acc(acc->index);
+    }
 
     entry->id = PJ_FALSE;