Git does not support the ability to replace a token with a version string during check-in. While it does have support for replacing a token on clone, this is somewhat sub-optimal: the token is replaced with the object hash, which is not particularly easy for human consumption. What's more, in practice, the source file version was often not terribly useful. Generally, when triaging bugs, the overall version of Asterisk is far more useful than an individual SVN version of a file. As a result, this patch removes Asterisk's support for showing source file versions. Specifically, it does the following: * Rename ASTERISK_FILE_VERSION macro to ASTERISK_REGISTER_FILE, and remove passing the version in with the macro. Other facilities than 'core show file version' make use of the file names, such as setting a debug level only on a specific file. As such, the act of registering source files with the Asterisk core still has use. The macro rename now reflects the new macro purpose. * main/asterisk: - Refactor the file_version structure to reflect that it no longer tracks a version field. - Remove the "core show file version" CLI command. Without the file version, it is no longer useful. - Remove the ast_file_version_find function. The file version is no longer tracked. - Rename ast_register_file_version/ast_unregister_file_version to ast_register_file/ast_unregister_file, respectively. * main/manager: Remove value from the Version key of the ModuleCheck Action. The actual key itself has not been removed, as doing so would absolutely constitute a backwards incompatible change. However, since the file version is no longer tracked, there is no need to attempt to include it in the Version key. * UPGRADE: Add notes for: - Modification to the ModuleCheck AMI Action - Removal of the "core show file version" CLI command Change-Id: I6cf0ff280e1668bf4957dc21f32a5ff43444a40e
280 lines
9 KiB
C
280 lines
9 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 1999 - 2005, Digium, Inc.
|
|
*
|
|
* WaitForSilence Application by David C. Troy <dave@popvox.com>
|
|
* Version 1.11 2006-06-29
|
|
*
|
|
* Mark Spencer <markster@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief Wait for Silence
|
|
* - Waits for up to 'x' milliseconds of silence, 'y' times \n
|
|
* - WaitForSilence(500,2) will wait for 1/2 second of silence, twice \n
|
|
* - WaitForSilence(1000,1) will wait for 1 second of silence, once \n
|
|
* - WaitForSilence(300,3,10) will wait for 300ms of silence, 3 times, and return after 10sec \n
|
|
*
|
|
* \author David C. Troy <dave@popvox.com>
|
|
*
|
|
* \brief Wait For Noise
|
|
* The same as Wait For Silence but listenes noise on the chennel that is above \n
|
|
* the pre-configured silence threshold from dsp.conf
|
|
*
|
|
* \author Philipp Skadorov <skadorov@yahoo.com>
|
|
*
|
|
* \ingroup applications
|
|
*/
|
|
|
|
/*** MODULEINFO
|
|
<support_level>extended</support_level>
|
|
***/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_REGISTER_FILE()
|
|
|
|
#include "asterisk/file.h"
|
|
#include "asterisk/channel.h"
|
|
#include "asterisk/pbx.h"
|
|
#include "asterisk/dsp.h"
|
|
#include "asterisk/module.h"
|
|
#include "asterisk/format_cache.h"
|
|
|
|
/*** DOCUMENTATION
|
|
<application name="WaitForSilence" language="en_US">
|
|
<synopsis>
|
|
Waits for a specified amount of silence.
|
|
</synopsis>
|
|
<syntax>
|
|
<parameter name="silencerequired" required="true" />
|
|
<parameter name="iterations">
|
|
<para>If not specified, defaults to <literal>1</literal>.</para>
|
|
</parameter>
|
|
<parameter name="timeout">
|
|
<para>Is specified only to avoid an infinite loop in cases where silence is never achieved.</para>
|
|
</parameter>
|
|
</syntax>
|
|
<description>
|
|
<para>Waits for up to <replaceable>silencerequired</replaceable> milliseconds of silence,
|
|
<replaceable>iterations</replaceable> times. An optional <replaceable>timeout</replaceable>
|
|
specified the number of seconds to return after, even if we do not receive the specified amount of silence.
|
|
Use <replaceable>timeout</replaceable> with caution, as it may defeat the purpose of this application, which
|
|
is to wait indefinitely until silence is detected on the line. This is particularly useful for reverse-911-type
|
|
call broadcast applications where you need to wait for an answering machine to complete its spiel before
|
|
playing a message.</para>
|
|
<para>Typically you will want to include two or more calls to WaitForSilence when dealing with an answering
|
|
machine; first waiting for the spiel to finish, then waiting for the beep, etc.</para>
|
|
<para>Examples:</para>
|
|
<para>WaitForSilence(500,2) will wait for 1/2 second of silence, twice</para>
|
|
<para>WaitForSilence(1000) will wait for 1 second of silence, once</para>
|
|
<para>WaitForSilence(300,3,10) will wait for 300ms silence, 3 times, and returns after 10 sec, even if silence
|
|
is not detected</para>
|
|
<para>Sets the channel variable <variable>WAITSTATUS</variable> to one of these values:</para>
|
|
<variablelist>
|
|
<variable name="WAITSTATUS">
|
|
<value name="SILENCE">
|
|
if exited with silence detected.
|
|
</value>
|
|
<value name="TIMEOUT">
|
|
if exited without silence detected after timeout.
|
|
</value>
|
|
</variable>
|
|
</variablelist>
|
|
</description>
|
|
<see-also>
|
|
<ref type="application">WaitForNoise</ref>
|
|
</see-also>
|
|
</application>
|
|
<application name="WaitForNoise" language="en_US">
|
|
<synopsis>
|
|
Waits for a specified amount of noise.
|
|
</synopsis>
|
|
<syntax>
|
|
<parameter name="noiserequired" required="true" />
|
|
<parameter name="iterations">
|
|
<para>If not specified, defaults to <literal>1</literal>.</para>
|
|
</parameter>
|
|
<parameter name="timeout">
|
|
<para>Is specified only to avoid an infinite loop in cases where silence is never achieved.</para>
|
|
</parameter>
|
|
</syntax>
|
|
<description>
|
|
<para>Waits for up to <replaceable>noiserequired</replaceable> milliseconds of noise,
|
|
<replaceable>iterations</replaceable> times. An optional <replaceable>timeout</replaceable>
|
|
specified the number of seconds to return after, even if we do not receive the specified amount of noise.
|
|
Use <replaceable>timeout</replaceable> with caution, as it may defeat the purpose of this application, which
|
|
is to wait indefinitely until noise is detected on the line.</para>
|
|
</description>
|
|
<see-also>
|
|
<ref type="application">WaitForSilence</ref>
|
|
</see-also>
|
|
</application>
|
|
***/
|
|
|
|
static char *app_silence = "WaitForSilence";
|
|
static char *app_noise = "WaitForNoise";
|
|
|
|
static int do_waiting(struct ast_channel *chan, int timereqd, time_t waitstart, int timeout, int wait_for_silence) {
|
|
struct ast_frame *f = NULL;
|
|
int dsptime = 0;
|
|
RAII_VAR(struct ast_format *, rfmt, NULL, ao2_cleanup);
|
|
int res = 0;
|
|
struct ast_dsp *sildet; /* silence detector dsp */
|
|
time_t now;
|
|
|
|
/*Either silence or noise calc depending on wait_for_silence flag*/
|
|
int (*ast_dsp_func)(struct ast_dsp*, struct ast_frame*, int*) =
|
|
wait_for_silence ? ast_dsp_silence : ast_dsp_noise;
|
|
|
|
rfmt = ao2_bump(ast_channel_readformat(chan));
|
|
if ((res = ast_set_read_format(chan, ast_format_slin)) < 0) {
|
|
ast_log(LOG_WARNING, "Unable to set channel to linear mode, giving up\n");
|
|
return -1;
|
|
}
|
|
|
|
/* Create the silence detector */
|
|
if (!(sildet = ast_dsp_new())) {
|
|
ast_log(LOG_WARNING, "Unable to create silence detector :(\n");
|
|
return -1;
|
|
}
|
|
ast_dsp_set_threshold(sildet, ast_dsp_get_threshold_from_settings(THRESHOLD_SILENCE));
|
|
|
|
/* Await silence... */
|
|
for (;;) {
|
|
/* Start with no silence received */
|
|
dsptime = 0;
|
|
|
|
res = ast_waitfor(chan, timereqd);
|
|
|
|
/* Must have gotten a hangup; let's exit */
|
|
if (res < 0) {
|
|
pbx_builtin_setvar_helper(chan, "WAITSTATUS", "HANGUP");
|
|
break;
|
|
}
|
|
|
|
/* We waited and got no frame; sounds like digital silence or a muted digital channel */
|
|
if (res == 0) {
|
|
dsptime = timereqd;
|
|
} else {
|
|
/* Looks like we did get a frame, so let's check it out */
|
|
if (!(f = ast_read(chan))) {
|
|
pbx_builtin_setvar_helper(chan, "WAITSTATUS", "HANGUP");
|
|
break;
|
|
}
|
|
if (f->frametype == AST_FRAME_VOICE) {
|
|
ast_dsp_func(sildet, f, &dsptime);
|
|
}
|
|
ast_frfree(f);
|
|
}
|
|
|
|
ast_debug(1, "Got %dms %s < %dms required\n", dsptime, wait_for_silence ? "silence" : "noise", timereqd);
|
|
|
|
if (dsptime >= timereqd) {
|
|
ast_verb(3, "Exiting with %dms %s >= %dms required\n", dsptime, wait_for_silence ? "silence" : "noise", timereqd);
|
|
/* Ended happily with silence */
|
|
res = 1;
|
|
pbx_builtin_setvar_helper(chan, "WAITSTATUS", wait_for_silence ? "SILENCE" : "NOISE");
|
|
ast_debug(1, "WAITSTATUS was set to %s\n", wait_for_silence ? "SILENCE" : "NOISE");
|
|
break;
|
|
}
|
|
|
|
if (timeout && (difftime(time(&now), waitstart) >= timeout)) {
|
|
pbx_builtin_setvar_helper(chan, "WAITSTATUS", "TIMEOUT");
|
|
ast_debug(1, "WAITSTATUS was set to TIMEOUT\n");
|
|
res = 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
if (rfmt && ast_set_read_format(chan, rfmt)) {
|
|
ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_format_get_name(rfmt), ast_channel_name(chan));
|
|
}
|
|
ast_dsp_free(sildet);
|
|
return res;
|
|
}
|
|
|
|
static int waitfor_exec(struct ast_channel *chan, const char *data, int wait_for_silence)
|
|
{
|
|
int res = 1;
|
|
int timereqd = 1000;
|
|
int timeout = 0;
|
|
int iterations = 1, i;
|
|
time_t waitstart;
|
|
struct ast_silence_generator *silgen = NULL;
|
|
|
|
if (ast_channel_state(chan) != AST_STATE_UP) {
|
|
res = ast_answer(chan); /* Answer the channel */
|
|
}
|
|
|
|
if (!data || ( (sscanf(data, "%30d,%30d,%30d", &timereqd, &iterations, &timeout) != 3) &&
|
|
(sscanf(data, "%30d,%30d", &timereqd, &iterations) != 2) &&
|
|
(sscanf(data, "%30d", &timereqd) != 1) ) ) {
|
|
ast_log(LOG_WARNING, "Using default value of 1000ms, 1 iteration, no timeout\n");
|
|
}
|
|
|
|
ast_verb(3, "Waiting %d time(s) for %d ms silence with %d timeout\n", iterations, timereqd, timeout);
|
|
|
|
if (ast_opt_transmit_silence) {
|
|
silgen = ast_channel_start_silence_generator(chan);
|
|
}
|
|
time(&waitstart);
|
|
res = 1;
|
|
for (i=0; (i<iterations) && (res == 1); i++) {
|
|
res = do_waiting(chan, timereqd, waitstart, timeout, wait_for_silence);
|
|
}
|
|
if (silgen) {
|
|
ast_channel_stop_silence_generator(chan, silgen);
|
|
}
|
|
|
|
|
|
if (res > 0)
|
|
res = 0;
|
|
return res;
|
|
}
|
|
|
|
static int waitforsilence_exec(struct ast_channel *chan, const char *data)
|
|
{
|
|
return waitfor_exec(chan, data, 1);
|
|
}
|
|
|
|
static int waitfornoise_exec(struct ast_channel *chan, const char *data)
|
|
{
|
|
return waitfor_exec(chan, data, 0);
|
|
}
|
|
|
|
static int unload_module(void)
|
|
{
|
|
int res;
|
|
res = ast_unregister_application(app_silence);
|
|
res |= ast_unregister_application(app_noise);
|
|
|
|
return res;
|
|
}
|
|
|
|
static int load_module(void)
|
|
{
|
|
int res;
|
|
|
|
res = ast_register_application_xml(app_silence, waitforsilence_exec);
|
|
res |= ast_register_application_xml(app_noise, waitfornoise_exec);
|
|
return res;
|
|
}
|
|
|
|
AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "Wait For Silence");
|
|
|
|
|