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

Sent old tomahawk versions SipInfos like before.

Browse Source
This commit is contained in:
Uwe L. Korn 2013-05-17 17:08:54 +02:00
parent 16d30a1072
commit 89950c54f5
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libtomahawk/network/Servent.cpp
View File

@ -435,15 +435,28 @@ Servent::registerPeer( const Tomahawk::peerinfo_ptr& peerInfo )
QString key = uuid();
const QString& nodeid = Database::instance()->impl()->dbid();
/*ControlConnection* conn = new ControlConnection( this );
conn->setName( peerInfo->contactId() );
conn->setId( nodeid );
conn->addPeerInfo( peerInfo );*/
registerLazyOffer( key, peerInfo, nodeid );
QList<SipInfo> sipInfos = getLocalSipInfos( nodeid, key );
peerInfo->sendLocalSipInfos( sipInfos );
// SipInfos were single-value before 0.7.999
if ( !peerInfo->versionString().isEmpty() && TomahawkUtils::compareVersionStrings( peerInfo->versionString(), "Tomahawk Player EmptyOS 0.7.99" ) < 0)
{
SipInfo info = SipInfo();
info.setVisible( false );
foreach ( SipInfo _info, sipInfos )
{
QHostAddress ha = QHostAddress( _info.host() );
if ( ( Servent::isValidExternalIP( ha ) && ha.protocol() == QAbstractSocket::IPv4Protocol ) || ( ha.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol ) )
{
info = _info;
break;
}
}
peerInfo->sendLocalSipInfos( QList<SipInfo>() << info );
}
else
{
peerInfo->sendLocalSipInfos( sipInfos );
}
handleSipInfo( peerInfo );
connect( peerInfo.data(), SIGNAL( sipInfoChanged() ), SLOT( onSipInfoChanged() ) );