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

Fixed M2PA abort alignment t2 timeout bug. 

Increased abort alignment debug level.


git-svn-id: http://voip.null.ro/svn/yate@4806 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
andrei 2012-01-17 13:04:30 +00:00
parent 14f0dc082d
commit 930c5b4447
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ysig/sigtran.cpp
View File

@ -1324,9 +1324,10 @@ void SS7M2PA::setHeader(DataBlock& data)
data.append(head,8);
}
void SS7M2PA::abortAlignment(const String& info)
void SS7M2PA::abortAlignment(const char* info)
{
Debug(this,DebugInfo,"Aborting alignment: %s",info.c_str());
if (info)
Debug(this,DebugNote,"Aborting alignment: %s",info);
setLocalStatus(OutOfService);
setRemoteStatus(OutOfService);
m_needToAck = m_lastAck = m_seqNr = 0xffffff;
@ -1372,6 +1373,7 @@ bool SS7M2PA::processLinkStatus(DataBlock& data,int streamId)
break;
case ProvingNormal:
case ProvingEmergency:
m_t2.stop();
if (m_localStatus != ProvingNormal && m_localStatus != ProvingEmergency &&
(m_localStatus == Alignment && m_t3.started()))
return false;
@ -1401,6 +1403,7 @@ bool SS7M2PA::processLinkStatus(DataBlock& data,int streamId)
m_lastSeqRx = -1;
SS7Layer2::notify();
m_oosTimer.stop();
m_t2.stop();
m_t3.stop();
m_t4.stop();
m_t1.stop();
@ -1474,6 +1477,7 @@ bool SS7M2PA::processSLinkStatus(DataBlock& data,int streamId)
break;
case ProvingNormal:
case ProvingEmergency:
m_t2.stop();
if (m_localStatus == Alignment && m_t3.started()) {
m_t3.stop();
setLocalStatus(status);
@ -1504,6 +1508,7 @@ bool SS7M2PA::processSLinkStatus(DataBlock& data,int streamId)
m_lastSeqRx = -1;
SS7Layer2::notify();
m_oosTimer.stop();
m_t2.stop();
m_t3.stop();
m_t4.stop();
m_t1.stop();

2
libs/ysig/yatesig.h
View File

@ -7007,7 +7007,7 @@ public:
* Change state to OutOfService and notifys upper layer
* @param info Debuging purpose, Information about detected error
*/
void abortAlignment(const String& info);
void abortAlignment(const char* info = 0);
/**
* Send link status message to inform the peer about ouer curent state