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

Timestamp:

Mar 18, 2009 6:24:40 PM (15 years ago)

Author:

bennylp

Message:

More ticket #747: the previous fix in r2505 causes parsing IPv6 address in Via to fail. Also added some torture messages in the SIP message test vectors.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_parser.c (modified) (7 diffs)

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

@@ -326 +326 @@
     pj_cis_del_str(&pconst.pjsip_TOKEN_SPEC_ESC, "%");
 
+    status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC, &pconst.pjsip_TOKEN_SPEC);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC, ":");
+
+    status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC_ESC, &pconst.pjsip_TOKEN_SPEC_ESC);
+    PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC, ":");
+
     status = pj_cis_dup(&pconst.pjsip_HOST_SPEC, &pconst.pjsip_ALNUM_SPEC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
@@ -771 +779 @@
     const char *line;
     int content_length = -1;
+    pj_str_t cur_msg;
+    const pj_str_t end_hdr = { "\n\r\n", 3};
 
     *msg_size = size;
@@ -780 +790 @@
 
 
-    /* Find the end of header area by finding an empty line. */
-    pos = pj_ansi_strstr(buf, "\n\r\n");
+    /* Find the end of header area by finding an empty line. 
+     * Don't use plain strstr() since we want to be able to handle
+     * NULL character in the message
+     */
+    cur_msg.ptr = (char*)buf; cur_msg.slen = size;
+    pos = pj_strstr(&cur_msg, &end_hdr);
     if (pos == NULL) {
         return PJSIP_EPARTIALMSG;
@@ -790 +804 @@
 
     /* Find "Content-Length" header the hard way. */
-    line = pj_ansi_strchr(buf, '\n');
+    line = pj_strchr(&cur_msg, '\n');
     while (line && line < hdr_end) {
         ++line;
@@ -841 +855 @@
 
         /* Go to next line. */
-        line = pj_ansi_strchr(line, '\n');
+        cur_msg.slen -= (line - cur_msg.ptr);
+        cur_msg.ptr = (char*)line;
+        line = pj_strchr(&cur_msg, '\n');
     }
 
@@ -1653 +1669 @@
 
         pj_scan_get( scanner, &pconst.pjsip_NOT_NEWLINE, &hdr->hvalue);
-        if (IS_NEWLINE(*scanner->curptr))
+        if (pj_scan_is_eof(scanner) || IS_NEWLINE(*scanner->curptr))
             break;
         /* mangled, get next fraction */
@@ -1983 +1999 @@
         //              &pconst.pjsip_TOKEN_SPEC,
         //              &pconst.pjsip_TOKEN_SPEC_ESC, 0);
-        int_parse_param(scanner, pool, &pname, &pvalue, 0);
+        //int_parse_param(scanner, pool, &pname, &pvalue, 0);
+        // This should be the correct one:
+        //  added special spec for Via parameter, basically token plus
+        //  ":" to allow IPv6 address in the received param.
+        pj_scan_get_char(scanner);
+        parse_param_imp(scanner, pool, &pname, &pvalue,
+                        &pconst.pjsip_VIA_PARAM_SPEC,
+                        &pconst.pjsip_VIA_PARAM_SPEC_ESC,
+                        0);
 
         if (!parser_stricmp(pname, pconst.pjsip_BRANCH_STR) && pvalue.slen) {