diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-04 03:30:30 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-04 03:30:30 +0000 |
commit | dcdab9324c53636c7b5c6b4b16f4708f237bfd27 (patch) | |
tree | 283ff324f759348a8b8aba09c88d03f2cc5df46b /include | |
parent | 9bb2e9bc7abd199a52f6a6d115df504af751d35c (diff) |
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.4@127973 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/pbx.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h index 41c04ce9c..329119295 100644 --- a/include/asterisk/pbx.h +++ b/include/asterisk/pbx.h @@ -585,7 +585,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. @@ -599,6 +601,12 @@ 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 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); + /*! * \brief Add an ignorepat * |