Changeset 3326 for pjproject/trunk

Timestamp:

Sep 28, 2010 10:48:48 AM (14 years ago)

Author:

nanang

Message:

Close #1137: added field reg_hdr_list into pjsua_acc_config to specify custom headers for REGISTER requests of the account.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)

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

@@ -2079 +2079 @@
     pj_str_t        reg_uri;
 
+    /** 
+     * The optional custom SIP headers to be put in the registration
+     * request.
+     */
+    pjsip_hdr       reg_hdr_list;
+
     /**
      * Subscribe to message waiting indication events (RFC 3842).

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

@@ -90 +90 @@
     for (i=0; i<src->cred_count; ++i) {
         pjsip_cred_dup(pool, &dst->cred_info[i], &src->cred_info[i]);
+    }
+
+    pj_list_init(&dst->reg_hdr_list);
+    if (!pj_list_empty(&src->reg_hdr_list)) {
+        const pjsip_hdr *hdr;
+
+        hdr = src->reg_hdr_list.next;
+        while (hdr != &src->reg_hdr_list) {
+            pj_list_push_back(&dst->reg_hdr_list, pjsip_hdr_clone(pool, hdr));
+            hdr = hdr->next;
+        }
     }
 
@@ -1657 +1668 @@
             pjsip_regc_set_route_set( acc->regc, &route_set );
     }
+
+    /* Add custom request headers specified in the account config */
+    pjsip_regc_add_headers(acc->regc, &acc->cfg.reg_hdr_list);
 
     /* Add other request headers. */

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

@@ -189 +189 @@
     cfg->use_stream_ka = (PJMEDIA_STREAM_ENABLE_KA != 0);
 #endif
+    pj_list_init(&cfg->reg_hdr_list);
 }