Changeset 2695 for pjproject

Timestamp:

May 12, 2009 3:55:09 PM (16 years ago)

Author:

bennylp

Message:

Ticket #842: Error parsing status line in sipfrag message body in call transfer scenario (thanks Tomáš Valenta for the report!)

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_parser.c (modified) (1 diff)
• pjsua-lib/pjsua_call.c (modified) (3 diffs)
• test/msg_test.c (modified) (1 diff)

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

@@ -1589 +1589 @@
 
     pj_bzero(status_line, sizeof(*status_line));
-    pj_scan_init(&scanner, buf, size, 0, &on_syntax_error);
+    pj_scan_init(&scanner, buf, size, PJ_SCAN_AUTOSKIP_WS_HEADER, 
+                 &on_syntax_error);
 
     PJ_TRY {

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -3416 +3416 @@
             body = msg->body;
             if (!body) {
-                PJ_LOG(4,(THIS_FILE, 
+                PJ_LOG(2,(THIS_FILE, 
                           "Warning: received NOTIFY without message body"));
                 return;
@@ -3425 +3425 @@
                 pj_stricmp2(&body->content_type.subtype, "sipfrag") != 0)
             {
-                PJ_LOG(4,(THIS_FILE, 
+                PJ_LOG(2,(THIS_FILE, 
                           "Warning: received NOTIFY with non message/sipfrag "
                           "content"));
@@ -3435 +3435 @@
                                              &status_line);
             if (status != PJ_SUCCESS) {
-                PJ_LOG(4,(THIS_FILE, 
+                PJ_LOG(2,(THIS_FILE, 
                           "Warning: received NOTIFY with invalid "
                           "message/sipfrag content"));

pjproject/trunk/pjsip/src/test/msg_test.c

@@ -816 +816 @@
 static pj_status_t simple_test(void)
 {
+    char stbuf[] = "SIP/2.0 180 Ringing like it never rings before";
     unsigned i;
+    pjsip_status_line st_line;
     pj_status_t status;
 
     PJ_LOG(3,(THIS_FILE, "  simple test.."));
+    
+    status = pjsip_parse_status_line(stbuf, pj_ansi_strlen(stbuf), &st_line);
+    if (status != PJ_SUCCESS)
+        return status;
+
     for (i=0; i<PJ_ARRAY_SIZE(test_array); ++i) {
         pj_pool_t *pool;