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

* Fixed issue where Servent would never emit ready when UPnP returns an invalid ip.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-09-13 09:02:23 +02:00
parent 9ec9fb9362
commit 48e3eb877d
3 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/libtomahawk/network/servent.cpp
View File

@@ -139,23 +139,7 @@ Servent::startListening( QHostAddress ha, bool upnp, int port )
switch ( mode ) switch ( mode )
{ {
case TomahawkSettings::Lan: case TomahawkSettings::Lan:
foreach( QHostAddress ha, QNetworkInterface::allAddresses() ) setInternalAddress();
{
if( ha.toString() == "127.0.0.1" ) continue;
if( ha.toString().contains( ":" ) ) continue; //ipv6
if ( qApp->arguments().contains( "--lanhack" ) )
{
tLog() << "LANHACK: set external address to lan address" << ha.toString();
QMetaObject::invokeMethod( this, "setExternalAddress", Qt::QueuedConnection, Q_ARG( QHostAddress, ha ), Q_ARG( unsigned int, m_port ) );
}
else
{
m_ready = true;
emit ready();
}
break;
}
break; break;
case TomahawkSettings::Upnp: case TomahawkSettings::Upnp:
@@ -189,6 +173,31 @@ Servent::createConnectionKey( const QString& name, const QString &nodeid, const
} }
void
Servent::setInternalAddress()
{
foreach ( QHostAddress ha, QNetworkInterface::allAddresses() )
{
if ( ha.toString() == "127.0.0.1" )
continue;
if ( ha.toString().contains( ":" ) )
continue; //ipv6
if ( qApp->arguments().contains( "--lanhack" ) )
{
tLog() << "LANHACK: set external address to lan address" << ha.toString();
setExternalAddress( ha, m_port );
}
else
{
m_ready = true;
emit ready();
}
break;
}
}
void void
Servent::setExternalAddress( QHostAddress ha, unsigned int port ) Servent::setExternalAddress( QHostAddress ha, unsigned int port )
{ {
@@ -198,6 +207,7 @@ Servent::setExternalAddress( QHostAddress ha, unsigned int port )
if ( ip.startsWith( "10." ) || ip.startsWith( "172.16." ) || ip.startsWith( "192.168." ) ) if ( ip.startsWith( "10." ) || ip.startsWith( "172.16." ) || ip.startsWith( "192.168." ) )
{ {
tDebug() << Q_FUNC_INFO << "Tried to set an invalid ip as external address!"; tDebug() << Q_FUNC_INFO << "Tried to set an invalid ip as external address!";
setInternalAddress();
return; return;
} }

1
src/libtomahawk/network/servent.h
View File

@@ -134,6 +134,7 @@ protected:
void incomingConnection( int sd ); void incomingConnection( int sd );
public slots: public slots:
void setInternalAddress();
void setExternalAddress( QHostAddress ha, unsigned int port ); void setExternalAddress( QHostAddress ha, unsigned int port );
void socketError( QAbstractSocket::SocketError ); void socketError( QAbstractSocket::SocketError );