[Asterisk-cvs] asterisk/channels chan_sip.c,1.344,1.345

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv5469/channels

Modified Files:
	chan_sip.c 
Log Message:
Add white space condensing to pedantic mode of chan_sip.


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- chan_sip.c	26 Apr 2004 14:54:33 -0000	1.344
+++ chan_sip.c	27 Apr 2004 22:32:57 -0000	1.345
@@ -1983,12 +1983,56 @@
 	return 0;
 }
 
+static int lws2sws(char *msgbuf, int len) 
+{ 
+	int h = 0, t = 0; 
+	int lws = 0; 
+
+	for (; h < len;) { 
+		/* Eliminate all CRs */ 
+		if (msgbuf[h] == '\r') { 
+			h++; 
+			continue; 
+		} 
+		/* Check for end-of-line */ 
+		if (msgbuf[h] == '\n') { 
+		/* Check for end-of-message */ 
+			if (h + 1 == len) 
+			break; 
+		/* Check for a continuation line */ 
+		if (msgbuf[h + 1] == ' ') { 
+		/* Merge continuation line */ 
+			h++; 
+			continue; 
+		} 
+		/* Propagate LF and start new line */ 
+		msgbuf[t++] = msgbuf[h++]; 
+		lws = 0;
+		continue; 
+	} 
+
+	if (msgbuf[h] == ' ' || msgbuf[h] == '\t') { 
+		if (lws) { 
+			h++; 
+			continue; 
+		} 
+		msgbuf[t++] = msgbuf[h++]; 
+		lws = 1; 
+		continue; 
+	} 
+	msgbuf[t++] = msgbuf[h++]; 
+	if (lws) 
+		lws = 0; 
+	} 
+	msgbuf[t] = '\0'; 
+	return t; 
+}
+
 static void parse(struct sip_request *req)
 {
 	/* Divide fields by NULL's */
 	char *c;
 	int f = 0;
-	int lastr = 0;
 	c = req->data;
 
 	/* First header starts immediately */
@@ -2008,25 +2052,13 @@
 			}
 			if (f >= SIP_MAX_HEADERS - 1) {
 				ast_log(LOG_WARNING, "Too many SIP headers...\n");
-			} else {
-				if ((c[1] == ' ') || (c[1] == '\t')) {
-					/* Continuation of previous header */
-					*c = ' ';
-					if (lastr) {
-						*(c-1) = ' ';
-					}
-				} else {
-					f++;
-					req->header[f] = c + 1;
-				}
-			}
-			lastr = 0;
+			} else
+				f++;
+			req->header[f] = c + 1;
 		} else if (*c == '\r') {
 			/* Ignore but eliminate \r's */
 			*c = 0;
-			lastr = 1;
-		} else
-			lastr = 0;
+		}
 		c++;
 	}
 	/* Check for last header */
@@ -5824,6 +5856,8 @@
 	req.len = res;
 	if (sipdebug)
 		ast_verbose("\n\nSip read: \n%s\n", req.data);
+	if (pedanticsipchecking)
+		req.len = lws2sws(req.data, req.len);
 	parse(&req);
 	if (req.headers < 2) {
 		/* Must have at least two headers */