diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-05-25 19:07:31 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-05-25 19:07:31 +0000 |
commit | d2872c914dc63dd85edec66c9c6c052c31c047d4 (patch) | |
tree | 1e3d6051b1a957da2656bfd4c5b24f83b6d0f42d /apps | |
parent | 26271fbd3acc16e31b9b351a85b00007d2ceb100 (diff) |
- mark some applications deprecated that already have replacements
- add BLACKLIST and mark LookupBlacklist deprecated
- add transfercapability support to CHANNEL and mark SetTransferCapability
deprecated
(issue #7225, Corydon)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_lookupblacklist.c | 37 | ||||
-rw-r--r-- | apps/app_lookupcidname.c | 5 | ||||
-rw-r--r-- | apps/app_setcdruserfield.c | 12 | ||||
-rw-r--r-- | apps/app_settransfercapability.c | 8 |
4 files changed, 60 insertions, 2 deletions
diff --git a/apps/app_lookupblacklist.c b/apps/app_lookupblacklist.c index 9db3d450b..72228f038 100644 --- a/apps/app_lookupblacklist.c +++ b/apps/app_lookupblacklist.c @@ -65,6 +65,32 @@ static char *descrip = LOCAL_USER_DECL; +static int blacklist_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) +{ + char blacklist[1]; + int bl = 0; + + if (chan->cid.cid_num) { + if (!ast_db_get("blacklist", chan->cid.cid_num, blacklist, sizeof (blacklist))) + bl = 1; + } + if (chan->cid.cid_name) { + if (!ast_db_get("blacklist", chan->cid.cid_name, blacklist, sizeof (blacklist))) + bl = 1; + } + + snprintf(buf, len, "%d", bl); + return 0; +} + +static struct ast_custom_function blacklist_function = { + .name = "BLACKLIST", + .synopsis = "Check if the callerid is on the blacklist", + .desc = "Uses astdb to check if the Caller*ID is in family 'blacklist'. Returns 1 or 0.\n", + .syntax = "BLACKLIST()", + .read = blacklist_read, +}; + static int lookupblacklist_exec (struct ast_channel *chan, void *data) { @@ -72,9 +98,15 @@ lookupblacklist_exec (struct ast_channel *chan, void *data) struct localuser *u; int bl = 0; int priority_jump = 0; + static int dep_warning = 0; LOCAL_USER_ADD(u); + if (!dep_warning) { + dep_warning = 1; + ast_log(LOG_WARNING, "LookupBlacklist is deprecated. Please use ${BLACKLIST()} instead.\n"); + } + if (!ast_strlen_zero(data)) { if (strchr(data, 'j')) priority_jump = 1; @@ -112,6 +144,7 @@ static int unload_module(void *mod) int res; res = ast_unregister_application(app); + res |= ast_custom_function_unregister(&blacklist_function); STANDARD_HANGUP_LOCALUSERS; @@ -120,7 +153,9 @@ static int unload_module(void *mod) static int load_module(void *mod) { - return ast_register_application (app, lookupblacklist_exec, synopsis,descrip); + int res = ast_custom_function_register(&blacklist_function); + res |= ast_register_application (app, lookupblacklist_exec, synopsis,descrip); + return res; } static const char *description(void) diff --git a/apps/app_lookupcidname.c b/apps/app_lookupcidname.c index a4af9eb96..9fdd81a67 100644 --- a/apps/app_lookupcidname.c +++ b/apps/app_lookupcidname.c @@ -66,8 +66,13 @@ lookupcidname_exec (struct ast_channel *chan, void *data) { char dbname[64]; struct localuser *u; + static int dep_warning = 0; LOCAL_USER_ADD (u); + if (!dep_warning) { + dep_warning = 1; + ast_log(LOG_WARNING, "LookupCIDName is deprecated. Please use ${DB(cidname/${CALLERID(num)})} instead.\n"); + } if (chan->cid.cid_num) { if (!ast_db_get ("cidname", chan->cid.cid_num, dbname, sizeof (dbname))) { ast_set_callerid (chan, NULL, dbname, NULL); diff --git a/apps/app_setcdruserfield.c b/apps/app_setcdruserfield.c index 165f2c60c..cfdcd7b59 100644 --- a/apps/app_setcdruserfield.c +++ b/apps/app_setcdruserfield.c @@ -109,6 +109,7 @@ static int setcdruserfield_exec(struct ast_channel *chan, void *data) { struct localuser *u; int res = 0; + static int dep_warning = 0; LOCAL_USER_ADD(u); @@ -116,6 +117,11 @@ static int setcdruserfield_exec(struct ast_channel *chan, void *data) ast_cdr_setuserfield(chan, (char*)data); } + if (!dep_warning) { + dep_warning = 1; + ast_log(LOG_WARNING, "SetCDRUserField is deprecated. Please use CDR(userfield) instead.\n"); + } + LOCAL_USER_REMOVE(u); return res; @@ -125,6 +131,7 @@ static int appendcdruserfield_exec(struct ast_channel *chan, void *data) { struct localuser *u; int res = 0; + static int dep_warning = 0; LOCAL_USER_ADD(u); @@ -132,6 +139,11 @@ static int appendcdruserfield_exec(struct ast_channel *chan, void *data) ast_cdr_appenduserfield(chan, (char*)data); } + if (!dep_warning) { + dep_warning = 1; + ast_log(LOG_WARNING, "AppendCDRUserField is deprecated. Please use CDR(userfield) instead.\n"); + } + LOCAL_USER_REMOVE(u); return res; diff --git a/apps/app_settransfercapability.c b/apps/app_settransfercapability.c index 5d0714798..be5894e59 100644 --- a/apps/app_settransfercapability.c +++ b/apps/app_settransfercapability.c @@ -76,9 +76,15 @@ static int settransfercapability_exec(struct ast_channel *chan, void *data) int x; char *opts; int transfercapability = -1; + static int dep_warning = 0; LOCAL_USER_ADD(u); - + + if (!dep_warning) { + dep_warning = 1; + ast_log(LOG_WARNING, "SetTransferCapability is deprecated. Please use CHANNEL(transfercapability) instead.\n"); + } + if (data) tmp = ast_strdupa(data); else |