mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-19 23:39:42 +01:00
Code Issues Releases Wiki Activity

Knock down acl issue num 3: XMPP shows and auths against full jid with resource, sometimes

Browse Source
This commit is contained in:
Jeff Mitchell 2012-06-18 00:08:40 -04:00
parent 2c28325ae3
commit 8603667270
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/sip/SipHandler.cpp
View File

@ -169,6 +169,8 @@ SipHandler::onSipInfo( const QString& peerId, const SipInfo& info )
{
tDebug() << Q_FUNC_INFO << "SIP Message:" << peerId << info;
QString barePeerId = peerId.left( peerId.indexOf( "/" ) );
/*
If only one party is externally visible, connection is obvious
If both are, peer with lowest IP address initiates the connection.
@ -179,11 +181,11 @@ SipHandler::onSipInfo( const QString& peerId, const SipInfo& info )
if( !Servent::instance()->visibleExternally() ||
Servent::instance()->externalAddress() <= info.host().hostName() )
{
qDebug() << "Initiate connection to" << peerId;
qDebug() << "Initiate connection to" << barePeerId;
Servent::instance()->connectToPeer( info.host().hostName(),
info.port(),
info.key(),
peerId,
barePeerId,
info.uniqname() );
}
else
@ -199,7 +201,7 @@ SipHandler::onSipInfo( const QString& peerId, const SipInfo& info )
m_peersSipInfos.insert( peerId, info );
}
void SipHandler::onSoftwareVersion(const QString& peerId, const QString& versionString)
void SipHandler::onSoftwareVersion( const QString& peerId, const QString& versionString )
{
m_peersSoftwareVersions.insert( peerId, versionString );
}