sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix parsing of SIP headers where compact and non-compact headers are mixed 

Change parsing of SIP headers so that compactness of the header no longer
influences which header will be chosen.  Previously, a non-compact header
would be chosen instead of a preceeding compact-form header.

(closes issue ASTERISK-17192)
Review: https://reviewboard.asterisk.org/r/1728/
........

Merged revisions 354702 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 354703 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore 2012-02-09 20:52:13 +00:00
parent 25e344168e
commit 6225c6cadc
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
channels/chan_sip.c
View File

@ -7459,8 +7459,6 @@ static const char *find_full_alias(const char *name, const char *_default)
static const char *__get_header(const struct sip_request *req, const char *name, int *start)
{
int pass;
/*
* Technically you can place arbitrary whitespace both before and after the ':' in
* a header, although RFC3261 clearly says you shouldn't before, and place just
@ -7470,24 +7468,25 @@ static const char *__get_header(const struct sip_request *req, const char *name,
* Anyways, pedanticsipchecking controls whether we allow spaces before ':',
* and we always allow spaces after that for compatibility.
*/
for (pass = 0; name && pass < 2;pass++) {
int x, len = strlen(name);
for (x = *start; x < req->headers; x++) {
const char *header = REQ_OFFSET_TO_STR(req, header[x]);
if (!strncasecmp(header, name, len)) {
const char *r = header + len; /* skip name */
if (sip_cfg.pedanticsipchecking) {
r = ast_skip_blanks(r);
}
if (*r == ':') {
*start = x+1;
return ast_skip_blanks(r+1);
}
}
const char *sname = find_alias(name, NULL);
int x, len = strlen(name), slen = (sname ? 1 : 0);
for (x = *start; x < req->headers; x++) {
const char *header = REQ_OFFSET_TO_STR(req, header[x]);
int smatch = 0, match = !strncasecmp(header, name, len);
if (slen) {
smatch = !strncasecmp(header, sname, slen);
}
if (pass == 0) { /* Try aliases */
name = find_alias(name, NULL);
if (match || smatch) {
/* skip name */
const char *r = header + (match ? len : slen );
if (sip_cfg.pedanticsipchecking) {
r = ast_skip_blanks(r);
}
if (*r == ':') {
*start = x+1;
return ast_skip_blanks(r+1);
}
}
}