Changeset 1610 for pjproject/trunk/pjsip/src/pjsip/sip_msg.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_msg.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -1774 +1774 @@
     buf += hdr->transport.slen;
     *buf++ = ' ';
-    pj_memcpy(buf, hdr->sent_by.host.ptr, hdr->sent_by.host.slen);
-    buf += hdr->sent_by.host.slen;
+
+    /* Check if host contains IPv6 */
+    if (pj_memchr(hdr->sent_by.host.ptr, ':', hdr->sent_by.host.slen)) {
+        copy_advance_pair_quote_cond(buf, "", 0, hdr->sent_by.host, '[', ']');
+    } else {
+        copy_advance_check(buf, hdr->sent_by.host);
+    }
+
     if (hdr->sent_by.port != 0) {
         *buf++ = ':';
@@ -1804 +1810 @@
 
 
-    copy_advance_pair(buf, ";maddr=", 7, hdr->maddr_param);
+    if (hdr->maddr_param.slen) {
+        /* Detect IPv6 IP address */
+        if (pj_memchr(hdr->maddr_param.ptr, ':', hdr->maddr_param.slen)) {
+            copy_advance_pair_quote_cond(buf, ";maddr=", 7, hdr->maddr_param,
+                                         '[', ']');
+        } else {
+            copy_advance_pair(buf, ";maddr=", 7, hdr->maddr_param);
+        }
+    }
+
     copy_advance_pair(buf, ";received=", 10, hdr->recvd_param);
     copy_advance_pair(buf, ";branch=", 8, hdr->branch_param);