projects / quassel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Made activity levels persistent.
[quassel.git] / src / core / networkconnection.cpp
diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index a8b8e15..395f134 100644 (file)
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -27,6 +27,7 @@
 #include "core.h"
 #include "coresession.h"
 
+#include "ircchannel.h"
 #include "ircuser.h"
 #include "network.h"
 #include "identity.h"
@@ -42,9 +43,16 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session, con
     _ircServerHandler(new IrcServerHandler(this)),
     _userInputHandler(new UserInputHandler(this)),
     _ctcpHandler(new CtcpHandler(this)),
-    _previousState(state)
+    _previousState(state),
+    _autoReconnectCount(0)
 {
-  connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(networkInitialized()));
+  _autoReconnectTimer.setSingleShot(true);
+  connect(&_autoReconnectTimer, SIGNAL(timeout()), this, SLOT(doAutoReconnect()));
+
+  connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(networkInitialized(const QString &)));
+  connect(network, SIGNAL(useAutoReconnectSet(bool)), this, SLOT(autoReconnectSettingsChanged()));
+  connect(network, SIGNAL(autoReconnectIntervalSet(quint32)), this, SLOT(autoReconnectSettingsChanged()));
+  connect(network, SIGNAL(autoReconnectRetriesSet(quint16)), this, SLOT(autoReconnectSettingsChanged()));
 
   connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected()));
   connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
