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

Merge pull request 'Callfork fixes' (#7) from sur5r/yate:callfork-fixes into master 

Reviewed-on: #7
This commit is contained in:
Harald Welte 2023-10-03 09:02:04 +00:00
parent 64a0515ea2 746c12b2dc
commit 7148da333f
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/callfork.cpp
View File

@ -323,6 +323,8 @@ bool ForkMaster::forkSlave(String* dest)
Debug(this,DebugAll,"Call '%s' target '%s' slave '%s' execute succeeded with no peer [%p]",
getPeerId().c_str(),dest->c_str(),tmp.c_str(),this);
ok = false;
// error propagation via lostMaster() does not work in this case. No channel was created, hence no messages are created
m_exec->setParam("error", error);
slave->lostMaster(error);
}
slave->deref();
@ -364,6 +366,7 @@ bool ForkMaster::startCalling(Message& msg)
m_rtpForward = msg.getBoolValue("rtp_forward");
m_rtpStrict = msg.getBoolValue("rtpstrict");
if (!callContinue()) {
Debug(&__plugin,DebugNote,"Fork '%s' startCalling() failed. No successful peers", id().c_str());
const char* err = m_exec->getValue("reason");
if (err)
msg.setParam("reason",err);
@ -428,8 +431,30 @@ bool ForkMaster::callContinue()
getPeerId().c_str(),dest->c_str(),this);
}
dest->destruct();
if (forks)
break;
if (forks) {
unsigned int regulars = 0;
unsigned int auxiliars = 0;
unsigned int persistents = 0;
for (ObjList* l = m_slaves.skipNull(); l; l = l->skipNext()) {
switch (static_cast<const ForkSlave*>(l->get())->type()) {
case ForkSlave::Auxiliar:
auxiliars++;
break;
case ForkSlave::Persistent:
persistents++;
break;
default:
regulars++;
break;
}
}
if (regulars > 0) {
break;
} else {
clear(true);
forks = persistents;
}
}
m_timer = 0;
m_timerDrop = false;
continue;