Changeset 799 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

Timestamp:

Nov 11, 2006 9:25:55 PM (18 years ago)

Author:

bennylp

Message:

Add pjsip_regc_add_headers() APi to set headers to be added
to the REGISTER request. This solves the problem where headers

registered in the initial REGISTER request (such as User-Agent
header) are not sent in subsequent reregistration request.

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -66 +66 @@
     pj_uint32_t                  expires;
     pjsip_route_hdr              route_set;
+    pjsip_hdr                    hdr_list;
 
     /* Authorization sessions. */
@@ -107 +108 @@
 
     pj_list_init(&regc->route_set);
+    pj_list_init(&regc->hdr_list);
 
     /* Done */
@@ -308 +310 @@
 }
 
+PJ_DEF(pj_status_t) pjsip_regc_add_headers( pjsip_regc *regc,
+                                            const pjsip_hdr *hdr_list)
+{
+    const pjsip_hdr *hdr;
+
+    PJ_ASSERT_RETURN(regc && hdr_list, PJ_EINVAL);
+
+    //This is "add" operation, so don't remove headers.
+    //pj_list_init(&regc->hdr_list);
+
+    hdr = hdr_list->next;
+    while (hdr != hdr_list) {
+        pj_list_push_back(&regc->hdr_list, pjsip_hdr_clone(regc->pool, hdr));
+        hdr = hdr->next;
+    }
+
+    return PJ_SUCCESS;
+}
+
 static pj_status_t create_request(pjsip_regc *regc, 
                                   pjsip_tx_data **p_tdata)
@@ -348 +369 @@
             route_pos = new_hdr;
             route = route->next;
+        }
+    }
+
+    /* Add additional request headers */
+    if (!pj_list_empty(&regc->hdr_list)) {
+        const pjsip_hdr *hdr;
+
+        hdr = regc->hdr_list.next;
+        while (hdr != &regc->hdr_list) {
+            pjsip_hdr *new_hdr = pjsip_hdr_shallow_clone(tdata->pool, hdr);
+            pjsip_msg_add_hdr(tdata->msg, new_hdr);
+            hdr = hdr->next;
         }
     }