retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed deadlock that occurs when circuits from different wanpipe voice spans were connected to each other. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@3449 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2010-07-19 10:52:39 +00:00
parent de9eb8c969
commit 79131ef5d8
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/server/wpcard.cpp
View File

@ -1607,16 +1607,25 @@ void WpSpan::run()
if (m_canSend) {
for (unsigned int i = 0; i < m_count; i++) {
WpCircuit* circuit = m_circuits[i];
unsigned char noData = swap((m_noData < 256 || !circuit) ? m_noData : circuit->code() & 0xff);
unsigned char* dat = m_buffer + WP_HEADER + i;
// Forward read data if we have a source
WpSource* s = (circuit && circuit->validSource()) ? circuit->source() : 0;
WpConsumer* c = (circuit && circuit->validConsumer()) ? circuit->consumer() : 0;
Lock lock(c);
for (int n = samples; n > 0; n--, dat += m_count) {
// Read each byte from buffer. Prepare buffer for sending
if (s)
if (s) {
unsigned char* dat = m_buffer + WP_HEADER + i;
for (int n = samples; n > 0; n--, dat += m_count)
s->put(swap(*dat));
*dat = c ? swap(c->get()) : noData;
}
// Fill send buffer for current circuit
unsigned char* dat = m_buffer + WP_HEADER + i;
WpConsumer* c = (circuit && circuit->validConsumer()) ? circuit->consumer() : 0;
if (c) {
Lock lock(c);
for (int n = samples; n > 0; n--, dat += m_count)
*dat = swap(c->get());
}
else {
unsigned char noData = swap((m_noData < 256 || !circuit) ? m_noData : circuit->code() & 0xff);
for (int n = samples; n > 0; n--, dat += m_count)
*dat = noData;
}
}
::memset(m_buffer,0,WP_HEADER);