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

Added method used to start a single circuit (un)blocking operation. Send circuit block message on previously blocked circuit when it is reset by the remote party. 

git-svn-id: http://voip.null.ro/svn/yate@3565 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2010-08-29 14:47:54 +00:00
parent 4b87eab92a
commit 567f4e2ca1
2 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libs/ysig/isup.cpp
View File

@ -4433,8 +4433,19 @@ void SS7ISUP::processControllerMsg(SS7MsgISUP* msg, const SS7Label& label, int s
releaseCircuit(m_rscCic);
break;
case SS7MsgISUP::RSC: // Reset Circuit
if (resetCircuit(msg->cic(),true,true))
if (resetCircuit(msg->cic(),true,true)) {
// Send BLK on previously blocked cic: Q.764 2.9.3.1 c)
lock();
SignallingCircuit* cic = circuits() ? circuits()->find(msg->cic()) : 0;
SS7MsgISUP* m = 0;
if (cic && cic->locked(SignallingCircuit::LockLocalMaint) &&
!cic->locked(SignallingCircuit::LockingMaint))
m = buildCicBlock(cic,true,true);
unlock();
if (m)
transmitMessage(m,label,true);
transmitRLC(this,msg->cic(),label,true);
}
else
reason = "unknown-channel";
stopSGM = true;
@ -5005,25 +5016,14 @@ bool SS7ISUP::handleCicBlockCommand(const NamedList& p, bool block)
if (!circuits())
return false;
SS7MsgISUP* msg = 0;
SignallingMessageTimer* t = 0;
bool force = p.getBoolValue("force");
String* param = p.getParam("circuit");
Lock mylock(this);
if (param) {
SignallingCircuit* cic = circuits()->find(param->toInteger());
const char* reason = checkBlockCic(cic,block,true,force);
if (reason) {
Debug(this,DebugNote,"Circuit '%s' circuit=%s: %s",
p.getValue("operation"),param->c_str(),reason);
msg = buildCicBlock(cic,block,force);
if (!msg)
return false;
}
blockCircuit(cic->code(),block,false,false,true,true);
cic->setLock(SignallingCircuit::LockingMaint);
msg = new SS7MsgISUP(block ? SS7MsgISUP::BLK : SS7MsgISUP::UBL,cic->code());
if (block)
t = new SignallingMessageTimer(m_t12Interval,m_t13Interval);
else
t = new SignallingMessageTimer(m_t14Interval,m_t15Interval);
}
else {
// NOTE: we assume the circuits belongs to the same span
@ -5101,14 +5101,15 @@ bool SS7ISUP::handleCicBlockCommand(const NamedList& p, bool block)
(maint ? "maintenance" : "hw-failure"));
msg->params().addParam("RangeAndStatus",String(map.length()));
msg->params().addParam("RangeAndStatus.map",map);
SignallingMessageTimer* t = 0;
if (block)
t = new SignallingMessageTimer(m_t18Interval,m_t19Interval);
else
t = new SignallingMessageTimer(m_t20Interval,m_t21Interval);
t->message(msg);
m_pending.add(t);
msg->ref();
}
t->message(msg);
m_pending.add(t);
msg->ref();
SS7Label label;
setLabel(label,msg->cic());
mylock.drop();
@ -5116,6 +5117,31 @@ bool SS7ISUP::handleCicBlockCommand(const NamedList& p, bool block)
return true;
}
// Try to start single circuit (un)blocking. Set a pending operation on success
// @param force True to ignore resetting/(un)blocking flags of the circuit
// Return built message to be sent on success
SS7MsgISUP* SS7ISUP::buildCicBlock(SignallingCircuit* cic, bool block, bool force)
{
const char* reason = checkBlockCic(cic,block,true,force);
if (reason) {
Debug(this,DebugNote,"Failed to start circuit %sblocking for %u: %s",
block ? "" : "un",cic ? cic->code() : 0,reason);
return 0;
}
blockCircuit(cic->code(),block,false,false,true,true);
cic->setLock(SignallingCircuit::LockingMaint);
SS7MsgISUP* m = new SS7MsgISUP(block ? SS7MsgISUP::BLK : SS7MsgISUP::UBL,cic->code());
SignallingMessageTimer* t = 0;
if (block)
t = new SignallingMessageTimer(m_t12Interval,m_t13Interval);
else
t = new SignallingMessageTimer(m_t14Interval,m_t15Interval);
t->message(m);
m_pending.add(t);
m->ref();
return m;
}
/**
* SS7BICC

4
libs/ysig/yatesig.h
View File

@ -7859,6 +7859,10 @@ private:
bool transmitMessages(ObjList& list);
// Handle circuit(s) (un)block command
bool handleCicBlockCommand(const NamedList& p, bool block);
// Try to start single circuit (un)blocking. Set a pending operation on success
// @param force True to ignore resetting/(un)blocking flags of the circuit
// Return built message to be sent on success
SS7MsgISUP* buildCicBlock(SignallingCircuit* cic, bool block, bool force = false);
SS7PointCode::Type m_type; // Point code type of this call controller
ObjList m_pointCodes; // Point codes serviced by this call controller