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

Style fixes

Browse Source
This commit is contained in:
Uwe L. Korn
2014-08-24 00:38:15 +01:00
parent 71f51c41b6
commit 3e104d4030
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,24 +117,24 @@ Servent::startListening( QHostAddress ha, bool upnp, int port, Tomahawk::Network
{ {
Q_D( Servent ); Q_D( Servent );
d_func()->externalAddresses = QList<QHostAddress>(); d->externalAddresses = QList<QHostAddress>();
d_func()->port = port; d->port = port;
// Listen on both the selected port and, if not the same, the default port -- the latter sometimes necessary for zeroconf // Listen on both the selected port and, if not the same, the default port -- the latter sometimes necessary for zeroconf
// TODO: only listen on both when zeroconf sip is enabled // TODO: only listen on both when zeroconf sip is enabled
// TODO: use a real zeroconf system instead of a simple UDP broadcast? // TODO: use a real zeroconf system instead of a simple UDP broadcast?
if ( !listen( ha, d_func()->port ) ) if ( !listen( ha, d->port ) )
{ {
if ( d_func()->port != defaultPort ) if ( d->port != defaultPort )
{ {
if ( !listen( ha, defaultPort ) ) if ( !listen( ha, defaultPort ) )
{ {
tLog() << Q_FUNC_INFO << "Failed to listen on both port" << d_func()->port << "and port" << defaultPort; tLog() << Q_FUNC_INFO << "Failed to listen on both port" << d->port << "and port" << defaultPort;
tLog() << Q_FUNC_INFO << "Error string is:" << errorString(); tLog() << Q_FUNC_INFO << "Error string is:" << errorString();
return false; return false;
} }
else else
d_func()->port = defaultPort; d->port = defaultPort;
} }
} }
@@ -162,11 +162,11 @@ Servent::startListening( QHostAddress ha, bool upnp, int port, Tomahawk::Network
else if ( ( ha.toString() != "127.0.0.1" ) && ( ha.toString() != "::1" ) && ( ha.toString() != "::7F00:1" ) ) else if ( ( ha.toString() != "127.0.0.1" ) && ( ha.toString() != "::1" ) && ( ha.toString() != "::7F00:1" ) )
{ {
// We listen only to one specific Address, only announce this. // We listen only to one specific Address, only announce this.
d_func()->externalAddresses.append( ha ); d->externalAddresses.append( ha );
} }
// If we only accept connections via localhost, we'll announce nothing. // If we only accept connections via localhost, we'll announce nothing.
tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Servent listening on port" << d_func()->port << "- servent thread:" << thread() tLog( LOGVERBOSE ) << Q_FUNC_INFO << "Servent listening on port" << d->port << "- servent thread:" << thread()
<< "- address mode:" << (int)( mode ); << "- address mode:" << (int)( mode );
switch ( mode ) switch ( mode )
@@ -190,7 +190,7 @@ Servent::startListening( QHostAddress ha, bool upnp, int port, Tomahawk::Network
case Tomahawk::Network::ExternalAddress::Lan: case Tomahawk::Network::ExternalAddress::Lan:
// Nothing has to be done here. // Nothing has to be done here.
d_func()->ready = true; d->ready = true;
emit ready(); emit ready();
break; break;
@@ -199,15 +199,15 @@ Servent::startListening( QHostAddress ha, bool upnp, int port, Tomahawk::Network
{ {
// upnp could be turned off on the cli with --noupnp // upnp could be turned off on the cli with --noupnp
tLog( LOGVERBOSE ) << Q_FUNC_INFO << "External address mode set to upnp..."; tLog( LOGVERBOSE ) << Q_FUNC_INFO << "External address mode set to upnp...";
d_func()->portfwd = QPointer< PortFwdThread >( new PortFwdThread( d_func()->port ) ); d->portfwd = QPointer< PortFwdThread >( new PortFwdThread( d->port ) );
Q_ASSERT( d_func()->portfwd ); Q_ASSERT( d->portfwd );
connect( d_func()->portfwd.data(), SIGNAL( externalAddressDetected( QHostAddress, unsigned int ) ), connect( d->portfwd.data(), SIGNAL( externalAddressDetected( QHostAddress, unsigned int ) ),
SLOT( setExternalAddress( QHostAddress, unsigned int ) ) ); SLOT( setExternalAddress( QHostAddress, unsigned int ) ) );
d_func()->portfwd.data()->start(); d->portfwd.data()->start();
} }
else else
{ {
d_func()->ready = true; d->ready = true;
emit ready(); emit ready();
} }
break; break;