diff options
| author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-09 18:51:52 +0000 |
|---|---|---|
| committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-09 18:51:52 +0000 |
| commit | 722eb3c4c3cfa1c0cee915c949c5f95199ee24dd (patch) | |
| tree | 25683963c5e51bdedd6211cd0ea92a85639505c3 /apps/app_osplookup.c | |
| parent | 815b5b09da5e555add7bba3d8fca588e7611248a (diff) | |
Merged revisions 285710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r285710 | bbryant | 2010-09-09 14:50:13 -0400 (Thu, 09 Sep 2010) | 8 lines
Fixes an issue with dialplan pattern matching where the specificity for pattern ranges and pattern special characters was inconsistent.
(closes issue #16903)
Reported by: Nick_Lewis
Patches:
pbx.c-specificity.patch uploaded by Nick Lewis (license 657)
Tested by: Nick_Lewis
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@285711 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_osplookup.c')
| -rw-r--r-- | apps/app_osplookup.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index ea20cee77..239d6d501 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -1493,6 +1493,7 @@ static int osp_lookup( char callingnum[OSP_SIZE_NORSTR]; char callednum[OSP_SIZE_NORSTR]; char destination[OSP_SIZE_NORSTR]; + char* tmp; unsigned int tokenlen; char token[OSP_SIZE_TOKSTR]; char src[OSP_SIZE_NORSTR]; @@ -1565,6 +1566,11 @@ static int osp_lookup( } } + ast_copy_string(callednum, called, sizeof(callednum)); + if((tmp = strchr(callednum, ';')) != NULL) { + *tmp = '\0'; + } + callidnum = 0; callids[0] = NULL; for (i = 0; i < OSP_CALLID_MAXNUM; i++) { @@ -1605,7 +1611,7 @@ static int osp_lookup( dev, calling ? calling : "", OSPC_NFORMAT_E164, - called, + callednum, OSPC_NFORMAT_E164, NULL, callidnum, |