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

Always copy parameters from Yate messages to signaling messages. 

Copy parameters starting with a CapitalLetter in all messages, not just IAM.
Made static several helper functions to avoid symbol pollution.


git-svn-id: http://voip.null.ro/svn/yate@3407 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2010-06-29 19:46:31 +00:00
parent 2c288088be
commit b58683909b
2 changed files with 29 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libs/ysig/isup.cpp
View File

@ -155,9 +155,6 @@ static const SignallingFlags s_flags_paramcompat[] = {
{ 0, 0, 0 }
};
// Backward call indicators to be copied
static const String s_copyBkInd("BackwardCallIndicators,OptionalBackwardCallIndicators");
// SLS special values on outbound calls
static const TokenDict s_dict_callSls[] = {
{ "auto", SS7ISUP::SlsAuto }, // Let Layer3 deal with it
@ -1665,7 +1662,7 @@ void SS7MsgISUP::toString(String& dest, const SS7Label& label, bool params,
// @param recvLbl True if the given label is from a received message. If true, a new routing
// label will be created from the received one
// @return Link the message was successfully queued to, negative for error
inline int transmitREL(SS7ISUP* isup, unsigned int cic, const SS7Label& label, bool recvLbl,
inline static int transmitREL(SS7ISUP* isup, unsigned int cic, const SS7Label& label, bool recvLbl,
const char* reason)
{
SS7MsgISUP* m = new SS7MsgISUP(SS7MsgISUP::REL,cic);
@ -1676,7 +1673,7 @@ inline int transmitREL(SS7ISUP* isup, unsigned int cic, const SS7Label& label, b
// Push down the protocol stack a RLC (Release Complete) message
// @param msg Optional received message to copy release parameters. Ignored if reason is valid
inline int transmitRLC(SS7ISUP* isup, unsigned int cic, const SS7Label& label, bool recvLbl,
inline static int transmitRLC(SS7ISUP* isup, unsigned int cic, const SS7Label& label, bool recvLbl,
const char* reason = 0, const SS7MsgISUP* msg = 0)
{
SS7MsgISUP* m = new SS7MsgISUP(SS7MsgISUP::RLC,cic);
@ -1690,7 +1687,7 @@ inline int transmitRLC(SS7ISUP* isup, unsigned int cic, const SS7Label& label, b
}
// Push down the protocol stack a CNF (Confusion) message
inline int transmitCNF(SS7ISUP* isup, unsigned int cic, const SS7Label& label, bool recvLbl,
inline static int transmitCNF(SS7ISUP* isup, unsigned int cic, const SS7Label& label, bool recvLbl,
const char* reason)
{
SS7MsgISUP* m = new SS7MsgISUP(SS7MsgISUP::CNF,cic);
@ -1762,7 +1759,7 @@ void SS7ISUPCall::stopWaitSegment(bool discard)
}
// Helper functions called in getEvent
inline bool timeout(SS7ISUP* isup, SS7ISUPCall* call, SignallingTimer& timer,
inline static bool timeout(SS7ISUP* isup, SS7ISUPCall* call, SignallingTimer& timer,
const Time& when, const char* req)
{
if (!timer.timeout(when.msec()))
@ -1881,6 +1878,19 @@ SignallingEvent* SS7ISUPCall::getEvent(const Time& when)
return m_lastEvent;
}
// Helper that copies all parameters starting with a capital letter
static void copyUpper(NamedList& dest, const NamedList& src)
{
static const Regexp r("^[A-Z][A-Za-z_.]\\+$");
unsigned int n = src.length();
for (unsigned int i = 0; i < n; i++) {
const NamedString* p = src.getParam(i);
if (!p || !r.matches(p->name()))
continue;
dest.setParam(p->name(),*p);
}
}
// Send an event to this call
bool SS7ISUPCall::sendEvent(SignallingEvent* event)
{
@ -1914,7 +1924,7 @@ bool SS7ISUPCall::sendEvent(SignallingEvent* event)
m->params().addParam("EventInformation",
event->type() == SignallingEvent::Ringing ? "ringing": "progress");
if (event->message())
m->params().copyParams(event->message()->params(),s_copyBkInd);
copyUpper(m->params(),event->message()->params());
m_state = Ringing;
mylock.drop();
result = transmitMessage(m);
@ -1924,7 +1934,7 @@ bool SS7ISUPCall::sendEvent(SignallingEvent* event)
if (validMsgState(true,SS7MsgISUP::ACM)) {
SS7MsgISUP* m = new SS7MsgISUP(SS7MsgISUP::ACM,id());
if (event->message())
m->params().copyParams(event->message()->params(),s_copyBkInd);
copyUpper(m->params(),event->message()->params());
m_state = Accepted;
mylock.drop();
result = transmitMessage(m);
@ -1934,7 +1944,7 @@ bool SS7ISUPCall::sendEvent(SignallingEvent* event)
if (validMsgState(true,SS7MsgISUP::ANM)) {
SS7MsgISUP* m = new SS7MsgISUP(SS7MsgISUP::ANM,id());
if (event->message())
m->params().copyParams(event->message()->params(),s_copyBkInd);
copyUpper(m->params(),event->message()->params());
m_state = Answered;
mylock.drop();
result = transmitMessage(m);
@ -2048,15 +2058,7 @@ bool SS7ISUPCall::copyParamIAM(SS7MsgISUP* msg, bool outgoing, SignallingMessage
NamedList& dest = msg->params();
if (outgoing) {
NamedList& src = sigMsg->params();
// Copy all parameters starting with a capital letter
static const Regexp r("^[A-Z][A-Za-z_.]\\+$");
unsigned int n = src.length();
for (unsigned int i = 0; i < n; i++) {
const NamedString* p = src.getParam(i);
if (!p || !r.matches(p->name()))
continue;
dest.setParam(p->name(),*p);
}
copyUpper(dest,src);
param(dest,src,"CalledPartyNumber","called","");
param(dest,src,"CalledPartyNumber.inn","inn",String::boolText(isup()->m_inn));
param(dest,src,"CalledPartyNumber.nature","callednumtype",isup()->m_numType);

35
modules/server/ysigchan.cpp
View File

@ -931,9 +931,8 @@ bool SigChannel::msgProgress(Message& msg)
return true;
bool media = msg.getBoolValue("earlymedia",getPeer() && getPeer()->getSource());
const char* format = msg.getValue("format");
SignallingMessage* sm = 0;
SignallingMessage* sm = new SignallingMessage;
if (media && updateConsumer(format,false)) {
sm = new SignallingMessage;
sm->params().addParam("media",String::boolText(true));
if (format)
sm->params().addParam("format",format);
@ -957,11 +956,9 @@ bool SigChannel::msgRinging(Message& msg)
return true;
bool media = msg.getBoolValue("earlymedia",getPeer() && getPeer()->getSource());
const char* format = msg.getValue("format");
SignallingMessage* sm = 0;
if (media && updateConsumer(format,false) && format) {
sm = new SignallingMessage;
SignallingMessage* sm = new SignallingMessage;
if (media && updateConsumer(format,false) && format)
sm->params().addParam("format",format);
}
SignallingEvent* event = new SignallingEvent(SignallingEvent::Ringing,sm,m_call);
TelEngine::destruct(sm);
SignallingCircuitEvent* cicEvent = handleRtp(msg);
@ -987,11 +984,9 @@ bool SigChannel::msgAnswered(Message& msg)
cic->setParam("echotrain",value);
}
const char* format = msg.getValue("format");
SignallingMessage* sm = 0;
if (updateConsumer(format,false) && format) {
sm = new SignallingMessage;
SignallingMessage* sm = new SignallingMessage;
if (updateConsumer(format,false) && format)
sm->params().addParam("format",format);
}
SignallingEvent* event = new SignallingEvent(SignallingEvent::Answer,sm,m_call);
TelEngine::destruct(sm);
SignallingCircuitEvent* cicEvent = handleRtp(msg);
@ -1088,11 +1083,9 @@ void SigChannel::callAccept(Message& msg)
if (m_call) {
const char* format = msg.getValue("format");
updateConsumer(format,false);
SignallingMessage* sm = 0;
if (format) {
sm = new SignallingMessage;
SignallingMessage* sm = new SignallingMessage;
if (format)
sm->params().addParam("format",format);
}
event = new SignallingEvent(SignallingEvent::Accept,sm,m_call);
TelEngine::destruct(sm);
}
@ -1735,19 +1728,7 @@ void SigDriver::copySigMsgParams(SignallingEvent* event, const NamedList& params
prefix = params.getValue("message-oprefix",prefix);
if (prefix.null())
return;
event->message()->params().copySubParams(params,prefix + ".");
return;
prefix << ".";
unsigned int n = params.length();
for (unsigned int i = 0; i < n; i++) {
NamedString* param = params.getParam(i);
if (!param)
continue;
String name = param->name();
if (name.startSkip(prefix,false))
event->message()->params().addParam(name,*param);
}
event->message()->params().copySubParams(params,prefix);
}
// Handle command complete requests