mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-08 15:16:34 +02:00
Code Issues Releases Wiki Activity

Always return fresh network adresses

Browse Source
This commit is contained in:
Uwe L. Korn
2014-06-20 18:07:18 +01:00
parent f394b80419
commit 8ea12252f0
2 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,6 +138,8 @@ Servent::startListening( QHostAddress ha, bool upnp, int port, Tomahawk::Network
} }
} }
d->externalListenAll = false;
#if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 )
if ( ha == QHostAddress::Any ) if ( ha == QHostAddress::Any )
#else #else
@@ -156,7 +158,8 @@ Servent::startListening( QHostAddress ha, bool upnp, int port, Tomahawk::Network
if ( addr.isInSubnet( QHostAddress::parseSubnet( "fe80::/10" ) ) ) if ( addr.isInSubnet( QHostAddress::parseSubnet( "fe80::/10" ) ) )
continue; // Skip link local addresses continue; // Skip link local addresses
tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Listening to " << addr.toString(); tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Listening to " << addr.toString();
d_func()->externalAddresses.append( addr ); d->externalAddresses.append( addr );
d->externalListenAll = true;
} }
} }
@@ -411,8 +414,17 @@ Servent::lookupControlConnection( const QString& nodeid )
QList<SipInfo> QList<SipInfo>
Servent::getLocalSipInfos( const QString& nodeid, const QString& key ) Servent::getLocalSipInfos( const QString& nodeid, const QString& key )
{ {
Q_D( Servent );
QList<SipInfo> sipInfos = QList<SipInfo>(); QList<SipInfo> sipInfos = QList<SipInfo>();
foreach ( QHostAddress ha, d_func()->externalAddresses ) QList<QHostAddress> addresses = d->externalAddresses;
if ( d->externalListenAll )
{
addresses = QNetworkInterface::allAddresses();
}
foreach ( QHostAddress ha, addresses )
{ {
SipInfo info = SipInfo(); SipInfo info = SipInfo();
info.setHost( ha.toString() ); info.setHost( ha.toString() );
@@ -867,13 +879,22 @@ Servent::cleanupSocket( QTcpSocketExtra* sock )
void void
Servent::initiateConnection( const SipInfo& sipInfo, Connection* conn ) Servent::initiateConnection( const SipInfo& sipInfo, Connection* conn )
{ {
Q_D( Servent );
Q_ASSERT( sipInfo.isValid() ); Q_ASSERT( sipInfo.isValid() );
Q_ASSERT( sipInfo.isVisible() ); Q_ASSERT( sipInfo.isVisible() );
Q_ASSERT( sipInfo.port() > 0 ); Q_ASSERT( sipInfo.port() > 0 );
Q_ASSERT( conn ); Q_ASSERT( conn );
// Check that we are not connecting to ourselves // Check that we are not connecting to ourselves
foreach ( QHostAddress ha, d_func()->externalAddresses ) QList<QHostAddress> addresses = d->externalAddresses;
if ( d->externalListenAll )
{
addresses = QNetworkInterface::allAddresses();
}
foreach ( QHostAddress ha, addresses )
{ {
if ( sipInfo.host() == ha.toString() ) if ( sipInfo.host() == ha.toString() )
{ {
@@ -1063,6 +1084,13 @@ Servent::port() const
QList<QHostAddress> QList<QHostAddress>
Servent::addresses() const Servent::addresses() const
{ {
Q_D( const Servent );
if ( d->externalListenAll )
{
return QNetworkInterface::allAddresses();
}
return d_func()->externalAddresses; return d_func()->externalAddresses;
} }

8
src/libtomahawk/network/Servent_p.h
View File

@@ -70,6 +70,14 @@ private:
*/ */
QList<QHostAddress> externalAddresses; QList<QHostAddress> externalAddresses;
/**
* Do we listen to all external addresses.
*
* If true, we will always reiterate over the current adresses known to Qt
* instead of returning a static list for the local SipInfos.
*/
bool externalListenAll;
/** /**
* Either the static set or the UPnP set external host * Either the static set or the UPnP set external host
*/ */