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

Logic bug fixed! 

Do not modify RemotePC if a GT was translated for a local SCCP user.


git-svn-id: http://voip.null.ro/svn/yate@4723 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
andrei 2011-11-24 12:53:33 +00:00
parent 37e08b8ec2
commit 0ac5de0981
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ysig/sccp.cpp
View File

@ -3582,15 +3582,14 @@ bool SS7SCCP::routeSCLCMessage(SS7MsgSCCP*& msg, const SS7Label& label)
break;
}
msg->params().clearParam(YSTRING("CalledPartyAddress"),'.');
msg->params().clearParam(YSTRING("RemotePC"));
for (unsigned int i = 0;i < gtRoute->length();i++) {
NamedString* val = gtRoute->getParam(i);
msg->params().setParam("CalledPartyAddress." + val->name(),*val);
if (val->name() != YSTRING("RemotePC"))
msg->params().setParam("CalledPartyAddress." + val->name(),*val);
}
if (haveRemotePC)
msg->params().setParam("RemotePC",gtRoute->getValue(YSTRING("RemotePC")));
else
msg->params().setParam("RemotePC",gtRoute->getValue(YSTRING("pointcode")));
msg->params().setParam("CalledPartyAddress.pointcode",
gtRoute->getValue(YSTRING("RemotePC")));
TelEngine::destruct(gtRoute);
if (msg->params().getIntValue(YSTRING("CalledPartyAddress.ssn"),-1) == 1) {
Debug(this,DebugNote,"GT Routing Warn!! Message %s global title translated for management!",
@ -3598,7 +3597,8 @@ bool SS7SCCP::routeSCLCMessage(SS7MsgSCCP*& msg, const SS7Label& label)
m_errors++;
return false; // Management message with global title translation
}
unsigned int pointcode = msg->params().getIntValue(YSTRING("RemotePC"),-1);
unsigned int pointcode = msg->params().getIntValue(
YSTRING("CalledPartyAddress.pointcode"),-1);
if (!m_localPointCode)
Debug(this,DebugConf,
"No local PointCode configured!! GT translations with no local PointCode may lead to undesired behavior");
@ -3613,6 +3613,7 @@ bool SS7SCCP::routeSCLCMessage(SS7MsgSCCP*& msg, const SS7Label& label)
}
// If from the translated gt resulted a pointcode other then ours forward the message
if (pointcode > 0 && m_localPointCode && pointcode != m_localPointCode->pack(m_type)) {
msg->params().setParam("RemotePC",String(pointcode));
lock.drop();
if (transmitMessage(msg) >= 0)
return true;