[Opalvoip-svn] SF.net SVN: opalvoip:[27372] opal/branches/v3_10
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2012-03-29 08:36:27
|
Revision: 27372 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=27372&view=rev Author: rjongbloed Date: 2012-03-29 08:36:16 +0000 (Thu, 29 Mar 2012) Log Message: ----------- Added ability to specify transport (UDP,TCP,TLS) for SIP presence. Modified Paths: -------------- opal/branches/v3_10/include/sip/sippres.h opal/branches/v3_10/src/sip/sippres.cxx Modified: opal/branches/v3_10/include/sip/sippres.h =================================================================== --- opal/branches/v3_10/include/sip/sippres.h 2012-03-29 08:31:36 UTC (rev 27371) +++ opal/branches/v3_10/include/sip/sippres.h 2012-03-29 08:36:16 UTC (rev 27372) @@ -233,6 +233,7 @@ static const PCaselessString & PIDFEntityKey(); static const PCaselessString & SubProtocolKey(); static const PCaselessString & PresenceAgentKey(); + static const PCaselessString & TransportKey(); static const PCaselessString & XcapRootKey(); static const PCaselessString & XcapAuthIdKey(); static const PCaselessString & XcapPasswordKey(); Modified: opal/branches/v3_10/src/sip/sippres.cxx =================================================================== --- opal/branches/v3_10/src/sip/sippres.cxx 2012-03-29 08:31:36 UTC (rev 27371) +++ opal/branches/v3_10/src/sip/sippres.cxx 2012-03-29 08:36:16 UTC (rev 27372) @@ -63,6 +63,7 @@ const PCaselessString & SIP_Presentity::PIDFEntityKey() { static const PConstCaselessString s("PIDF-Entity"); return s; } const PCaselessString & SIP_Presentity::SubProtocolKey() { static const PConstCaselessString s("Sub-Protocol"); return s; } const PCaselessString & SIP_Presentity::PresenceAgentKey() { static const PConstCaselessString s("Presence Agent"); return s; } +const PCaselessString & SIP_Presentity::TransportKey() { static const PConstCaselessString s("Transport"); return s; } const PCaselessString & SIP_Presentity::XcapRootKey() { static const PConstCaselessString s("XCAP Root"); return s; } const PCaselessString & SIP_Presentity::XcapAuthIdKey() { static const PConstCaselessString s("XCAP Auth ID"); return s; } const PCaselessString & SIP_Presentity::XcapPasswordKey() { static const PConstCaselessString s("XCAP Password"); return s; } @@ -109,6 +110,7 @@ names.AppendString(PIDFEntityKey()); names.AppendString(SubProtocolKey()); names.AppendString(PresenceAgentKey()); + names.AppendString(TransportKey()); names.AppendString(AuthNameKey()); names.AppendString(AuthPasswordKey()); names.AppendString(XcapRootKey()); @@ -128,6 +130,7 @@ names.AppendString("URL"); names.AppendString("Enum\nPeerToPeer,Agent,XCAP,OMA\nAgent"); names.AppendString("String"); + names.AppendString("Enum\nUDP,TCP,TLS\nTCP"); names.AppendString("String"); names.AppendString("Password"); names.AppendString("URL"); @@ -282,7 +285,7 @@ param.m_localAddress = m_aor.AsString(); param.m_addressOfRecord = cmd.m_presentity; if (m_subProtocol >= e_XCAP) - param.m_remoteAddress = m_presenceAgent + ";transport=tcp"; + param.m_remoteAddress = m_presenceAgent + ";transport=" + m_attributes.Get(TransportKey, "tcp").ToLower(); param.m_authID = m_attributes.Get(OpalPresentity::AuthNameKey, m_aor.GetUserName()); param.m_password = m_attributes.Get(OpalPresentity::AuthPasswordKey); param.m_expire = GetExpiryTime(); @@ -396,7 +399,7 @@ param.m_contentType = "application/watcherinfo+xml"; param.m_localAddress = aorStr; param.m_addressOfRecord = aorStr; - param.m_remoteAddress = m_presenceAgent + ";transport=tcp"; + param.m_remoteAddress = m_presenceAgent + ";transport=" + m_attributes.Get(TransportKey, "tcp").ToLower(); param.m_authID = m_attributes.Get(OpalPresentity::AuthNameKey, m_aor.GetUserName()); param.m_password = m_attributes.Get(OpalPresentity::AuthPasswordKey); param.m_expire = GetExpiryTime(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |