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

Changed the MTP3 logic to auto-activate a link that is accidentally inactive on MSU reception. 

Added MTP3 troubleshooting parameter "inhibit" to manually control link inhibit flags.


git-svn-id: http://yate.null.ro/svn/yate/trunk@4738 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2011-12-06 17:49:24 +00:00
parent 0b33420051
commit b805b1ebcf
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/ysig/layer3.cpp
View File

@ -798,6 +798,20 @@ bool SS7MTP3::control(Operation oper, NamedList* params)
if (params) {
m_checklinks = params->getBoolValue(YSTRING("checklinks"),m_checklinks);
m_forcealign = params->getBoolValue(YSTRING("forcealign"),m_forcealign);
const String& inh = (*params)[YSTRING("inhibit")];
if (inh) {
// inhibit=slc,[inh_flags][,uninh_flags]
ObjList* l = inh.split(',',true);
if (l && (l->length() == 2 || l->length() == 3)) {
int slc = l->at(0)->toString().toInteger(-1);
if (slc >= 0) {
int inh = l->at(1)->toString().toInteger(0);
int unh = l->at(2) ? l->at(2)->toString().toInteger(0) : 0;
inhibit(slc,inh,unh);
}
}
TelEngine::destruct(l);
}
}
switch (oper) {
case Pause:
@ -1041,16 +1055,21 @@ bool SS7MTP3::receivedMSU(const SS7MSU& msu, SS7Layer2* link, int sls)
}
#endif
bool maint = (msu.getSIF() == SS7MSU::MTN) || (msu.getSIF() == SS7MSU::MTNS);
if (link) {
if (link->inhibited(SS7Layer2::Unchecked)) {
if (!maint)
return false;
}
if (!maint && (msu.getSIF() != SS7MSU::SNM) &&
link->inhibited(SS7Layer2::Unchecked|SS7Layer2::Inactive|SS7Layer2::Local)) {
Debug(this,DebugMild,"Received MSU on inhibited 0x%02X link %d '%s'",
link->inhibited(),sls,link->toString().c_str());
if (link && !maint) {
int inhibited = link->inhibited() & (SS7Layer2::Unchecked|SS7Layer2::Inactive|SS7Layer2::Local);
if (inhibited & SS7Layer2::Unchecked)
return false;
if (inhibited && msu.getSIF() != SS7MSU::SNM) {
if (inhibited == SS7Layer2::Inactive) {
Debug(this,DebugNote,"Activating inactive link %d '%s' on %s MSU receive",
sls,link->toString().c_str(),msu.getServiceName());
link->inhibit(0,SS7Layer2::Inactive);
}
else {
Debug(this,DebugMild,"Received MSU on inhibited 0x%02X link %d '%s'",
link->inhibited(),sls,link->toString().c_str());
return false;
}
}
}
// first try to call the user part