#include "userinputhandler.h"
#include "ctcphandler.h"
+#include "logger.h"
+
NetworkConnection::NetworkConnection(Network *network, CoreSession *session)
: QObject(network),
_connectionState(Network::Disconnected),
connect(network, SIGNAL(autoReconnectIntervalSet(quint32)), this, SLOT(autoReconnectSettingsChanged()));
connect(network, SIGNAL(autoReconnectRetriesSet(quint16)), this, SLOT(autoReconnectSettingsChanged()));
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
connect(&socket, SIGNAL(encrypted()), this, SLOT(socketEncrypted()));
connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(sslErrors(const QList<QSslError> &)));
#endif
}
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() {
void NetworkConnection::socketError(QAbstractSocket::SocketError) {
_previousConnectionAttemptFailed = true;
- qDebug() << qPrintable(tr("Could not connect to %1 (%2)").arg(network()->networkName(), socket.errorString()));
+ qWarning() << 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
//exit(1);
}
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
void NetworkConnection::sslErrors(const QList<QSslError> &sslErrors) {
Q_UNUSED(sslErrors)
socketInitialized();
}
-#endif // QT_NO_OPENSSL
+#endif // HAVE_SSL
void NetworkConnection::socketConnected() {
-#ifdef QT_NO_OPENSSL
+#ifndef HAVE_SSL
socketInitialized();
return;
#else
//emit connected(networkId()); initialize first!
Identity *identity = coreSession()->identity(network()->identity());
if(!identity) {
- qWarning() << "Identity invalid!";
+ qCritical() << "Identity invalid!";
disconnectFromIrc();
return;
}
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();
}
}
if(cmd == "PRIVMSG" && params.count() > 1) {
int overrun = lastParamOverrun(cmd, params);
if(overrun) {
- QList<QByteArray> paramCopy1;
- QList<QByteArray> paramCopy2;
- for(int i = 0; i < params.count() - 1; i++) {
- paramCopy1 << params[i];
- paramCopy2 << params[i];
- }
+ QList<QByteArray> paramCopy1 = params;
+ paramCopy1.removeLast();
+ QList<QByteArray> paramCopy2 = paramCopy1;
QByteArray lastPart = params.last();
QByteArray splitter(" .,-");
for(int i = 0; i < splitter.size(); i++) {
splitPos = qMax(splitPos, lastPart.lastIndexOf(splitter[i], maxSplitPos));
}
-
- if(splitPos == -1) {
+ if(splitPos <= 0) {
splitPos = maxSplitPos;
}