diff options
| author | Matthew Jordan <mjordan@digium.com> | 2014-04-17 19:50:05 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2014-04-17 19:50:05 +0000 |
| commit | 7d26eefce43bf5f0d51c97377dcc96820a909d5e (patch) | |
| tree | 0c070aaa3005881e13dd45229b8285ee92b88999 /channels/chan_sip.c | |
| parent | 3043cd363dcc4788adab0010111302d90ad113ca (diff) | |
chan_sip: Add SIPURIPHONECONTEXT channel variable for Request TEL URIs
This patch is a continuation of https://reviewboard.asterisk.org/r/3349/,
committed in r412303.
It resolves a finding oej had that the phone-context be available in a
channel variable separate from SIPDOMAIN. This patch adds that variable as
SIPURIPHONECONTEXT. It also allows a local number (or global number specified
in the TEL URI) to be used to look up as a peer.
(issue ASTERISK-17179)
Review: https://reviewboard.asterisk.org/r/3349/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@412467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index eb0a5f295..e63657f2c 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8249,6 +8249,9 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit if (!ast_strlen_zero(i->domain)) { pbx_builtin_setvar_helper(tmp, "SIPDOMAIN", i->domain); } + if (!ast_strlen_zero(i->tel_phone_context)) { + pbx_builtin_setvar_helper(tmp, "SIPURIPHONECONTEXT", i->tel_phone_context); + } if (!ast_strlen_zero(i->callid)) { pbx_builtin_setvar_helper(tmp, "SIPCALLID", i->callid); } @@ -17694,6 +17697,12 @@ static enum sip_get_dest_result get_destination(struct sip_pvt *p, struct sip_re extract_host_from_hostport(&domain); + if (strncasecmp(get_in_brackets(tmp), "tel:", 4)) { + ast_string_field_set(p, domain, domain); + } else { + ast_string_field_set(p, tel_phone_context, domain); + } + if (ast_strlen_zero(uri)) { /* * Either there really was no extension found or the request @@ -17703,8 +17712,6 @@ static enum sip_get_dest_result get_destination(struct sip_pvt *p, struct sip_re uri = "s"; } - ast_string_field_set(p, domain, domain); - /* Now find the From: caller ID and name */ /* XXX Why is this done in get_destination? Isn't it already done? Needs to be checked @@ -18358,7 +18365,7 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of, if (!peer) { char *uri_tmp, *callback = NULL, *dummy; uri_tmp = ast_strdupa(uri2); - parse_uri(uri_tmp, "sip:,sips:", &callback, &dummy, &dummy, &dummy); + parse_uri(uri_tmp, "sip:,sips:,tel:", &callback, &dummy, &dummy, &dummy); if (!ast_strlen_zero(callback) && (peer = sip_find_peer_by_ip_and_exten(&p->recv, callback, p->socket.type))) { ; /* found, fall through */ } else { |