Merged revisions 162014 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 9 Dec 2008 16:47:39 +0000 (16:47 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 9 Dec 2008 16:47:39 +0000 (16:47 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r162014 | russell | 2008-12-09 10:46:53 -0600 (Tue, 09 Dec 2008) | 5 lines

Allow DISA to handle extensions that start with #.

(closes issue #13330)
Reported by: jcovert

........

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

apps/app_disa.c

index 80aeb09..8217a24 100644 (file)
@@ -303,8 +303,14 @@ static int disa_exec(struct ast_channel *chan, void *data)
                                        continue;
                                }
                        } else {
-                               if (j == '#') { /* end of extension */
-                                       break;
+                               if (j == '#') { /* end of extension .. maybe */
+                                       if (i == 0 && 
+                                                       (ast_matchmore_extension(chan, args.context, "#", 1, chan->cid.cid_num) ||
+                                                        ast_exists_extension(chan, args.context, "#", 1, chan->cid.cid_num)) ) {
+                                               /* Let the # be the part of, or the entire extension */
+                                       } else {
+                                               break;
+                                       }
                                }
                        }