dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

_really_ rewrite get_in_brackets to do the right thing (including skipping escaped double-quote characters) 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6205 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
kpfleming 2005-07-25 21:40:17 +00:00
parent 9bdf97f2c6
commit 1e631a97f1
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
channels/chan_sip.c
View File

@ -1321,31 +1321,46 @@ static void url_decode(char *s)
*o = '\0';
}
/*--- get_in_brackets: Pick out text in braces from character string ---*/
/*--- get_in_brackets: Pick out text in brackets from character string ---*/
/* returns pointer to terminated stripped string. modifies input string. */
static char *get_in_brackets(char *tmp)
{
char *c = tmp, *n, *q;
char *parse;
char *first_quote;
char *first_bracket;
char *second_bracket;
char last_char;
if ((q = strchr(tmp, '"'))) {
c = q + 1;
if ((q = strchr(c, '"')) )
c = q + 1;
else {
ast_log(LOG_WARNING, "No closing quote in '%s'\n", tmp);
c = tmp;
parse = tmp;
while (1) {
first_quote = strchr(parse, '"');
first_bracket = strchr(parse, '<');
if (first_quote && first_bracket && (first_quote < first_bracket)) {
last_char = '\0';
for (parse = first_quote + 1; *parse; parse++) {
if ((*parse == '"') && (last_char != '\\'))
break;
last_char = *parse;
}
if (!*parse) {
ast_log(LOG_WARNING, "No closing quote found in '%s'\n", tmp);
return tmp;
}
parse++;
continue;
}
if (first_bracket) {
second_bracket = strchr(first_bracket + 1, '>');
if (second_bracket) {
*second_bracket = '\0';
return first_bracket + 1;
} else {
ast_log(LOG_WARNING, "No closing bracket found in '%s'\n", tmp);
return tmp;
}
}
return tmp;
}
if ((n = strchr(c, '<')) ) {
c = n + 1;
while (*c && *c != '>') c++;
if (*c != '>') {
ast_log(LOG_WARNING, "No closing brace in '%s'\n", tmp);
} else
*c = '\0';
return n+1;
}
return c;
}
/*--- sip_sendtext: Send SIP MESSAGE text within a call ---*/