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

Support for RFC 3323 SIP Privacy header in addition to Remote-Party-ID. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@2555 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2009-03-31 20:23:46 +00:00
parent 98d3c05380
commit 5d0ad3e90b
1 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
modules/ysipchan.cpp
View File

@ -956,22 +956,45 @@ static void copyPrivacy(Message& msg, const SIPMessage& sip)
{
bool anonip = (sip.getHeaderValue("Anonymity") &= "ipaddr");
const MimeHeaderLine* hl = sip.getHeader("Remote-Party-ID");
if (!(anonip || hl))
const MimeHeaderLine* pr = sip.getHeader("Privacy");
if (!(anonip || hl || pr))
return;
const NamedString* p = hl ? hl->getParam("screen") : 0;
if (p)
msg.setParam("screened",*p);
if (pr && (*pr &= "none")) {
msg.setParam("privacy",String::boolText(false));
return;
}
bool privname = false;
bool privuri = false;
String priv;
if (anonip)
priv.append("addr",",");
p = hl ? hl->getParam("privacy") : 0;
if (p) {
if ((*p &= "full") || (*p &= "full-network"))
priv.append("name,uri",",");
privname = privuri = true;
else if ((*p &= "name") || (*p &= "name-network"))
priv.append("name",",");
privname = true;
else if ((*p &= "uri") || (*p &= "uri-network"))
priv.append("uri",",");
privuri = true;
}
if (pr) {
if ((*pr &= "user") || pr->getParam("user"))
privname = true;
if ((*pr &= "header") || pr->getParam("header"))
privuri = true;
}
if (privname)
priv.append("name",",");
if (privuri)
priv.append("uri",",");
if (pr) {
if ((*pr &= "session") || pr->getParam("session"))
priv.append("session",",");
if ((*pr &= "critical") || pr->getParam("critical"))
priv.append("critical",",");
}
if (priv)
msg.setParam("privacy",priv);
@ -1000,9 +1023,13 @@ static void copyPrivacy(SIPMessage& sip, const Message& msg)
bool anonip = (privacy.find("addr") >= 0);
bool privname = (privacy.find("name") >= 0);
bool privuri = (privacy.find("uri") >= 0);
String rfc3323;
// allow for a simple "privacy=yes" or similar
if (privacy.toBoolean(false))
privname = privuri = true;
// "privacy=no" is translated to RFC 3323 "none"
else if (!privacy.toBoolean(true))
rfc3323 = "none";
if (anonip)
sip.setHeader("Anonymity","ipaddr");
if (screen || privname || privuri) {
@ -1031,6 +1058,18 @@ static void copyPrivacy(SIPMessage& sip, const Message& msg)
hl->setParam("privacy","none");
sip.addHeader(hl);
}
if (rfc3323.null()) {
if (privname)
rfc3323.append("user",";");
if (privuri)
rfc3323.append("header",";");
if (privacy.find("session") >= 0)
rfc3323.append("session",";");
if (rfc3323 && (privacy.find("critical") >= 0))
rfc3323.append("critical",";");
}
if (rfc3323)
sip.addHeader("Privacy",rfc3323);
}
// Check if the given body have the given type