kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-11 23:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 127973 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r127973 | tilghman | 2008-07-03 22:30:30 -0500 (Thu, 03 Jul 2008) | 8 lines

Fix the 'dialplan remove extension' logic, so that it a) works with cidmatch,
and b) completes contexts correctly when the extension is ambiguous.
(closes issue #12980)
 Reported by: licedey
 Patches: 
       20080703__bug12980.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@128027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-04 16:06:34 +00:00
parent 6f621e6205
commit 12e5c68622
3 changed files with 125 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/asterisk/pbx.h
View File

@@ -588,7 +588,9 @@ int ast_context_remove_switch2(struct ast_context *con, const char *sw,
*
* \param context context to remove extension from
* \param extension which extension to remove
* \param priority priority of extension to remove
* \param priority priority of extension to remove (0 to remove all)
* \param callerid NULL to remove all; non-NULL to match a single record per priority
* \param matchcid non-zero to match callerid element (if non-NULL); 0 to match default case
* \param registrar registrar of the extension
*
* This function removes an extension from a given context.
@@ -602,6 +604,13 @@ int ast_context_remove_extension(const char *context, const char *extension, int
int ast_context_remove_extension2(struct ast_context *con, const char *extension,
int priority, const char *registrar, int already_locked);
int ast_context_remove_extension_callerid(const char *context, const char *extension,
int priority, const char *callerid, int matchcid, const char *registrar);
int ast_context_remove_extension_callerid2(struct ast_context *con, const char *extension,
int priority, const char *callerid, int matchcid, const char *registrar,
int already_locked);
/*!
* \brief Add an ignorepat
*