[svn-commits] mmichelson: branch 1.6.0 r133107 - in /branches/1.6.0: ./ apps/app_chanspy.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 23 14:08:22 2008
New Revision: 133107

URL: http://svn.digium.com/view/asterisk?view=rev&rev=133107
Log:
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.


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_chanspy.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_chanspy.c?view=diff&rev=133107&r1=133106&r2=133107
==============================================================================
--- branches/1.6.0/apps/app_chanspy.c (original)
+++ branches/1.6.0/apps/app_chanspy.c Wed Jul 23 14:08:22 2008
@@ -50,6 +50,9 @@
 #include "asterisk/options.h"
 
 #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";
@@ -514,7 +517,7 @@
 		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;