kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 06:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify function parse_request() using a single loop instead

Browse Source 
of two very similar ones.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-10-08 22:20:35 +00:00
parent b90f91c3b4
commit 36e4f62e7c
1 changed files with 32 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
channels/chan_sip.c
View File

@@ -4393,70 +4393,43 @@ static int lws2sws(char *msgbuf, int len)
*/ */
static void parse_request(struct sip_request *req) static void parse_request(struct sip_request *req)
{ {
/* Divide fields by NULL's */ char *c = req->data, **dst = req->header;
char *c; int i = 0, lim = SIP_MAX_HEADERS - 1;
int f = 0;
c = req->data;
/* First header starts immediately */
req->header[f] = c;
while(*c) {
if (*c == '\n') {
/* We've got a new header */
*c = 0;
req->header[0] = c;
req->headers = -1; /* mark that we are working on the header */
for (; *c; c++) {
if (*c == '\r') /* remove \r */
*c = '\0';
else if (*c == '\n') { /* end of this line */
*c = '\0';
if (sipdebug && option_debug > 3) if (sipdebug && option_debug > 3)
ast_log(LOG_DEBUG, "Header %d: %s (%d)\n", f, req->header[f], (int) strlen(req->header[f])); ast_log(LOG_DEBUG, "%7s %2d [%3d]: %s\n",
if (ast_strlen_zero(req->header[f])) { req->headers < 0 ? "Header" : "Body",
/* Line by itself means we're now in content */ i, strlen(dst[i]), dst[i]);
c++; if (ast_strlen_zero(dst[i]) && req->headers < 0) {
req->headers = i; /* record number of header lines */
dst = req->line; /* start working on the body */
i = 0;
lim = SIP_MAX_LINES - 1;
} else { /* move to next line, check for overflows */
if (i++ >= lim)
break; break;
} }
if (f >= SIP_MAX_HEADERS - 1) { dst[i] = c + 1; /* record start of next line */
ast_log(LOG_WARNING, "Too many SIP headers. Ignoring.\n");
} else
f++;
req->header[f] = c + 1;
} else if (*c == '\r') {
/* Ignore but eliminate \r's */
*c = 0;
} }
c++;
} }
/* Check for last header */ /* update count of header or body lines */
if (!ast_strlen_zero(req->header[f])) { if (req->headers >= 0) /* we are in the body */
if (sipdebug && option_debug > 3) req->lines = i;
ast_log(LOG_DEBUG, "Header %d: %s (%d)\n", f, req->header[f], (int) strlen(req->header[f])); else { /* no body */
f++; req->headers = i;
req->lines = 0;
req->line[0] = "";
} }
req->headers = f;
/* Now we process any mime content */
f = 0;
req->line[f] = c;
while(*c) {
if (*c == '\n') {
/* We've got a new line */
*c = 0;
if (sipdebug && option_debug > 3)
ast_log(LOG_DEBUG, "Line: %s (%d)\n", req->line[f], (int) strlen(req->line[f]));
if (f >= SIP_MAX_LINES - 1) {
ast_log(LOG_WARNING, "Too many SDP lines. Ignoring.\n");
} else
f++;
req->line[f] = c + 1;
} else if (*c == '\r') {
/* Ignore and eliminate \r's */
*c = 0;
}
c++;
}
/* Check for last line */
if (!ast_strlen_zero(req->line[f]))
f++;
req->lines = f;
if (*c) if (*c)
ast_log(LOG_WARNING, "Odd content, extra stuff left over ('%s')\n", c); ast_log(LOG_WARNING, "Too many lines, skipping <%s>\n", c);
/* Split up the first line parts */ /* Split up the first line parts */
determine_firstline_parts(req); determine_firstline_parts(req);
} }