diff options
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_callcompletion.c | 7 | ||||
| -rw-r--r-- | funcs/func_cdr.c | 7 | ||||
| -rw-r--r-- | funcs/func_channel.c | 22 | ||||
| -rw-r--r-- | funcs/func_enum.c | 7 |
4 files changed, 18 insertions, 25 deletions
diff --git a/funcs/func_callcompletion.c b/funcs/func_callcompletion.c index ed5238c1f..37ba38ce4 100644 --- a/funcs/func_callcompletion.c +++ b/funcs/func_callcompletion.c @@ -126,4 +126,9 @@ static int load_module(void) return ast_custom_function_register(&cc_function) == 0 ? AST_MODULE_LOAD_SUCCESS : AST_MODULE_LOAD_DECLINE; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call Control Configuration Function"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Call Control Configuration Function", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "ccss", +); diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c index 2dd9f1578..d7bc21145 100644 --- a/funcs/func_cdr.c +++ b/funcs/func_cdr.c @@ -704,4 +704,9 @@ static int load_module(void) return AST_MODULE_LOAD_SUCCESS; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Call Detail Record (CDR) dialplan functions"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Call Detail Record (CDR) dialplan functions", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "cdr", +); diff --git a/funcs/func_channel.c b/funcs/func_channel.c index e290fa09a..f82dad37a 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -205,10 +205,6 @@ <enum name="videonativeformat"> <para>R/O format used natively for video</para> </enum> - <enum name="trace"> - <para>R/W whether or not context tracing is enabled, only available - <emphasis>if CHANNEL_TRACE is defined</emphasis>.</para> - </enum> <enum name="hangupsource"> <para>R/W returns the channel responsible for hangup.</para> </enum> @@ -328,10 +324,6 @@ static int func_channel_read(struct ast_channel *chan, const char *function, locked_copy_string(chan, buf, ast_format_get_name(ast_channel_readformat(chan)), len); } else if (!strcasecmp(data, "audiowriteformat")) { locked_copy_string(chan, buf, ast_format_get_name(ast_channel_writeformat(chan)), len); -#ifdef CHANNEL_TRACE - } else if (!strcasecmp(data, "trace")) { - locked_copy_string(chan, buf, ast_channel_trace_is_enabled(chan) ? "1" : "0", len); -#endif } else if (!strcasecmp(data, "tonezone") && ast_channel_zone(chan)) { locked_copy_string(chan, buf, ast_channel_zone(chan)->country, len); } else if (!strcasecmp(data, "dtmf_features")) { @@ -515,20 +507,6 @@ static int func_channel_write_real(struct ast_channel *chan, const char *functio else if (!strcasecmp(data, "hangupsource")) /* XXX - should we be forcing this here? */ ast_set_hangupsource(chan, value, 0); -#ifdef CHANNEL_TRACE - else if (!strcasecmp(data, "trace")) { - ast_channel_lock(chan); - if (ast_true(value)) - ret = ast_channel_trace_enable(chan); - else if (ast_false(value)) - ret = ast_channel_trace_disable(chan); - else { - ret = -1; - ast_log(LOG_WARNING, "Invalid value for CHANNEL(trace).\n"); - } - ast_channel_unlock(chan); - } -#endif else if (!strcasecmp(data, "tonezone")) { struct ast_tone_zone *new_zone; if (!(new_zone = ast_get_indication_zone(value))) { diff --git a/funcs/func_enum.c b/funcs/func_enum.c index 6929e3ccd..f649e0f29 100644 --- a/funcs/func_enum.c +++ b/funcs/func_enum.c @@ -472,4 +472,9 @@ static int load_module(void) return res; } -AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ENUM related dialplan functions"); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ENUM related dialplan functions", + .support_level = AST_MODULE_SUPPORT_CORE, + .load = load_module, + .unload = unload_module, + .requires = "enum", +); |