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

Made links fail only after waiting T2 for a second SLTA. 

Pausing the linkset disables answering with SLTA so failure can be emulated.


git-svn-id: http://yate.null.ro/svn/yate/trunk@3627 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2010-09-03 03:49:58 +00:00
parent 6dc9b19eae
commit 376ef6b69a
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/ysig/layer3.cpp
View File

@ -294,7 +294,7 @@ bool SS7Layer3::maintenance(const SS7MSU& msu, const SS7Label& label, int sls)
Debug(this,level,"Received SLTM %s with %u bytes",addr.c_str(),len);
if (badLink)
return false;
{
if (operational()) {
SS7Label lbl(label,label.sls(),0);
SS7MSU answer(msu.getSIO(),lbl,0,len+2);
unsigned char* d = answer.getData(lbl.length()+1,len+2);
@ -1104,9 +1104,9 @@ void SS7MTP3::timerTick(const Time& when)
SS7Layer2* l2 = *p;
if (l2 && l2->m_checkTime && (l2->m_checkTime < when) && l2->operational()) {
l2->m_checkTime = 0;
int level = DebugAll;
u_int64_t check = m_checkT2;
if (l2->m_checkFail) {
l2->m_checkFail = false;
if (l2->m_checkFail > 1) {
if (!l2->inhibited(SS7Layer2::Unchecked)) {
Debug(this,DebugWarn,"Taking link %d '%s' out of service [%p]",
l2->sls(),l2->toString().c_str(),this);
@ -1116,11 +1116,12 @@ void SS7MTP3::timerTick(const Time& when)
}
}
else if (m_checkT1) {
l2->m_checkFail = true;
if (l2->m_checkFail++)
level = DebugInfo;
check = m_checkT1;
}
// if some action set a new timer bail out, we'll get back to it
if (l2->m_checkTime)
if (l2->m_checkTime || !l2->operational())
continue;
l2->m_checkTime = check ? when + check : 0;
for (unsigned int i = 0; i < YSS7_PCTYPE_COUNT; i++) {
@ -1149,7 +1150,7 @@ void SS7MTP3::timerTick(const Time& when)
addr << SS7PointCode::lookup(type) << "," << lbl;
if (debugAt(DebugAll))
addr << " (" << lbl.opc().pack(type) << ":" << lbl.dpc().pack(type) << ":" << sls << ")";
Debug(this,DebugAll,"Sending SLTM %s with %u bytes",addr.c_str(),len);
Debug(this,level,"Sending SLTM %s with %u bytes",addr.c_str(),len);
*d++ = SS7MsgMTN::SLTM;
*d++ = len << 4;
@ -1185,7 +1186,7 @@ void SS7MTP3::linkChecked(int sls, bool remote)
}
}
else {
l2->m_checkFail = false;
l2->m_checkFail = 0;
l2->m_checkTime = m_checkT2 ? Time::now() + m_checkT2 : 0;
if (l2->inhibited(SS7Layer2::Unchecked)) {
Debug(this,DebugNote,"Placing link %d '%s' in service [%p]",

4
libs/ysig/yatesig.h
View File

@ -5127,7 +5127,7 @@ protected:
inline SS7Layer2()
: m_autoEmergency(true), m_lastSeqRx(-1), m_congestion(0),
m_l2userMutex(true,"SS7Layer2::l2user"), m_l2user(0), m_sls(-1),
m_checkTime(0), m_checkFail(false), m_inhibited(Unchecked)
m_checkTime(0), m_checkFail(0), m_inhibited(Unchecked)
{ }
/**
@ -5204,7 +5204,7 @@ private:
SS7L2User* m_l2user;
int m_sls;
u_int64_t m_checkTime;
bool m_checkFail;
int m_checkFail;
int m_inhibited;
};