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

Allow to skip over SLT configuration and go directly to connect by setting the config retry interval to zero. 

git-svn-id: http://voip.null.ro/svn/yate@3274 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2010-05-03 16:45:46 +00:00
parent 7b9d11ccf0
commit 73506e8d1a
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf.d/ciscosm.conf.sample
View File

@ -64,6 +64,7 @@
;autostart=yes
; configuration: int: Configuration request retransmission interval in ms, 250+
; A zero value disables configuration step and jumps directly to connect request
;configuration=5000
; printslt: bool: Display SLT communication for debugging purposes

36
modules/server/ciscosm.cpp
View File

@ -398,6 +398,7 @@ public:
virtual bool transmitMSU(const SS7MSU& msu);
void getStringMessage(String& tmp, DataBlock& data);
virtual bool operational() const;
virtual void configure(bool start);
static inline const char* stateName(State s)
{ return lookup((int)s,s_states); }
inline u_int16_t channel()
@ -1613,11 +1614,8 @@ void SLT::notify(bool up)
{
if (!up)
setStatus(Unconfigured);
else {
sendManagement(Configuration_R);
m_confReqTimer.start();
setStatus(Waiting);
}
else
configure(true);
}
bool SLT::control(Operation oper, NamedList* params)
@ -1641,9 +1639,7 @@ bool SLT::control(Operation oper, NamedList* params)
case Waiting:
break;
default:
sendManagement(Configuration_R);
m_confReqTimer.start();
setStatus(Waiting);
configure(true);
}
}
return true;
@ -1773,13 +1769,7 @@ void SLT::processManagement(u_int16_t msgType, DataBlock& data)
{
switch ((Messages)msgType) {
case Configuration_C:
m_confReqTimer.stop();
setStatus(Configured);
SS7Layer2::notify();
DDebug(this,DebugInfo,"requested status = %s",statusName(m_reqStatus,false));
if (m_reqStatus != NormalAlignment && m_reqStatus != EmergencyAlignment)
break;
sendConnect(m_reqStatus == NormalAlignment ? Normal : Emergency);
configure(false);
break;
case Status_C:
case Statistic_C:
@ -1989,6 +1979,22 @@ bool SLT::operational() const
return aligned();
}
void SLT::configure(bool start)
{
if (start && m_confReqTimer.interval()) {
sendManagement(Configuration_R);
m_confReqTimer.start();
setStatus(Waiting);
return;
}
m_confReqTimer.stop();
setStatus(Configured);
SS7Layer2::notify();
DDebug(this,DebugInfo,"requested status = %s",statusName(m_reqStatus,false));
if (m_reqStatus == NormalAlignment || m_reqStatus == EmergencyAlignment)
sendConnect(m_reqStatus == NormalAlignment ? Normal : Emergency);
}
SignallingComponent* SLT::create(const String& type, const NamedList& name)
{
if (type != "SS7Layer2")