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

Added missing ISUP content to disconnection SIP messages (BYE, CANCEL, 4xx/5xx). 

git-svn-id: http://yate.null.ro/svn/yate/trunk@4521 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2011-07-21 17:27:29 +00:00
parent b2c923bc57
commit 7afc6c6532
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/ysipchan.cpp
View File

@ -854,6 +854,8 @@ private:
// Encode an ISUP message from parameters received in msg if enabled to process them
// Build a multipart/mixed body if more then one body is going to be sent
MimeBody* buildSIPBody(Message& msg, MimeSdpBody* sdp = 0);
// Build the body of a hangup SIP message
MimeBody* buildSIPBody();
SIPTransaction* m_tr;
SIPTransaction* m_tr2;
@ -4936,6 +4938,7 @@ void YateSIPConnection::clearTransaction()
SIPMessage* m = new SIPMessage(m_tr->initialMessage(),m_reasonCode,
m_reason.safe("Request Terminated"));
copySipHeaders(*m,parameters(),0);
m->setBody(buildSIPBody());
m_tr->setResponse(m);
TelEngine::destruct(m);
m_byebye = false;
@ -5014,6 +5017,7 @@ void YateSIPConnection::hangup()
hl->setParam("text","\"Call completed elsewhere\"");
m->addHeader(hl);
}
m->setBody(buildSIPBody());
plugin.ep()->engine()->addMessage(m);
}
m->deref();
@ -5038,6 +5042,7 @@ void YateSIPConnection::hangup()
if (stats)
m->addHeader("P-RTP-Stat",stats);
copySipHeaders(*m,parameters(),0);
m->setBody(buildSIPBody());
plugin.ep()->engine()->addMessage(m);
m->deref();
}
@ -6136,12 +6141,19 @@ void YateSIPConnection::endDisconnect(const Message& msg, bool handled)
else
setReason(*reason,m_reasonCode);
}
const char* prefix = msg.getValue(YSTRING("osip-prefix"));
if (TelEngine::null(prefix))
const char* sPrefix = msg.getValue(YSTRING("osip-prefix"));
const char* mPrefix = msg.getValue(YSTRING("message-prefix"));
if (!(sPrefix || mPrefix))
return;
parameters().clearParams();
parameters().setParam("osip-prefix",prefix);
parameters().copySubParams(msg,prefix,false);
if (sPrefix) {
parameters().setParam("osip-prefix",sPrefix);
parameters().copySubParams(msg,sPrefix,false);
}
if (mPrefix) {
parameters().setParam("message-prefix",mPrefix);
parameters().copySubParams(msg,mPrefix,false);
}
}
void YateSIPConnection::statusParams(String& str)
@ -6431,6 +6443,16 @@ MimeBody* YateSIPConnection::buildSIPBody(Message& msg, MimeSdpBody* sdp)
return doBuildSIPBody(this,msg,sdp);
}
// Build the body of a hangup SIP message from disconnect parameters
MimeBody* YateSIPConnection::buildSIPBody()
{
if (!s_sipt_isup)
return 0;
Message msg("");
msg.copyParams(parameters());
return doBuildSIPBody(this,msg,0);
}
YateSIPLine::YateSIPLine(const String& name)
: String(name), Mutex(true,"YateSIPLine"),