diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 19:50:23 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 19:50:23 +0000 |
| commit | 2ee7794ccabab7e6a72a4b06aab9e074a49a15b0 (patch) | |
| tree | 72a999c8365f34cb74f5dd9dec59d8295c35743d /apps | |
| parent | 9a0a5b66f68f2366273fd609284778c1a6443fbc (diff) | |
Merged revisions 133171 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r133171 | mmichelson | 2008-07-23 14:48:03 -0500 (Wed, 23 Jul 2008) | 20 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@133172 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_chanspy.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index d18ea62ac..b657bcb29 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -51,9 +51,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define AST_NAME_STRLEN 256 - /* "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 = @@ -170,7 +167,14 @@ AST_APP_OPTIONS(spy_opts, { AST_APP_OPTION('X', OPTION_EXIT), }); -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 */ @@ -951,6 +955,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); |