[zaptel-commits] jdixon: branch 1.4 r4176 - /branches/1.4/kernel/zaptel-base.c

[SVN commits to the Zaptel project]

Author: jdixon
Date: Fri Apr 18 10:19:00 2008
New Revision: 4176

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4176
Log:
Fixed monitoring of zap pseudo channels

Modified:
    branches/1.4/kernel/zaptel-base.c

Modified: branches/1.4/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/zaptel-base.c?view=diff&rev=4176&r1=4175&r2=4176
==============================================================================
--- branches/1.4/kernel/zaptel-base.c (original)
+++ branches/1.4/kernel/zaptel-base.c Fri Apr 18 10:19:00 2008
@@ -5556,8 +5556,11 @@
 					SCSS(ms->conflast, conf_sums[ms->_confn]);
 					/* Really add in new value */
 					ACSS(conf_sums[ms->_confn], ms->conflast);
-				} else memset(ms->conflast, 0, ZT_CHUNKSIZE * sizeof(short));
-				memcpy(getlin, ms->getlin, ZT_CHUNKSIZE * sizeof(short));
+					memcpy(ms->getlin, getlin, ZT_CHUNKSIZE * sizeof(short));
+				} else {
+					memset(ms->conflast, 0, ZT_CHUNKSIZE * sizeof(short));
+					memcpy(getlin, ms->getlin, ZT_CHUNKSIZE * sizeof(short));
+				}
 				txb[0] = ZT_LIN2X(0, ms);
 				memset(txb + 1, txb[0], ZT_CHUNKSIZE - 1);
 				break;
@@ -6533,7 +6536,7 @@
 				/* Convert back */
 				for(x=0;x<ZT_CHUNKSIZE;x++)
 					rxb[x] = ZT_LIN2X(putlin[x], ms);
-				memcpy(ss->getlin, putlin, ZT_CHUNKSIZE * sizeof(short));
+				memcpy(ss->putlin, putlin, ZT_CHUNKSIZE * sizeof(short));
 				break;
 			   }
 			/* fall through */