Changeset 889

Timestamp:

Jan 20, 2007 6:35:17 PM (17 years ago)

Author:

bennylp

Message:

Ticket #64: more lenient SDP parsing (take only what we need and ignore anything else)

File:

• pjproject/trunk/pjmedia/src/pjmedia/sdp.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sdp.c

@@ -771 +771 @@
     }
 
-    pj_scan_advance_n(scanner, 3, SKIP_WS);
-    pj_scan_get_newline(scanner);
+    /* We've got what we're looking for, skip anything until newline */
+    pj_scan_skip_line(scanner);
 }
 
@@ -814 +814 @@
 
     /* address */
-    pj_scan_get_until_ch(scanner, '\r', &ses->origin.addr);
-
-    /* newline */
-    pj_scan_get_newline(scanner);
+    pj_scan_get_until_chr(scanner, " \t\r", &ses->origin.addr);
+
+    /* We've got what we're looking for, skip anything until newline */
+    pj_scan_skip_line(scanner);
+
 }
 
@@ -843 +844 @@
 
     /* stop time */
-    pj_scan_get_until_ch(scanner, '\r', &str);
+    pj_scan_get_until_chr(scanner, " \t\r", &str);
     ses->time.stop = pj_strtoul(&str);
 
-    /* newline */
-    pj_scan_get_newline(scanner);
+    /* We've got what we're looking for, skip anything until newline */
+    pj_scan_skip_line(scanner);
 }
 
@@ -864 +865 @@
     pj_scan_advance_n(scanner, 2, SKIP_WS);
 
-    /* get anything until newline. */
+    /* get anything until newline (including whitespaces). */
     pj_scan_get_until_ch(scanner, '\r', str);
 
@@ -888 +889 @@
 
     /* address. */
-    pj_scan_get_until_ch(scanner, '\r', &conn->addr);
-
-    /* newline */
-    pj_scan_get_newline(scanner);
+    pj_scan_get_until_chr(scanner, " \t\r", &conn->addr);
+
+    /* We've got what we're looking for, skip anything until newline */
+    pj_scan_skip_line(scanner);
 }
 
@@ -941 +942 @@
     }
 
-    /* newline */
-    pj_scan_get_newline(scanner);
+    /* We've got what we're looking for, skip anything until newline */
+    pj_scan_skip_line(scanner);
 }
 
@@ -991 +992 @@
     }
 
-    /* newline */
-    pj_scan_get_newline(scanner);
+    /* We've got what we're looking for, skip anything until newline */
+    pj_scan_skip_line(scanner);
 
     return attr;
@@ -1097 +1098 @@
         session = NULL;
 
-        pj_assert(ctx.last_error == PJ_SUCCESS);
+        pj_assert(ctx.last_error != PJ_SUCCESS);
     }
     PJ_END;