Changeset 1610 for pjproject/trunk/pjsip/src/pjsip/sip_parser.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_parser.c (modified) (4 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -1078 +1078 @@
                     pvalue->slen -= 2;
                 }
+            } else if (*scanner->curptr == '[') {
+                /* pvalue can be a quoted IPv6; in this case, the
+                 * '[' and ']' quote characters are to be removed
+                 * from the pvalue. 
+                 */
+                pj_scan_get_char(scanner);
+                pj_scan_get_until_ch(scanner, ']', pvalue);
+                pj_scan_get_char(scanner);
             } else if(pj_cis_match(spec, *scanner->curptr)) {
                 parser_get_and_unescape(scanner, pool, spec, esc_spec, pvalue);
@@ -1158 +1166 @@
 }
 
+/* Parse host part:
+ *   host =  hostname / IPv4address / IPv6reference
+ */
+static void int_parse_host(pj_scanner *scanner, pj_str_t *host)
+{
+    if (*scanner->curptr == '[') {
+        /* Note: the '[' and ']' characters are removed from the host */
+        pj_scan_get_char(scanner);
+        pj_scan_get_until_ch(scanner, ']', host);
+        pj_scan_get_char(scanner);
+    } else {
+        pj_scan_get( scanner, &pconst.pjsip_HOST_SPEC, host);
+    }
+}
+
 /* Parse host:port in URI. */
 static void int_parse_uri_host_port( pj_scanner *scanner, 
                                      pj_str_t *host, int *p_port)
 {
-    pj_scan_get( scanner, &pconst.pjsip_HOST_SPEC, host);
+    int_parse_host(scanner, host);
+
     /* RFC3261 section 19.1.2: host don't need to be unescaped */
     if (*scanner->curptr == ':') {
@@ -1843 +1867 @@
         pj_str_t pname, pvalue;
 
-        int_parse_param( scanner, pool, &pname, &pvalue, 0);
+        //Parse with PARAM_CHAR instead, to allow IPv6
+        //int_parse_param( scanner, pool, &pname, &pvalue, 0);
+        /* Get ';' character */
+        pj_scan_get_char(scanner);
+
+        parse_param_imp(scanner, pool, &pname, &pvalue, 
+                        &pconst.pjsip_PARAM_CHAR_SPEC,
+                        &pconst.pjsip_PARAM_CHAR_SPEC_ESC, 0);
 
         if (!parser_stricmp(pname, pconst.pjsip_BRANCH_STR) && pvalue.slen) {
@@ -1984 +2015 @@
 
         pj_scan_get( scanner, &pconst.pjsip_TOKEN_SPEC, &hdr->transport);
-        pj_scan_get( scanner, &pconst.pjsip_HOST_SPEC, &hdr->sent_by.host);
+        int_parse_host(scanner, &hdr->sent_by.host);
 
         if (*scanner->curptr==':') {