X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=67137653c40b5205fa31179ad78bcd37c34b4b7a;hb=130fde74cee428ec2e3285db89c4348c3091b2aa;hp=760dcb3c7d2666fd17753f2a8a73527edcd0b294;hpb=769fd4e7ade0b44503434d30fab8880a4b66411b;p=quassel.git

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 760dcb3c..67137653 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -35,6 +35,8 @@
 #include "userinputhandler.h"
 #include "ctcphandler.h"
 
+#include "logger.h"
+
 NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
   : QObject(network),
     _connectionState(Network::Disconnected),
@@ -177,11 +179,11 @@ void NetworkConnection::connectToIrc(bool reconnecting) {
   QVariantList serverList = network()->serverList();
   Identity *identity = coreSession()->identity(network()->identity());
   if(!serverList.count()) {
-    qWarning() << "Server list empty, ignoring connect request!";
+    quWarning() << "Server list empty, ignoring connect request!";
     return;
   }
   if(!identity) {
-    qWarning() << "Invalid identity configures, ignoring connect request!";
+    quWarning() << "Invalid identity configures, ignoring connect request!";
     return;
   }
   // use a random server?
@@ -252,20 +254,19 @@ void NetworkConnection::sendPerform() {
 }
 
 void NetworkConnection::disconnectFromIrc(bool requested) {
+  _quitRequested = requested; // see socketDisconnected();
   _autoReconnectTimer.stop();
-  _autoReconnectCount = 0;
+  _autoReconnectCount = 0; // prohibiting auto reconnect
   displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting."));
-  if(socket.state() < QAbstractSocket::ConnectedState) {
-    setConnectionState(Network::Disconnected);
+  if(socket.state() == QAbstractSocket::UnconnectedState) {
+    socketDisconnected();
+  } else if(socket.state() < QAbstractSocket::ConnectedState) {
+    socket.close();
+    // we might be in a state waiting for a timeout... we don't care... set a disconnected state
     socketDisconnected();
   } else {
     _socketCloseTimer.start(10000); // the irc server has 10 seconds to close the socket
   }
-
-  // this flag triggers quitRequested() once the socket is closed
-  // it is needed to determine whether or not the connection needs to be
-  // in the automatic session restore.
-  _quitRequested = requested;
 }
 
 void NetworkConnection::socketHasData() {
@@ -277,12 +278,11 @@ void NetworkConnection::socketHasData() {
 
 void NetworkConnection::socketError(QAbstractSocket::SocketError) {
   _previousConnectionAttemptFailed = true;
-  qDebug() << qPrintable(tr("Could not connect to %1 (%2)").arg(network()->networkName(), socket.errorString()));
+  quWarning() << qPrintable(tr("Could not connect to %1 (%2)").arg(network()->networkName(), socket.errorString()));
   emit connectionError(socket.errorString());
   emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", tr("Connection failure: %1").arg(socket.errorString()));
   network()->emitConnectionError(socket.errorString());
   if(socket.state() < QAbstractSocket::ConnectedState) {
-    setConnectionState(Network::Disconnected);
     socketDisconnected();
   }
   // mark last connection attempt as failed
@@ -335,7 +335,7 @@ void NetworkConnection::socketInitialized() {
   //emit connected(networkId());  initialize first!
   Identity *identity = coreSession()->identity(network()->identity());
   if(!identity) {
-    qWarning() << "Identity invalid!";
+    quError() << "Identity invalid!";
     disconnectFromIrc();
     return;
   }
@@ -384,18 +384,21 @@ void NetworkConnection::socketDisconnected() {
   
   network()->setConnected(false);
   emit disconnected(networkId());
-  if(_autoReconnectCount != 0) {
-    setConnectionState(Network::Reconnecting);
-    if(_autoReconnectCount == network()->autoReconnectRetries()) doAutoReconnect(); // first try is immediate
-    else _autoReconnectTimer.start();
-  } else if(_quitRequested) {
+  if(_quitRequested) {
+    setConnectionState(Network::Disconnected);
     emit quitRequested(networkId());
+  } else if(_autoReconnectCount != 0) {
+    setConnectionState(Network::Reconnecting);
+    if(_autoReconnectCount == network()->autoReconnectRetries())
+      doAutoReconnect(); // first try is immediate
+    else
+      _autoReconnectTimer.start();
   }
 }
 
 void NetworkConnection::doAutoReconnect() {
   if(connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting) {
-    qWarning() << "NetworkConnection::doAutoReconnect(): Cannot reconnect while not being disconnected!";
+    quWarning() << "NetworkConnection::doAutoReconnect(): Cannot reconnect while not being disconnected!";
     return;
   }
   if(_autoReconnectCount > 0) _autoReconnectCount--;