diff options
| author | jdixon <jdixon@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-18 15:19:00 +0000 |
|---|---|---|
| committer | jdixon <jdixon@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-04-18 15:19:00 +0000 |
| commit | 0a591d86a1cc9bdddac044b646f3d5a45222dba3 (patch) | |
| tree | 42362303ffbee2e81bf317ff222f9e119d2d09b6 /kernel/zaptel-base.c | |
| parent | b2953304c3c00b6f49cd5728d22b00c1f31a3ed5 (diff) | |
Fixed monitoring of zap pseudo channels
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4176 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/zaptel-base.c')
| -rw-r--r-- | kernel/zaptel-base.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/zaptel-base.c b/kernel/zaptel-base.c index af068ef..326a7b1 100644 --- a/kernel/zaptel-base.c +++ b/kernel/zaptel-base.c @@ -5556,8 +5556,11 @@ static inline void __zt_process_getaudio_chunk(struct zt_chan *ss, unsigned char 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 @@ static inline void __zt_process_putaudio_chunk(struct zt_chan *ss, unsigned char /* 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 */ |