X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.cpp;h=43749bcd43ece0899c3eb0fd4d2cdf35b1fd7a8f;hp=0a2604c0964b04e7afb505ff677533bdf5c806c2;hb=d474ca8e41ebb9b4f057876560ec93a60d06d0da;hpb=70638bdb6a34f51409d4618128fbfd5b56af0e52

diff --git a/src/core/networkconnection.cpp b/src/core/networkconnection.cpp
index 0a2604c0..43749bcd 100644
--- a/src/core/networkconnection.cpp
+++ b/src/core/networkconnection.cpp
@@ -46,11 +46,17 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session) : Q
     _autoReconnectCount(0)
 {
   _autoReconnectTimer.setSingleShot(true);
-
+ _previousConnectionAttemptFailed = false;
+ _lastUsedServerlistIndex = 0;
   // TODO make configurable
   _whoTimer.setInterval(60 * 1000);
   _whoTimer.setSingleShot(false);
 
+  QHash<QString, QString> channels = coreSession()->persistentChannels(networkId());
+  foreach(QString chan, channels.keys()) {
+    _channelKeys[chan.toLower()] = channels[chan];
+  }
+
   connect(&_autoReconnectTimer, SIGNAL(timeout()), this, SLOT(doAutoReconnect()));
   connect(&_whoTimer, SIGNAL(timeout()), this, SLOT(sendWho()));
 
@@ -59,7 +65,12 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session) : Q
   connect(network, SIGNAL(autoReconnectIntervalSet(quint32)), this, SLOT(autoReconnectSettingsChanged()));
   connect(network, SIGNAL(autoReconnectRetriesSet(quint16)), this, SLOT(autoReconnectSettingsChanged()));
 
+#ifndef QT_NO_OPENSSL
+  connect(&socket, SIGNAL(encrypted()), this, SLOT(socketEncrypted()));
+  connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
+#endif
   connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected()));
+
   connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
   connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError)));
   connect(&socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState)));
@@ -67,11 +78,13 @@ NetworkConnection::NetworkConnection(Network *network, CoreSession *session) : Q
 
   connect(_ircServerHandler, SIGNAL(nickChanged(const QString &, const QString &)),
 	  this, SLOT(nickChanged(const QString &, const QString &)));
+
+  network->proxy()->attachSignal(this, SIGNAL(sslErrors(const QVariant &)));
 }
 
 NetworkConnection::~NetworkConnection() {
   if(connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting)
-    disconnectFromIrc();
+    disconnectFromIrc(false); // clean up, but this does not count as requested disconnect!
   delete _ircServerHandler;
   delete _userInputHandler;
   delete _ctcpHandler;
@@ -189,9 +202,20 @@ void NetworkConnection::connectToIrc(bool reconnecting) {
     qWarning() << "Invalid identity configures, ignoring connect request!";
     return;
   }
-  // TODO implement cycling / random servers
-  QString host = serverList[0].toMap()["Host"].toString();
-  quint16 port = serverList[0].toMap()["Port"].toUInt();
+  // use a random server?
+  if(network()->useRandomServer()) {
+    _lastUsedServerlistIndex = qrand() % serverList.size();
+  } else if(_previousConnectionAttemptFailed) {
+    // cycle to next server if previous connection attempt failed
+    displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Connection failed. Cycling to next Server"));
+    if(++_lastUsedServerlistIndex == serverList.size()) {
+      _lastUsedServerlistIndex = 0;
+    }
+  }
+  _previousConnectionAttemptFailed = false;
+
+  QString host = serverList[_lastUsedServerlistIndex].toMap()["Host"].toString();
+  quint16 port = serverList[_lastUsedServerlistIndex].toMap()["Port"].toUInt();
   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);
