From 06d951f58588d6713a71d2aa689a07e2af70254e Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Mon, 28 Jul 2008 16:00:19 +0000 Subject: merging the zap_and_dahdi_trunk branch up to trunk git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134050 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_chanspy.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'apps/app_chanspy.c') diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 7615ad4c8..4c5ab3333 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -219,13 +219,6 @@ AST_APP_OPTIONS(spy_opts, { }); 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 */ @@ -602,7 +595,7 @@ static struct chanspy_ds *next_channel(struct ast_channel *chan, const char *exten, const char *context, struct chanspy_ds *chanspy_ds) { struct ast_channel *next; - char channel_name[AST_CHANNEL_NAME]; + const size_t pseudo_len = strlen("DAHDI/pseudo"); redo: if (!ast_strlen_zero(spec)) @@ -615,8 +608,7 @@ redo: if (!next) return NULL; - snprintf(channel_name, AST_CHANNEL_NAME, "%s/pseudo", dahdi_chan_name); - if (!strncmp(next->name, channel_name, PSEUDO_CHAN_LEN)) { + if (!strncmp(next->name, "DAHDI/pseudo", pseudo_len)) { last = next; ast_channel_unlock(next); goto redo; @@ -1109,7 +1101,6 @@ 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); -- cgit v1.2.3