diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 19:08:22 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-23 19:08:22 +0000 |
commit | 9a0a5b66f68f2366273fd609284778c1a6443fbc (patch) | |
tree | 16fdd2773e91622fb9f5863ebd8931f424c26f06 | |
parent | 649e8dc27f8c610156dba90810339d8846b855cd (diff) |
Merged revisions 133106 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r133106 | mmichelson | 2008-07-23 14:07:56 -0500 (Wed, 23 Jul 2008) | 13 lines
Merged revisions 133104 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r133104 | mmichelson | 2008-07-23 14:06:16 -0500 (Wed, 23 Jul 2008) | 5 lines
Zap/pseudo is ten characters, but DAHDI/pseudo is
twelve. The strncmp call in next_channel should
account for this.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@133107 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_chanspy.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 5b3b8fbd8..d18ea62ac 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -51,6 +51,9 @@ 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 = @@ -514,7 +517,7 @@ redo: return NULL; snprintf(channel_name, AST_CHANNEL_NAME, "%s/pseudo", dahdi_chan_name); - if (!strncmp(next->name, channel_name, 10)) { + if (!strncmp(next->name, channel_name, PSEUDO_CHAN_LEN)) { last = next; ast_channel_unlock(next); goto redo; |