diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-04 16:10:32 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-04 16:10:32 +0000 |
| commit | 0cc9dcff58257d2f114ce7bf99bda7ed6becb18e (patch) | |
| tree | ff5d3ec6a3bcc6e810c0baeb6838b85f249617a3 /include/asterisk/pbx.h | |
| parent | 63face35655a24d62de29df01ad10da2cf78b94f (diff) | |
Merged revisions 128027 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r128027 | tilghman | 2008-07-04 11:06:34 -0500 (Fri, 04 Jul 2008) | 16 lines
Merged revisions 127973 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@128028 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/pbx.h')
| -rw-r--r-- | include/asterisk/pbx.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index f73ac4454..d8fcbae07 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -595,7 +595,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. @@ -609,6 +611,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 * |