@@ -55,7 +63,8 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session, con
 }
 
 NetworkConnection::~NetworkConnection() {
-  disconnectFromIrc();
+  if(connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting)
+    disconnectFromIrc();
   delete _ircServerHandler;
   delete _userInputHandler;
   delete _ctcpHandler;
@@ -84,6 +93,10 @@ QString NetworkConnection::networkName() const {
   return network()->networkName();
 }
 
+Identity *NetworkConnection::identity() const {
+  return coreSession()->identity(network()->identity());
+}
+
 Network *NetworkConnection::network() const {
   return _network;
 }
@@ -105,12 +118,14 @@ CtcpHandler *NetworkConnection::ctcpHandler() const {
 }
 
 QString NetworkConnection::serverDecode(const QByteArray &string) const {
-  return network()->decodeString(string);
+  return network()->decodeServerString(string);
 }
 
-QString NetworkConnection::bufferDecode(const QString &bufferName, const QByteArray &string) const {
-  Q_UNUSED(bufferName);
-  // TODO: Implement buffer-specific encodings
+QString NetworkConnection::channelDecode(const QString &bufferName, const QByteArray &string) const {
+  if(!bufferName.isEmpty()) {
+    IrcChannel *channel = network()->ircChannel(bufferName);
+    if(channel) return channel->decodeString(string);
+  }
   return network()->decodeString(string);
 }
 
@@ -121,12 +136,14 @@ QString NetworkConnection::userDecode(const QString &userNick, const QByteArray
 }
 
 QByteArray NetworkConnection::serverEncode(const QString &string) const {
-  return network()->encodeString(string);
+  return network()->encodeServerString(string);
 }
 
-QByteArray NetworkConnection::bufferEncode(const QString &bufferName, const QString &string) const {
-  Q_UNUSED(bufferName);
-  // TODO: Implement buffer-specific encodings
+QByteArray NetworkConnection::channelEncode(const QString &bufferName, const QString &string) const {
+  if(!bufferName.isEmpty()) {
+    IrcChannel *channel = network()->ircChannel(bufferName);
+    if(channel) return channel->encodeString(string);
+  }
   return network()->encodeString(string);
 }
 
@@ -136,8 +153,25 @@ QByteArray NetworkConnection::userEncode(const QString &userNick, const QString
   return network()->encodeString(string);
 }
 
+void NetworkConnection::autoReconnectSettingsChanged() {
+  if(!network()->useAutoReconnect()) {
+    _autoReconnectTimer.stop();
+    _autoReconnectCount = 0;
+  } else {
+    _autoReconnectTimer.setInterval(network()->autoReconnectInterval() * 1000);
+    if(_autoReconnectCount != 0) {
+      if(network()->unlimitedReconnectRetries()) _autoReconnectCount = -1;
+      else _autoReconnectCount = network()->autoReconnectRetries();
+    }
+  }
+}
 
-void NetworkConnection::connectToIrc() {
+void NetworkConnection::connectToIrc(bool reconnecting) {
+  if(!reconnecting && network()->useAutoReconnect() && _autoReconnectCount == 0) {
+    _autoReconnectTimer.setInterval(network()->autoReconnectInterval() * 1000);
+    if(network()->unlimitedReconnectRetries()) _autoReconnectCount = -1;
+    else _autoReconnectCount = network()->autoReconnectRetries();
+  }
   QVariantList serverList = network()->serverList();
   Identity *identity = coreSession()->identity(network()->identity());
   if(!serverList.count()) {
@@ -151,19 +185,27 @@ void NetworkConnection::connectToIrc() {
   // TODO implement cycling / random servers
   QString host = serverList[0].toMap()["Host"].toString();
   quint16 port = serverList[0].toMap()["Port"].toUInt();
-  displayStatusMsg(QString("Connecting to %1:%2...").arg(host).arg(port));
+  displayStatusMsg(tr("Connecting to %1:%2...").arg(host).arg(port));
+  displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Connecting to %1:%2...").arg(host).arg(port));
   socket.connectToHost(host, port);
 }
 
-void NetworkConnection::networkInitialized() {
+void NetworkConnection::networkInitialized(const QString &currentServer) {
+  if(currentServer.isEmpty()) return;
+
+  if(network()->useAutoReconnect() && !network()->unlimitedReconnectRetries()) {
+    _autoReconnectCount = network()->autoReconnectRetries(); // reset counter
+  }
+
   sendPerform();
 
     // rejoin channels we've been in
   QStringList chans = _previousState.toStringList();
   if(chans.count() > 0) {
     qDebug() << "autojoining" << chans;
-    QString list = chans.join(",");
-    putCmd("join", QStringList(list));  // FIXME check for 512 byte limit!
+    QVariantList list;
+    list << serverEncode(chans.join(",")); // TODO add channel passwords
+    putCmd("JOIN", list);  // FIXME check for 512 byte limit!
   }
   // delete _previousState, we won't need it again
   _previousState = QVariant();
@@ -174,8 +216,14 @@ void NetworkConnection::networkInitialized() {
 }
 
 void NetworkConnection::sendPerform() {
+  BufferInfo statusBuf = Core::bufferInfo(coreSession()->user(), network()->networkId(), BufferInfo::StatusBuffer);
+  // do auto identify
+  if(network()->useAutoIdentify() && !network()->autoIdentifyService().isEmpty() && !network()->autoIdentifyPassword().isEmpty()) {
+    userInputHandler()->handleMsg(statusBuf, QString("%1 IDENTIFY %2").arg(network()->autoIdentifyService(), network()->autoIdentifyPassword()));
+  }
+  // send perform list
   foreach(QString line, network()->perform()) {
-    if(!line.isEmpty()) userInput(Core::bufferInfo(coreSession()->user(), network()->networkId(), BufferInfo::StatusBuffer), line);
+    if(!line.isEmpty()) userInput(statusBuf, line);
   }
 }
 
@@ -186,7 +234,13 @@ QVariant NetworkConnection::state() const {
 }
 
 void NetworkConnection::disconnectFromIrc() {
-  socket.disconnectFromHost();
+  _autoReconnectTimer.stop();
+  _autoReconnectCount = 0;
+  displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting."));
+  if(socket.state() < QAbstractSocket::ConnectedState) {
+    setConnectionState(Network::Disconnected);
+    socketDisconnected();
+  } else socket.disconnectFromHost();
 }
 
 void NetworkConnection::socketHasData() {
@@ -201,6 +255,10 @@ void NetworkConnection::socketError(QAbstractSocket::SocketError) {
   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();
+  }
 }
 
 void NetworkConnection::socketConnected() {
@@ -211,8 +269,8 @@ void NetworkConnection::socketConnected() {
     disconnectFromIrc();
     return;
   }
-  putRawLine(QString("NICK :%1").arg(identity->nicks()[0]));  // FIXME: try more nicks if error occurs
-  putRawLine(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName()));
+  putRawLine(serverEncode(QString("NICK :%1").arg(identity->nicks()[0])));  // FIXME: try more nicks if error occurs
+  putRawLine(serverEncode(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName())));
 }
 
 void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState socketState) {
@@ -240,6 +298,21 @@ void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState socketSt
 void NetworkConnection::socketDisconnected() {
   network()->setConnected(false);
   emit disconnected(networkId());
+  if(_autoReconnectCount == 0) emit quitRequested(networkId());
+  else {
+    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!";
+    return;
+  }
+  if(_autoReconnectCount > 0) _autoReconnectCount--;
+  connectToIrc(true);
 }
 
 // FIXME switch to BufferId
@@ -247,22 +320,22 @@ void NetworkConnection::userInput(BufferInfo buf, QString msg) {
   userInputHandler()->handleUserInput(buf, msg);
 }
 
-void NetworkConnection::putRawLine(QString s) {
+void NetworkConnection::putRawLine(QByteArray s) {
   s += "\r\n";
-  socket.write(s.toAscii());
+  socket.write(s);
 }
 
-void NetworkConnection::putCmd(QString cmd, QStringList params, QString prefix) {
-  QString msg;
+void NetworkConnection::putCmd(const QString &cmd, const QVariantList &params, const QByteArray &prefix) {
+  QByteArray msg;
   if(!prefix.isEmpty())
     msg += ":" + prefix + " ";
-  msg += cmd.toUpper();
-  
+  msg += cmd.toUpper().toAscii();
+
   for(int i = 0; i < params.size() - 1; i++) {
-    msg += " " + params[i];
+    msg += " " + params[i].toByteArray();
   }
   if(!params.isEmpty())
-    msg += " :" + params.last();
+    msg += " :" + params.last().toByteArray();
 
   putRawLine(msg);
 }
Quassel IRC