Changeset 2661 for pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

Timestamp:

Apr 28, 2009 10:19:49 PM (16 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/pjsip-simple/publishc.c (modified) (6 diffs)

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

@@ -82 +82 @@
     pj_uint32_t                  expires;
     pjsip_route_hdr              route_set;
+    pjsip_hdr                    usr_hdr;
 
     /* Authorization sessions. */
@@ -158 +159 @@
 
     pj_list_init(&pubc->route_set);
+    pj_list_init(&pubc->usr_hdr);
 
     /* Done */
@@ -187 +189 @@
 static void set_expires( pjsip_publishc *pubc, pj_uint32_t expires)
 {
-    if (expires != pubc->expires) {
+    if (expires != pubc->expires && 
+        expires != PJSIP_PUBC_EXPIRATION_NOT_SPECIFIED) 
+    {
         pubc->expires_hdr = pjsip_expires_hdr_create(pubc->pool, expires);
     } else {
@@ -277 +281 @@
         pj_list_push_back(&pubc->route_set, pjsip_hdr_clone(pubc->pool, chdr));
         chdr = chdr->next;
+    }
+
+    return PJ_SUCCESS;
+}
+
+PJ_DEF(pj_status_t) pjsip_publishc_set_headers( pjsip_publishc *pubc,
+                                                const pjsip_hdr *hdr_list)
+{
+    const pjsip_hdr *h;
+
+    PJ_ASSERT_RETURN(pubc && hdr_list, PJ_EINVAL);
+
+    pj_list_init(&pubc->usr_hdr);
+    h = hdr_list->next;
+    while (h != hdr_list) {
+        pj_list_push_back(&pubc->usr_hdr, pjsip_hdr_clone(pubc->pool, h));
+        h = h->next;
     }
 
@@ -346 +367 @@
     }
 
+    /* Add user headers */
+    if (!pj_list_empty(&pubc->usr_hdr)) {
+        const pjsip_hdr *hdr;
+
+        hdr = pubc->usr_hdr.next;
+        while (hdr != &pubc->usr_hdr) {
+            pjsip_hdr *new_hdr = (pjsip_hdr*)
+                                 pjsip_hdr_shallow_clone(tdata->pool, hdr);
+            pjsip_msg_add_hdr(tdata->msg, new_hdr);
+            hdr = hdr->next;
+        }
+    }
+
 
     /* Done. */
@@ -531 +565 @@
                       pjsip_msg_find_hdr(msg, PJSIP_H_EXPIRES, NULL);
 
-            if (expires)
+            if (pubc->auto_refresh && expires)
                 expiration = expires->ivalue;