[asterisk-commits] dbrooks: branch 1.4 r218867 - /branches/1.4/main/pbx.c

[SVN commits to the Asterisk project]

Author: dbrooks
Date: Wed Sep 16 13:00:45 2009
New Revision: 218867

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218867
Log:
Fixes CID pattern matching behavior to mirror that of extension pattern matching.

Pattern matching for extensions uses a type of scoring system, giving values for
specificity to each character in the pattern. Unfortunately, this is done character
by character, in order. This does lead to some less specific patterns being first
in line for matching, but it will usually get the job done.

This patch merely brings CID matching to the same level as extension matching.
This patch does not attempt to tackle the problem shared by extension matching.

(closes issue #14708)
Reported by: klaus3000

Modified:
    branches/1.4/main/pbx.c

Modified: branches/1.4/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.4/main/pbx.c?view=diff&rev=218867&r1=218866&r2=218867
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Wed Sep 16 13:00:45 2009
@@ -4853,7 +4853,7 @@
 			else if (e->matchcid && !tmp->matchcid)
 				res = -1;
 			else
-				res = strcasecmp(e->cidmatch, tmp->cidmatch);
+				res = ext_cmp(e->cidmatch, tmp->cidmatch);
 		}
 		if (res >= 0)
 			break;