kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-17 09:04:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backport fixes for sip_uri_params_cmp() from trunk.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@279053 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2010-07-23 18:04:05 +00:00
parent 6a367c5674
commit 7bc66e1d77
1 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+25 -39
View File
@@ -14482,7 +14482,7 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in
return 0;
}
/*! \brief helper routine for sip_uri_cmp
/*! \brief helper routine for sip_uri_cmp to compare URI parameters
*
* This takes the parameters from two SIP URIs and determines
* if the URIs match. The rules for parameters *suck*. Here's a breakdown
@@ -14496,9 +14496,10 @@ static int handle_invite_replaces(struct sip_pvt *p, struct sip_request *req, in
*
* \param input1 Parameters from URI 1
* \param input2 Parameters from URI 2
* \return Return 0 if the URIs' parameters match, 1 if they do not
* \retval 0 URIs' parameters match
* \retval nonzero URIs' parameters do not match
*/
static int sip_uri_params_cmp(const char *input1, const char *input2)
static int sip_uri_params_cmp(const char *input1, const char *input2)
{
char *params1 = NULL;
char *params2 = NULL;
@@ -14522,43 +14523,36 @@ static int sip_uri_params_cmp(const char *input1, const char *input2)
params2 = ast_strdupa(input2);
}
/*Quick optimization. If both params are zero-length, then
/* Quick optimization. If both params are zero-length, then
* they match
*/
if (zerolength1 && zerolength2) {
return 0;
}
pos1 = params1;
while (!ast_strlen_zero(pos1)) {
char *name1 = pos1;
char *value1 = strchr(pos1, '=');
char *semicolon1 = strchr(pos1, ';');
for (pos1 = strsep(&params1, ";"); pos1; pos1 = strsep(&params1, ";")) {
char *value1 = pos1;
char *name1 = strsep(&value1, "=");
char *params2dup = NULL;
int matched = 0;
if (semicolon1) {
*semicolon1++ = '\0';
}
if (!value1) {
goto fail;
value1 = "";
}
*value1++ = '\0';
/* Checkpoint reached. We have the name and value parsed for param1
* We have to duplicate params2 each time through the second loop
* or else we can't search and replace the semicolons with \0 each
* time
/* Checkpoint reached. We have the name and value parsed for param1
* We have to duplicate params2 each time through this loop
* or else the inner loop below will not work properly.
*/
pos2 = ast_strdupa(params2);
while (!ast_strlen_zero(pos2)) {
if (!zerolength2) {
params2dup = ast_strdupa(params2);
}
for (pos2 = strsep(&params2dup, ";"); pos2; pos2 = strsep(&params2dup, ";")) {
char *name2 = pos2;
char *value2 = strchr(pos2, '=');
char *semicolon2 = strchr(pos2, ';');
if (semicolon2) {
*semicolon2++ = '\0';
}
if (!value2) {
goto fail;
value2 = "";
} else {
*value2++ = '\0';
}
*value2++ = '\0';
if (!strcasecmp(name1, name2)) {
if (strcasecmp(value1, value2)) {
goto fail;
@@ -14567,9 +14561,8 @@ static int sip_uri_params_cmp(const char *input1, const char *input2)
break;
}
}
pos2 = semicolon2;
}
/* Need to see if the parameter we're looking at is one of the 'must-match' parameters */
/* Check to see if the parameter is one of the 'must-match' parameters */
if (!strcasecmp(name1, "maddr")) {
if (matched) {
maddrmatch = 1;
@@ -14595,25 +14588,18 @@ static int sip_uri_params_cmp(const char *input1, const char *input2)
goto fail;
}
}
pos1 = semicolon1;
}
/* We've made it out of that horrible O(m*n) construct and there are no
* failures yet. We're not done yet, though, because params2 could have
* an maddr, ttl, user, or method header and params1 did not.
*/
pos2 = params2;
while (!ast_strlen_zero(pos2)) {
char *name2 = pos2;
char *value2 = strchr(pos2, '=');
char *semicolon2 = strchr(pos2, ';');
if (semicolon2) {
*semicolon2++ = '\0';
}
for (pos2 = strsep(&params2, ";"); pos2; pos2 = strsep(&params2, ";")) {
char *value2 = pos2;
char *name2 = strsep(&value2, "=");
if (!value2) {
goto fail;
value2 = "";
}
*value2++ = '\0';
if ((!strcasecmp(name2, "maddr") && !maddrmatch) ||
(!strcasecmp(name2, "ttl") && !ttlmatch) ||
(!strcasecmp(name2, "user") && !usermatch) ||