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

Send TFP for unexpected packets through SS7Management, support Transfer prohibited inhibition timer (Q.704 T8). 

git-svn-id: http://yate.null.ro/svn/yate/trunk@3635 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2010-09-03 14:57:09 +00:00
parent ec365a11cf
commit bc7cfa0b75
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/ysig/layer3.cpp
View File

@ -987,6 +987,26 @@ bool SS7MTP3::receivedMSU(const SS7MSU& msu, SS7Layer2* link, int sls)
return false;
switch (handled) {
case HandledMSU::NoAddress:
while (SS7Router* router = YOBJECT(SS7Router,user())) {
RefPointer<SS7Management> mngmt = router->getManagement();
if (!mngmt)
break;
NamedList* ctl = mngmt->controlCreate("prohibit");
if (!ctl)
break;
unsigned int local = getLocal(cpType);
if (!local)
local = label.dpc().pack(cpType);
String addr;
addr << SS7PointCode::lookup(cpType) << ",";
addr << SS7PointCode(cpType,local) << "," << label.opc();
String dest;
dest << label.dpc();
ctl->addParam("address",addr);
ctl->addParam("destination",dest);
ctl->setParam("automatic",String::boolText(true));
return mngmt->controlExecute(ctl);
}
return prohibited(msu.getSSF(),label,sls);
default:
// if nothing worked, report the unavailable regular user part

17
libs/ysig/management.cpp
View File

@ -788,7 +788,7 @@ bool SS7Management::control(NamedList& params)
case SS7MsgSNM::LFU:
txSls = (txSls + 1) & 0xff;
}
txSls = params.getIntValue("linksel",txSls);
txSls = params.getIntValue("linksel",txSls) & 0xff;
switch (cmd) {
// Messages containing a destination point code
case SS7MsgSNM::TFP:
@ -802,10 +802,12 @@ bool SS7Management::control(NamedList& params)
SS7PointCode dest(opc);
if (TelEngine::null(addr) || dest.assign(*addr,t)) {
unsigned char data[5];
int len = SS7PointCode::length(t)+1;
data[0] = cmd;
return dest.store(t,data+1,spare) &&
(transmitMSU(SS7MSU(txSio,lbl,data,
SS7PointCode::length(t)+1),lbl,txSls) >= 0);
((cmd == SS7MsgSNM::TFP) ?
postpone(new SS7MSU(txSio,lbl,data,len),lbl,txSls,1000) :
(transmitMSU(SS7MSU(txSio,lbl,data,len),lbl,txSls) >= 0));
}
}
return false;
@ -1042,14 +1044,13 @@ bool SS7Management::postpone(SS7MSU* msu, const SS7Label& label, int txSls,
SnmPending* p = static_cast<SnmPending*>(l->get());
if (p->txSls() != txSls || p->msu().length() != len)
continue;
if (!p->matches(label))
continue;
if (::memcmp(msu->data(),p->msu().data(),len))
continue;
const unsigned char* buf = msu->getData(label.length()+1,1);
Debug(this,DebugMild,"Refusing to postpone duplicate %s on %d",
Debug(this,DebugAll,"Refusing to postpone duplicate %s on %d",
SS7MsgSNM::lookup((SS7MsgSNM::Type)buf[0],"???"),txSls);
TelEngine::destruct(msu);
break;
}
unlock();
if (msu && ((interval == 0) || (transmitMSU(*msu,label,txSls) >= 0) || force)) {
@ -1101,6 +1102,8 @@ bool SS7Management::timeout(const SS7MSU& msu, const SS7Label& label, int txSls,
if (inhibited(label,SS7Layer2::Local))
postpone(new SS7MSU(msu),label,txSls,TIMER5M);
break;
case SS7MsgSNM::TFP:
return false;
}
return true;
}
@ -1111,7 +1114,7 @@ bool SS7Management::timeout(SignallingMessageTimer& timer, bool final)
if (final) {
String addr;
addr << msg;
Debug(this,DebugNote,"Expired %s control sequence to %s [%p]",
Debug(this,DebugInfo,"Expired %s control sequence to %s [%p]",
msg.snmName(),addr.c_str(),this);
}
return timeout(msg.msu(),msg,msg.txSls(),final);

7
libs/ysig/yatesig.h
View File

@ -6109,6 +6109,13 @@ public:
inline bool starting() const
{ return !m_started; }
/**
* Get access to the Management component if available
* @return A pointer to the SS7Management or NULL if not created
*/
inline SS7Management* getManagement() const
{ return m_mngmt; }
/**
* Get the Network Indicator bits that would match a Point Code type
* @param pcType Point Code type to search for