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

Handle disconnects during connection attempts (i.e. vanishing connection objects)

Browse Source
This commit is contained in:
Uwe L. Korn
2013-05-14 13:06:27 +02:00
parent 03cdb474c1
commit d71a237533
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -851,7 +851,11 @@ Servent::connectToPeer(const peerinfo_ptr& peerInfo, const QList<SipInfo>& sipIn
{ {
if ( sipInfos.isEmpty() ) if ( sipInfos.isEmpty() )
{ {
if ( conn != NULL ) {
tLog( LOGVERBOSE ) << Q_FUNC_INFO << "No more possible SIP endpoints for " << conn->name() << " skipping."; tLog( LOGVERBOSE ) << Q_FUNC_INFO << "No more possible SIP endpoints for " << conn->name() << " skipping.";
} else {
tLog( LOGVERBOSE ) << Q_FUNC_INFO << "No more possible SIP endpoints for <null connection> skipping.";
}
// If a peerinfo was supplied and has a ControlConnection which should be destroyed, than use this // If a peerinfo was supplied and has a ControlConnection which should be destroyed, than use this
if ( !peerInfo.isNull() && peerInfo->controlConnection() ) if ( !peerInfo.isNull() && peerInfo->controlConnection() )
delete peerInfo->controlConnection(); delete peerInfo->controlConnection();
@@ -922,11 +926,14 @@ Servent::connectToPeer(const peerinfo_ptr& peerInfo, const QList<SipInfo>& sipIn
void void
Servent::connectToPeerFailed( const peerinfo_ptr& peerInfo, QList<SipInfo> sipInfo, Connection* conn, QTcpSocketExtra* socket ) Servent::connectToPeerFailed( const peerinfo_ptr& peerInfo, QList<SipInfo> sipInfo, Connection* conn, QTcpSocketExtra* socket )
{ {
bool connIsNull = socket->_conn.isNull();
cleanupSocket( socket ); cleanupSocket( socket );
// Try next SipInfo if ( !connIsNull ) {
// Try next SipInfo (don't do this if the connection was destroyed in between)
connectToPeer( peerInfo, sipInfo, conn ); connectToPeer( peerInfo, sipInfo, conn );
} }
}
void void
Servent::socketError( QAbstractSocket::SocketError e ) Servent::socketError( QAbstractSocket::SocketError e )