X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=6f201744e96b61b059a92a04b0f99c475450aaf1;hb=cb8ba3dbdb3402159694f9f299a8d931ca4bbdc4;hp=31a409f51b9b9b6588b2115bec32f76db6849850;hpb=c3f487c53eb663ba9d06176b093d928351bee78d;p=quassel.git diff --git a/src/core/core.cpp b/src/core/core.cpp index 31a409f5..6f201744 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -89,8 +89,8 @@ void Core::init() { } Core::~Core() { - foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys(); - socket->disconnectFromHost(); // disconnect local (i.e. non-authed) clients + foreach(QTcpSocket *socket, blocksizes.keys()) { + socket->disconnectFromHost(); // disconnect non authed clients } qDeleteAll(sessions); qDeleteAll(_storageBackends); @@ -515,13 +515,34 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { // Potentially called during the initialization phase (before handing the connection off to the session) void Core::clientDisconnected() { - QTcpSocket *socket = dynamic_cast(sender()); // Note: This might be a QObject* already (if called by ~Core())! - Q_ASSERT(socket); - blocksizes.remove(socket); - clientInfo.remove(socket); - qDebug() << qPrintable(tr("Non-authed client disconnected.")); - socket->deleteLater(); - socket = 0; + QTcpSocket *socket = qobject_cast(sender()); + if(socket) { + // here it's safe to call methods on socket! + qDebug() << qPrintable(tr("Non-authed client disconnected.")) << qPrintable(socket->peerAddress().toString()); + socket->deleteLater(); + } else { + // we have to crawl through the hashes and see if we find a victim to remove + + // DO NOT CALL ANY METHODS ON socket!! + socket = static_cast(sender()); + + QHash::iterator blockSizeIter = blocksizes.begin(); + while(blockSizeIter != blocksizes.end()) { + if(blockSizeIter.key() == socket) { + blocksizes.erase(blockSizeIter); + } + blockSizeIter++; + } + + QHash::iterator clientInfoIter = clientInfo.begin(); + while(clientInfoIter != clientInfo.end()) { + if(clientInfoIter.key() == socket) { + clientInfo.erase(clientInfoIter); + } + clientInfoIter++; + } + } + // make server listen again if still not configured if (!configured) {