Changeset 1805 for pjproject/trunk/pjmedia/src/pjmedia/sdp.c

Timestamp:

Feb 18, 2008 1:50:55 PM (16 years ago)

Author:

bennylp

Message:

Allow receiving SDP with lines terminated with LF instead of CRLF (thanks Juri Glass)

File:

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

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

@@ -817 +817 @@
 
     /* address */
-    pj_scan_get_until_chr(scanner, " \t\r", &ses->origin.addr);
+    pj_scan_get_until_chr(scanner, " \t\r\n", &ses->origin.addr);
 
     /* We've got what we're looking for, skip anything until newline */
@@ -847 +847 @@
 
     /* stop time */
-    pj_scan_get_until_chr(scanner, " \t\r", &str);
+    pj_scan_get_until_chr(scanner, " \t\r\n", &str);
     ses->time.stop = pj_strtoul(&str);
 
@@ -869 +869 @@
 
     /* get anything until newline (including whitespaces). */
-    pj_scan_get_until_ch(scanner, '\r', str);
+    pj_scan_get_until_chr(scanner, "\r\n", str);
 
     /* newline. */
@@ -892 +892 @@
 
     /* address. */
-    pj_scan_get_until_chr(scanner, " \t\r", &conn->addr);
+    pj_scan_get_until_chr(scanner, " \t\r\n", &conn->addr);
 
     /* We've got what we're looking for, skip anything until newline */
@@ -988 +988 @@
 
         /* get value */
-        if (*scanner->curptr != '\r') {
-            pj_scan_get_until_ch(scanner, '\r', &attr->value);
+        if (*scanner->curptr != '\r' && *scanner->curptr != '\n') {
+            pj_scan_get_until_chr(scanner, "\r\n", &attr->value);
         } else {
             attr->value.ptr = NULL;