[Asterisk-cvs] zaptel zaptel.c,1.96,1.97

[jim at lists.digium.com]

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv28854

Modified Files:
	zaptel.c 
Log Message:
Fix CONF_MONITOR modes in zaptel.c so that it works properly between 2 pseudo-channels.


Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- zaptel.c	6 Oct 2004 16:11:46 -0000	1.96
+++ zaptel.c	25 Oct 2004 22:46:19 -0000	1.97
@@ -4583,6 +4583,8 @@
 			/* Do nuffin */
 			break;
 		case ZT_CONF_MONITOR:	/* Monitor a channel's rx mode */
+			  /* if a pseudo-channel, ignore */
+			if (ms->flags & ZT_FLAG_PSEUDO) break;
 			/* Add monitored channel */
 			if (chans[ms->confna]->flags & ZT_FLAG_PSEUDO) {
 				ACSS(getlin, chans[ms->confna]->getlin);
@@ -4593,6 +4595,8 @@
 				txb[x] = ZT_LIN2X(getlin[x], ms);
 			break;
 		case ZT_CONF_MONITORTX: /* Monitor a channel's tx mode */
+			  /* if a pseudo-channel, ignore */
+			if (ms->flags & ZT_FLAG_PSEUDO) break;
 			/* Add monitored channel */
 			if (chans[ms->confna]->flags & ZT_FLAG_PSEUDO) {
 				ACSS(getlin, chans[ms->confna]->putlin);
@@ -4604,6 +4608,8 @@
 				txb[x] = ZT_LIN2X(getlin[x], ms);
 			break;
 		case ZT_CONF_MONITORBOTH: /* monitor a channel's rx and tx mode */
+			  /* if a pseudo-channel, ignore */
+			if (ms->flags & ZT_FLAG_PSEUDO) break;
 			ACSS(getlin, chans[ms->confna]->putlin);
 			ACSS(getlin, chans[ms->confna]->getlin);
 			for (x=0;x<ZT_CHUNKSIZE;x++)