[svn-commits] russell: branch 1.4 r162014 - /branches/1.4/apps/app_disa.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Dec  9 10:46:53 2008
New Revision: 162014

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162014
Log:
Allow DISA to handle extensions that start with #.

(closes issue #13330)
Reported by: jcovert

Modified:
    branches/1.4/apps/app_disa.c

Modified: branches/1.4/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_disa.c?view=diff&rev=162014&r1=162013&r2=162014
==============================================================================
--- branches/1.4/apps/app_disa.c (original)
+++ branches/1.4/apps/app_disa.c Tue Dec  9 10:46:53 2008
@@ -298,8 +298,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;
+					}
 				}
 			}