From 9aca31f0fc477c2889516de67c0120de5e55690e Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 7 Nov 2007 22:42:24 +0000 Subject: [PATCH] Merged revisions 89090 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r89090 | mmichelson | 2007-11-07 16:40:35 -0600 (Wed, 07 Nov 2007) | 6 lines This patch makes it possible for SIP phones to dial extensions defined with '#' characters in extensions.conf AND maintain their escaped characters when forming URI's (closes issue #10681, reported by cahen, patched by me, code review by file) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89091 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 2e231d35d1..a9b81dad8b 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4502,6 +4502,16 @@ static int sip_indicate(struct ast_channel *ast, int condition, const void *data return res; } +static char *translate_escaped_pound(char *exten) +{ + char *rest, *marker; + while((marker = strstr(exten, "%23"))) { + rest = marker + 3; + *marker++ = '#'; + memmove(marker, rest, strlen(rest) + 1); + } + return exten; +} /*! \brief Initiate a call in the SIP channel @@ -4637,8 +4647,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit i->owner = tmp; ast_module_ref(ast_module_info->self); ast_copy_string(tmp->context, i->context, sizeof(tmp->context)); - ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten)); - + ast_copy_string(tmp->exten, translate_escaped_pound(ast_strdupa(i->exten)), sizeof(tmp->exten)); /* Don't use ast_set_callerid() here because it will * generate an unnecessary NewCallerID event */ @@ -9585,6 +9594,19 @@ static int get_destination(struct sip_pvt *p, struct sip_request *oreq) if (!oreq) ast_string_field_set(p, exten, uri); return 0; + } else { /*Could be trying to match a literal '#'. Try replacing and see if that works.*/ + char *tmpuri = ast_strdupa(uri); + char *rest, *marker; + while((marker = strstr(tmpuri, "%23"))) { + rest = marker + 3; + *marker++ = '#'; + memmove(marker, rest, strlen(rest) + 1); + } + if(ast_exists_extension(NULL, p->context, tmpuri, 1, from) || !strcmp(uri, ast_pickup_ext())) { + if(!oreq) + ast_string_field_set(p, exten, uri); + return 0; + } } }