Changeset 5280 for pjproject/trunk/pjsip/src/pjsip/sip_parser.c

Timestamp:

Apr 20, 2016 1:58:15 AM (8 years ago)

Author:

ming

Message:

Re #1882 (misc): Removed stripping of '[]' from pvalue header parameters.

The stripping of '[]' from header parameters causes issues if
something (like a port) occurrs after the final ']'.

'[2001:a::b]' will correctly parse to '2001:a::b'
'[2001:a::b]:8080' will correctly parse to '2001:a::b' but the scanner is left
with ':8080' and parsing stops with a syntax error.

Thanks to Anthony Messina and George Joseph for the patch.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_parser.c (modified) (1 diff)

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

@@ -1150 +1150 @@
                     pvalue->slen -= 2;
                 }
-            } else if (*scanner->curptr == '[') {
+            // } else if (*scanner->curptr == '[') {
                 /* pvalue can be a quoted IPv6; in this case, the
                  * '[' and ']' quote characters are to be removed
-                 * from the pvalue. 
+                 * from the pvalue.
+                 *
+                 * Update: this seems to be unnecessary and may cause
+                 * parsing error for cases such as IPv6 reference with
+                 * port number.
                  */
-                pj_scan_get_char(scanner);
-                pj_scan_get_until_ch(scanner, ']', pvalue);
-                pj_scan_get_char(scanner);
+                // 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);