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

Timestamp:

Dec 2, 2007 3:40:52 PM (16 years ago)

Author:

bennylp

Message:

More ticket #421: fixed SIP messaging components to support IPv6 format

File:

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

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

@@ -266 +266 @@
     /* Print host. */
     pj_assert(url->host.slen != 0);
-    copy_advance_check(buf, url->host);
+    /* Detect IPv6 IP address */
+    if (pj_memchr(url->host.ptr, ':', url->host.slen)) {
+        copy_advance_pair_quote_cond(buf, "", 0, url->host, '[', ']');
+    } else {
+        copy_advance_check(buf, url->host);
+    }
 
     /* Only print port if it is explicitly specified. 
@@ -312 +317 @@
 
     /* maddr param is not allowed in From and To header. */
-    if (context != PJSIP_URI_IN_FROMTO_HDR) {
-        copy_advance_pair_escape(buf, ";maddr=", 7, url->maddr_param,
-                                 pc->pjsip_PARAM_CHAR_SPEC);
+    if (context != PJSIP_URI_IN_FROMTO_HDR && url->maddr_param.slen) {
+        /* Detect IPv6 IP address */
+        if (pj_memchr(url->maddr_param.ptr, ':', url->maddr_param.slen)) {
+            copy_advance_pair_quote_cond(buf, ";maddr=", 7, url->maddr_param,
+                                         '[', ']');
+        } else {
+            copy_advance_pair_escape(buf, ";maddr=", 7, url->maddr_param,
+                                     pc->pjsip_PARAM_CHAR_SPEC);
+        }
     }