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

Allow configuring a SLS to SLC right-shift in MTP3. 

This is useful to load balance ISUP traffic controlling only odd or even CICs.


git-svn-id: http://voip.null.ro/svn/yate@5086 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2012-06-01 09:35:45 +00:00
parent 3106555ae1
commit fa4fac4637
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf.d/ysigchan.conf.sample
View File

@ -586,6 +586,10 @@
; Example: link=mtp2_to_hq,3
;link=
; slcshift: bool: Shift right once SLS to obtain desired SLC
; This may be desirable for ISUP traffic when controlling only odd or even CICs
;slcshift=false
; autostart: bool: Automatically enable the linkset at startup
; This should be enabled (default) for normal operation
;autostart=yes

17
libs/ysig/layer3.cpp
View File

@ -510,7 +510,7 @@ SS7MTP3::SS7MTP3(const NamedList& params)
: SignallingComponent(params.safe("SS7MTP3"),&params),
SignallingDumpable(SignallingDumper::Mtp3),
Mutex(true,"SS7MTP3"),
m_total(0), m_active(0), m_inhibit(false), m_warnDown(true),
m_total(0), m_active(0), m_slcShift(false), m_inhibit(false), m_warnDown(true),
m_checklinks(true), m_forcealign(true), m_checkT1(0), m_checkT2(0)
{
#ifdef DEBUG
@ -553,6 +553,7 @@ SS7MTP3::SS7MTP3(const NamedList& params)
}
Debug(this,level,"Point code types are '%s' [%p]",stype.safe(),this);
m_slcShift = params.getBoolValue(YSTRING("slcshift"),false);
m_inhibit = !params.getBoolValue(YSTRING("autostart"),true);
m_checklinks = params.getBoolValue(YSTRING("checklinks"),m_checklinks);
m_forcealign = params.getBoolValue(YSTRING("forcealign"),m_forcealign);
@ -822,6 +823,9 @@ bool SS7MTP3::control(Operation oper, NamedList* params)
{
bool ok = operational();
if (params) {
// cannot change SLS to SLC shift while active
if (m_active == 0)
m_slcShift = params->getBoolValue(YSTRING("slcshift"),m_slcShift);
m_checklinks = params->getBoolValue(YSTRING("checklinks"),m_checklinks);
m_forcealign = params->getBoolValue(YSTRING("forcealign"),m_forcealign);
const String& inh = (*params)[YSTRING("inhibit")];
@ -922,6 +926,7 @@ bool SS7MTP3::initialize(const NamedList* config)
countLinks();
m_warnDown = true;
if (config && (0 == m_total)) {
m_slcShift = config->getBoolValue(YSTRING("slcshift"),m_slcShift);
m_checklinks = config->getBoolValue(YSTRING("checklinks"),m_checklinks);
m_forcealign = config->getBoolValue(YSTRING("forcealign"),m_forcealign);
unsigned int n = config->length();
@ -982,6 +987,7 @@ int SS7MTP3::transmitMSU(const SS7MSU& msu, const SS7Label& label, int sls)
{
bool maint = (msu.getSIF() == SS7MSU::MTN) || (msu.getSIF() == SS7MSU::MTNS);
bool mgmt = (msu.getSIF() == SS7MSU::SNM);
bool regular = !maint && !mgmt;
Lock lock(this);
if (!(maint || m_active || (mgmt && m_checked))) {
if (m_warnDown) {
@ -994,8 +1000,11 @@ int SS7MTP3::transmitMSU(const SS7MSU& msu, const SS7Label& label, int sls)
}
// TODO: support ranges with holes
if (!maint && !mgmt)
if (regular && sls >= 0) {
if (m_slcShift)
sls = sls >> 1;
sls = sls % m_total;
}
// Try to find a link with the given SLS
ObjList* l = (sls >= 0) ? &m_links : 0;
@ -1013,7 +1022,7 @@ int SS7MTP3::transmitMSU(const SS7MSU& msu, const SS7Label& label, int sls)
(m_inhibit ? " while inhibited" : ""),this);
dump(msu,true,sls);
m_warnDown = true;
return sls;
return (regular && m_slcShift) ? (sls << 1) : sls;
}
return -1;
}
@ -1045,7 +1054,7 @@ int SS7MTP3::transmitMSU(const SS7MSU& msu, const SS7Label& label, int sls)
(m_inhibit ? " while inhibited" : ""),this);
dump(msu,true,sls);
m_warnDown = true;
return sls;
return (regular && m_slcShift) ? (sls << 1) : sls;
}
}

2
libs/ysig/yatesig.h
View File

@ -7754,6 +7754,8 @@ private:
unsigned int m_checked;
// currently active links
unsigned int m_active;
// SLS to SLC shift
bool m_slcShift;
// inhibited flag
bool m_inhibit;
// warn if all links are down