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

Changed jingleversion parameter name to jingle_version. 

git-svn-id: http://voip.null.ro/svn/yate@2669 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2009-06-01 10:03:28 +00:00
parent 533941f0b9
commit fc09730381
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.d/yjinglechan.conf.sample
View File

@ -3,11 +3,11 @@
[general]
; Global settings of Jabber and Jingle engines
; jingleversion: integer: Jingle session version to use for outgoing calls
; jingle_version: integer: Jingle session version to use for outgoing calls
; Defaults to the newest version if missing or invalid
; Allowed values are 0 or 1
; This parameter can be overridden when routing by an 'ojingleversion' parameter
;jingleversion=
; This parameter can be overridden when routing by an 'ojingle_version' parameter
;jingle_version=
; secure_rtp: boolean: Offer SRTP when negotiating Jingle sessions
; Defaults to disable

8
modules/yjinglechan.cpp
View File

@ -1320,7 +1320,7 @@ YJGConnection::YJGConnection(Message& msg, const char* caller, const char* calle
m_hangup(false), m_timeout(0), m_transferring(false), m_recvTransferStanza(0),
m_dataFlags(0), m_ftStatus(FTNone), m_ftHostDirection(FTHostNone)
{
NamedString* ver = msg.getParam("ojingleversion");
NamedString* ver = msg.getParam("ojingle_version");
if (ver)
m_sessVersion = JGSession::lookupVersion(*ver);
m_subject = msg.getValue("subject");
@ -1530,7 +1530,7 @@ bool YJGConnection::route()
m->addParam("calleruri",BUILD_XMPP_URI(m_remote));
if (m_subject)
m->addParam("subject",m_subject);
m->addParam("jingleversion",JGSession::lookupVersion(m_sessVersion));
m->addParam("jingle_version",JGSession::lookupVersion(m_sessVersion));
m_mutex.lock();
// TODO: add remote ip/port
// Fill file transfer data
@ -4291,7 +4291,7 @@ void YJGDriver::initialize()
s_userRoster = sect->getBoolValue("user.roster",false);
s_useCrypto = sect->getBoolValue("secure_rtp",false);
s_cryptoMandatory = s_useCrypto;
s_sessVersion = JGSession::lookupVersion(sect->getValue("jingleversion"),JGSession::Version1);
s_sessVersion = JGSession::lookupVersion(sect->getValue("jingle_version"),JGSession::Version1);
// Init codecs in use. Check each codec in known codecs list against the configuration
s_usedCodecs.clear();
@ -4325,7 +4325,7 @@ void YJGDriver::initialize()
if (debugAt(dbg)) {
String s;
s << " localip=" << s_localAddress ? s_localAddress.c_str() : "MISSING";
s << " jingleversion=" << JGSession::lookupVersion(s_sessVersion);
s << " jingle_version=" << JGSession::lookupVersion(s_sessVersion);
s << " singletone=" << String::boolText(m_singleTone);
s << " pending_timeout=" << s_pendingTimeout;
s << " anonymous_caller=" << s_anonymousCaller;