@@ -227,8 +251,8 @@ void NetworkConnection::sendPerform() {
 
   // rejoin channels we've been in
   QStringList channels, keys;
-  foreach(QString chan, network()->persistentChannels().keys()) {
-    QString key = network()->persistentChannels()[chan];
+  foreach(QString chan, persistentChannels()) {
+    QString key = channelKey(chan);
     if(!key.isEmpty()) {
       channels.prepend(chan); keys.prepend(key);
     } else {
@@ -239,7 +263,7 @@ void NetworkConnection::sendPerform() {
   if(!joinString.isEmpty()) userInputHandler()->handleJoin(statusBuf, joinString);
 }
 
-void NetworkConnection::disconnectFromIrc() {
+void NetworkConnection::disconnectFromIrc(bool requested) {
   _autoReconnectTimer.stop();
   _autoReconnectCount = 0;
   displayMsg(Message::Server, BufferInfo::StatusBuffer, "", tr("Disconnecting."));
@@ -247,6 +271,10 @@ void NetworkConnection::disconnectFromIrc() {
     setConnectionState(Network::Disconnected);
     socketDisconnected();
   } else socket.disconnectFromHost();
+
+  if(requested) {
+    emit quitRequested(networkId());
+  }
 }
 
 void NetworkConnection::socketHasData() {
@@ -257,6 +285,7 @@ void NetworkConnection::socketHasData() {
 }
 
 void NetworkConnection::socketError(QAbstractSocket::SocketError) {
+  _previousConnectionAttemptFailed = true;
   qDebug() << 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()));
@@ -265,11 +294,52 @@ void NetworkConnection::socketError(QAbstractSocket::SocketError) {
     setConnectionState(Network::Disconnected);
     socketDisconnected();
   }
+  // mark last connection attempt as failed
+  
   //qDebug() << "exiting...";
   //exit(1);
 }
 
+#ifndef QT_NO_OPENSSL
+
+void NetworkConnection::sslErrors(const QList<QSslError> &errors) {
+  socket.ignoreSslErrors();
+  /* TODO errorhandling
+  QVariantMap errmsg;
+  QVariantList errnums;
+  foreach(QSslError err, errors) errnums << err.error();
+  errmsg["SslErrors"] = errnums;
+  errmsg["SslCert"] = socket.peerCertificate().toPem();
+  errmsg["PeerAddress"] = socket.peerAddress().toString();
+  errmsg["PeerPort"] = socket.peerPort();
+  errmsg["PeerName"] = socket.peerName();
+  emit sslErrors(errmsg);
+  disconnectFromIrc();
+  */
+}
+
+void NetworkConnection::socketEncrypted() {
+  //qDebug() << "encrypted!";
+  socketInitialized();
+}
+
+#endif  // QT_NO_OPENSSL
+
 void NetworkConnection::socketConnected() {
+#ifdef QT_NO_OPENSSL
+  socketInitialized();
+  return;
+#else
+  if(!network()->serverList()[_lastUsedServerlistIndex].toMap()["UseSSL"].toBool()) {
+    socketInitialized();
+    return;
+  }
+  //qDebug() << "starting handshake";
+  socket.startClientEncryption();
+#endif
+}
+
+void NetworkConnection::socketInitialized() {
   //emit connected(networkId());  initialize first!
   Identity *identity = coreSession()->identity(network()->identity());
   if(!identity) {
@@ -277,6 +347,10 @@ void NetworkConnection::socketConnected() {
     disconnectFromIrc();
     return;
   }
+  QString passwd = network()->serverList()[_lastUsedServerlistIndex].toMap()["Password"].toString();
+  if(!passwd.isEmpty()) {
+    putRawLine(serverEncode(QString("PASS %1").arg(passwd)));
+  }
   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())));
 }
@@ -307,8 +381,7 @@ void NetworkConnection::socketDisconnected() {
   _whoTimer.stop();
   network()->setConnected(false);
   emit disconnected(networkId());
-  if(_autoReconnectCount == 0) emit quitRequested(networkId());
-  else {
+  if(_autoReconnectCount != 0) {
     setConnectionState(Network::Reconnecting);
     if(_autoReconnectCount == network()->autoReconnectRetries()) doAutoReconnect(); // first try is immediate
     else _autoReconnectTimer.start();
@@ -355,17 +428,29 @@ void NetworkConnection::sendWho() {
   }
 }
 
+void NetworkConnection::setChannelJoined(const QString &channel) {
+  emit channelJoined(networkId(), channel, _channelKeys[channel.toLower()]);
+}
+
+void NetworkConnection::setChannelParted(const QString &channel) {
+  removeChannelKey(channel);
+  emit channelParted(networkId(), channel);
+}
+
 void NetworkConnection::addChannelKey(const QString &channel, const QString &key) {
-  if(key.isEmpty()) removeChannelKey(channel);
-  else _channelKeys[channel] = key;
+  if(key.isEmpty()) {
+    removeChannelKey(channel);
+  } else {
+    _channelKeys[channel.toLower()] = key;
+  }
 }
 
 void NetworkConnection::removeChannelKey(const QString &channel) {
-  _channelKeys.remove(channel);
+  _channelKeys.remove(channel.toLower());
 }
 
 void NetworkConnection::nickChanged(const QString &newNick, const QString &oldNick) {
-  emit nickChanged(_network->networkId(), newNick, oldNick);
+  emit nickChanged(networkId(), newNick, oldNick);
 }
 
 /* Exception classes for message handling */