[svn-commits] russell: branch 1.6.1 r162018 - in /branches/1.6.1: ./ apps/app_disa.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec  9 10:50:04 2008
New Revision: 162018

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162018
Log:
Merged revisions 162016 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r162016 | russell | 2008-12-09 10:47:39 -0600 (Tue, 09 Dec 2008) | 13 lines

Merged revisions 162014 via svnmerge from 
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

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_disa.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_disa.c?view=diff&rev=162018&r1=162017&r2=162018
==============================================================================
--- branches/1.6.1/apps/app_disa.c (original)
+++ branches/1.6.1/apps/app_disa.c Tue Dec  9 10:50:04 2008
@@ -281,8 +281,14 @@
 					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;
+					}
 				}
 			}