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

Timestamp:

Nov 22, 2005 1:06:33 AM (18 years ago)

Author:

bennylp

Message:

Fix parse param bug in Contact hdr and add more msg tests

File:

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

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

@@ -759 +759 @@
     }
 
-    msg = pjsip_msg_create(pool, PJSIP_REQUEST_MSG);
-
     /* Parse request or status line */
     if (pj_scan_stricmp( scanner, PJSIP_VERSION, 7) == 0) {
-        msg->type = PJSIP_RESPONSE_MSG;
+        msg = pjsip_msg_create(pool, PJSIP_RESPONSE_MSG);
         int_parse_status_line( scanner, &msg->line.status );
     } else {
-        msg->type = PJSIP_REQUEST_MSG;
+        msg = pjsip_msg_create(pool, PJSIP_REQUEST_MSG);
         int_parse_req_line(scanner, pool, &msg->line.req );
     }
@@ -859 +857 @@
 
     /* If we have Content-Type header, treat the rest of the message as body.*/
-    if (ctype_hdr) {
+    if (ctype_hdr && scanner->curptr!=scanner->end) {
         pjsip_msg_body *body = pj_pool_alloc(pool, sizeof(pjsip_msg_body));
         pj_strdup(pool, &body->content_type.type, &ctype_hdr->media.type);
@@ -1380 +1378 @@
             hdr->star = 0;
             hdr->uri = int_parse_uri_or_name_addr(scanner, ctx->pool, 
-                                                  PJSIP_PARSE_URI_AS_NAMEADDR);
+                                                  PJSIP_PARSE_URI_AS_NAMEADDR |
+                                                  PJSIP_PARSE_URI_IN_FROM_TO_HDR);
 
             int_parse_contact_param(hdr, scanner, ctx->pool);