Changeset 119 for pjproject/trunk/pjsip/src/pjsip/sip_uri.c

Timestamp:

Jan 10, 2006 1:31:40 PM (18 years ago)

Author:

bennylp

Message:

Renamed pjsip_url to pjsip_sip_uri

File:

• pjproject/trunk/pjsip/src/pjsip/sip_uri.c (modified) (13 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_uri.c

@@ -112 +112 @@
         }
         p = p->next;
+        if (sep == '?') sep = '&';
     } while (p != param_list);
 
@@ -123 +124 @@
 #define IS_SIPS(url)    ((url)->vptr==&sips_url_vptr)
 
-static const pj_str_t *pjsip_url_get_scheme( const pjsip_url* );
-static const pj_str_t *pjsips_url_get_scheme( const pjsip_url* );
+static const pj_str_t *pjsip_url_get_scheme( const pjsip_sip_uri* );
+static const pj_str_t *pjsips_url_get_scheme( const pjsip_sip_uri* );
 static const pj_str_t *pjsip_name_addr_get_scheme( const pjsip_name_addr * );
 static void *pjsip_get_uri( pjsip_uri *uri );
@@ -147 +148 @@
                                      const pjsip_name_addr *naddr2);
 static int pjsip_url_print(  pjsip_uri_context_e context,
-                             const pjsip_url *url, 
+                             const pjsip_sip_uri *url, 
                              char *buf, pj_size_t size);
 static int pjsip_url_compare( pjsip_uri_context_e context,
-                              const pjsip_url *url1, const pjsip_url *url2);
-static pjsip_url* pjsip_url_clone(pj_pool_t *pool, const pjsip_url *rhs);
+                              const pjsip_sip_uri *url1, 
+                              const pjsip_sip_uri *url2);
+static pjsip_sip_uri* pjsip_url_clone(pj_pool_t *pool, 
+                                      const pjsip_sip_uri *rhs);
 
 static pjsip_uri_vptr sip_url_vptr = 
@@ -180 +183 @@
 };
 
-static const pj_str_t *pjsip_url_get_scheme(const pjsip_url *url)
+static const pj_str_t *pjsip_url_get_scheme(const pjsip_sip_uri *url)
 {
     PJ_UNUSED_ARG(url);
@@ -186 +189 @@
 }
 
-static const pj_str_t *pjsips_url_get_scheme(const pjsip_url *url)
+static const pj_str_t *pjsips_url_get_scheme(const pjsip_sip_uri *url)
 {
     PJ_UNUSED_ARG(url);
@@ -202 +205 @@
 }
 
-PJ_DEF(void) pjsip_url_init(pjsip_url *url, int secure)
+PJ_DEF(void) pjsip_url_init(pjsip_sip_uri *url, int secure)
 {
     pj_memset(url, 0, sizeof(*url));
@@ -211 +214 @@
 }
 
-PJ_DEF(pjsip_url*) pjsip_url_create( pj_pool_t *pool, int secure )
-{
-    pjsip_url *url = pj_pool_alloc(pool, sizeof(pjsip_url));
+PJ_DEF(pjsip_sip_uri*) pjsip_url_create( pj_pool_t *pool, int secure )
+{
+    pjsip_sip_uri *url = pj_pool_alloc(pool, sizeof(pjsip_sip_uri));
     pjsip_url_init(url, secure);
     return url;
@@ -219 +222 @@
 
 static int pjsip_url_print(  pjsip_uri_context_e context,
-                             const pjsip_url *url, 
+                             const pjsip_sip_uri *url, 
                              char *buf, pj_size_t size)
 {
@@ -226 +229 @@
     char *endbuf = buf+size;
     const pj_str_t *scheme;
-    pjsip_param *param;
-    char hparam_char = '?';
 
     *buf = '\0';
@@ -318 +319 @@
     buf += printed;
 
-    /* Header param. */
-    param = url->header_param.next;
-    while (param != &url->header_param) {
-        if (endbuf - buf < param->name.slen+2)
+    /* Header param. 
+     * Header param is only allowed in these contexts:
+     *  - PJSIP_URI_IN_CONTACT_HDR
+     *  - PJSIP_URI_IN_OTHER
+     */
+    if (context == PJSIP_URI_IN_CONTACT_HDR || context == PJSIP_URI_IN_OTHER) {
+        printed = pjsip_param_print_on(&url->header_param, buf, endbuf-buf,
+                                       &pjsip_HDR_CHAR_SPEC, 
+                                       &pjsip_HDR_CHAR_SPEC, '?');
+        if (printed < 0)
             return -1;
-        *buf++ = hparam_char;
-        copy_advance_escape(buf, param->name, pjsip_HDR_CHAR_SPEC);
-        if (param->value.slen) {
-            *buf++ = '=';
-            copy_advance_escape(buf, param->value, pjsip_HDR_CHAR_SPEC);
-        }
-        param = param->next;
-        hparam_char = '&';
+        buf += printed;
     }
 
@@ -338 +338 @@
 
 static pj_status_t pjsip_url_compare( pjsip_uri_context_e context,
-                                      const pjsip_url *url1, 
-                                      const pjsip_url *url2)
+                                      const pjsip_sip_uri *url1, 
+                                      const pjsip_sip_uri *url2)
 {
     const pjsip_param *p1;
@@ -466 +466 @@
 
 
-PJ_DEF(void) pjsip_url_assign(pj_pool_t *pool, pjsip_url *url, 
-                              const pjsip_url *rhs)
+PJ_DEF(void) pjsip_url_assign(pj_pool_t *pool, pjsip_sip_uri *url, 
+                              const pjsip_sip_uri *rhs)
 {
     pj_strdup( pool, &url->user, &rhs->user);
@@ -483 +483 @@
 }
 
-static pjsip_url* pjsip_url_clone(pj_pool_t *pool, const pjsip_url *rhs)
-{
-    pjsip_url *url = pj_pool_alloc(pool, sizeof(pjsip_url));
+static pjsip_sip_uri* pjsip_url_clone(pj_pool_t *pool, const pjsip_sip_uri *rhs)
+{
+    pjsip_sip_uri *url = pj_pool_alloc(pool, sizeof(pjsip_sip_uri));
     if (!url)
         return NULL;