Merged revisions 288112 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r288112 | tilghman | 2010-09-21 16:58:13 -0500 (Tue, 21 Sep 2010) | 15 lines

  Try both the encoded and unencoded subscription URI for a match in hints.

  When a phone sends an encoded URI for a subscription, the URI is not matched
  with the actual hint that is in decoded format.  For example, if we have an
  extension with a hint that is named: "#5601" or "*5601", the subscription will
  work fine if the phone subscribes with an already decoded URI, but when it's
  decoded like "%255601" or "%2A5601", Asterisk is unable to match it with the
  correct hint.

  (closes issue #17785)
   Reported by: ramonpeek
   Patches:
         20100831__issue17785.diff.txt uploaded by tilghman (license 14)
   Tested by: ramonpeek
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@288113 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d38e0ee596aedf812a8f6d038a8f6c2885fe3eb7..ba4a4be5d6f3974c38f57b14ea62565f8cad4744 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13530,24 +13530,37 @@ static int get_destination(struct sip_pvt *p, struct sip_request *oreq)
        if (sip_debug_test_pvt(p))
                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) ? 0 : -1);
+               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 0;
+               } else {
+                       return -1;
+               }
        } else {
-               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)) ||
+               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)) && (which = 1)) ||
                    !strcmp(decoded_uri, ast_pickup_ext())) {
-                       if (!oreq)
-                               ast_string_field_set(p, exten, decoded_uri);
+                       if (!oreq) {
+                               ast_string_field_set(p, exten, which ? decoded_uri : uri);
+                       }
                        return 0;
-               } 
+               }
        }
 
        /* Return 1 for pickup extension or overlap dialling support (if we support it) */