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

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

diff --git a/main/pbx.c b/main/pbx.c
index acf2da9cf861f356118ab936379ef9f81e6af007..78abecfae5a50c264d57a1daf519adf2aff50a39 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4853,7 +4853,7 @@ int ast_add_extension2(struct ast_context *con,
                        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;