summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuigi Rizzo <rizzo@icir.org>2006-10-23 14:35:37 +0000
committerLuigi Rizzo <rizzo@icir.org>2006-10-23 14:35:37 +0000
commitee60094592c7e8cd72ad80568a091f27603e9229 (patch)
tree7c11ce8cee9daf9465c9658c471b3a21e9f545d8
parent00b88f30b409714a64ab590676a9474d5c4bb786 (diff)
in function get_also_info(), move argument stripping
before splitting around the @, otherwise the refer_to_domain might contain arguments as well, causing failures. I think this is a true bug that ought to be fixed in 1.4 as well. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45966 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_sip.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 38523b22d..acb492c6f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8758,14 +8758,14 @@ static int get_also_info(struct sip_pvt *p, struct sip_request *oreq)
return -1;
}
c += 4;
+ if ((a = strchr(c, ';'))) /* Remove arguments */
+ *a = '\0';
+
if ((a = strchr(c, '@'))) { /* Separate Domain */
*a++ = '\0';
ast_copy_string(referdata->refer_to_domain, a, sizeof(referdata->refer_to_domain));
}
- if ((a = strchr(c, ';'))) /* Remove arguments */
- *a = '\0';
-
if (sip_debug_test_pvt(p))
ast_verbose("Looking for %s in %s\n", c, p->context);