diff options
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 00576dfba..38436f4bb 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -14305,26 +14305,35 @@ static enum sip_get_dest_result get_destination(struct sip_pvt *p, struct sip_re ast_verbose("Looking for %s in %s (domain %s)\n", uri, p->context, p->domain); } + /* Since extensions.conf can have unescaped characters, try matching a + * decoded uri in addition to the non-decoded uri. */ + decoded_uri = ast_strdupa(uri); + ast_uri_decode(decoded_uri); + /* If this is a subscription we actually just need to see if a hint exists for the extension */ if (req->method == SIP_SUBSCRIBE) { char hint[AST_MAX_EXTENSION]; - return (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, p->exten) ? - SIP_GET_DEST_EXTEN_FOUND : - SIP_GET_DEST_EXTEN_NOT_FOUND); + int which = 0; + if (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, uri) || + (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, decoded_uri) && (which = 1))) { + if (!oreq) { + ast_string_field_set(p, exten, which ? decoded_uri : uri); + } + return SIP_GET_DEST_EXTEN_FOUND; + } else { + return SIP_GET_DEST_EXTEN_NOT_FOUND; + } } else { struct ast_cc_agent *agent; - decoded_uri = ast_strdupa(uri); - ast_uri_decode(decoded_uri); + int which = 0; /* Check the dialplan for the username part of the request URI, the domain will be stored in the SIPDOMAIN variable - Since extensions.conf can have unescaped characters, try matching a decoded - uri in addition to the non-decoded uri Return 0 if we have a matching extension */ if (ast_exists_extension(NULL, p->context, uri, 1, S_OR(p->cid_num, from)) || - ast_exists_extension(NULL, p->context, decoded_uri, 1, S_OR(p->cid_num, from)) || + (ast_exists_extension(NULL, p->context, decoded_uri, 1, S_OR(p->cid_num, from)) && (which = 1)) || !strcmp(decoded_uri, ast_pickup_ext())) { if (!oreq) { - ast_string_field_set(p, exten, decoded_uri); + ast_string_field_set(p, exten, which ? decoded_uri : uri); } return SIP_GET_DEST_EXTEN_FOUND; } else if ((agent = find_sip_cc_agent_by_notify_uri(tmp))) { |