mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 04:11:08 +00:00
Merged revisions 133169 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r133169 | mmichelson | 2008-07-23 14:39:47 -0500 (Wed, 23 Jul 2008) | 12 lines As suggested by seanbright, the PSEUDO_CHAN_LEN in app_chanspy should be set at load time, not at compile time, since dahdi_chan_name is determined at load time. Also changed the next_unique_id_to_use to have the static qualifier. Also added the dahdi_chan_name_len variable so that strlen(dahdi_chan_name) isn't necessary. Thanks to seanbright for the suggestion. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@133171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -52,9 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#define AST_NAME_STRLEN 256
|
||||
#define NUM_SPYGROUPS 128
|
||||
|
||||
/* "DAHDI/pseudo" is twelve characters */
|
||||
#define PSEUDO_CHAN_LEN 12
|
||||
|
||||
static const char *tdesc = "Listen to a channel, and optionally whisper into it";
|
||||
static const char *app_chan = "ChanSpy";
|
||||
static const char *desc_chan =
|
||||
@@ -221,7 +218,14 @@ AST_APP_OPTIONS(spy_opts, {
|
||||
AST_APP_OPTION('d', OPTION_DTMF_SWITCH_MODES),
|
||||
});
|
||||
|
||||
int next_unique_id_to_use = 0;
|
||||
static int next_unique_id_to_use = 0;
|
||||
static int PSEUDO_CHAN_LEN;
|
||||
|
||||
static void determine_pseudo_chan_len(void)
|
||||
{
|
||||
PSEUDO_CHAN_LEN = dahdi_chan_name_len + strlen("/pseudo");
|
||||
}
|
||||
|
||||
|
||||
struct chanspy_translation_helper {
|
||||
/* spy data */
|
||||
@@ -1105,6 +1109,7 @@ static int load_module(void)
|
||||
{
|
||||
int res = 0;
|
||||
|
||||
determine_pseudo_chan_len();
|
||||
res |= ast_register_application(app_chan, chanspy_exec, tdesc, desc_chan);
|
||||
res |= ast_register_application(app_ext, extenspy_exec, tdesc, desc_ext);
|
||||
|
||||
|
Reference in New Issue
Block a user