#include "core.h"
#include "coresession.h"
+#include "ircchannel.h"
#include "ircuser.h"
#include "network.h"
#include "identity.h"
#include "userinputhandler.h"
#include "ctcphandler.h"
-NetworkConnection::NetworkConnection(Network *network, CoreSession *session, const QVariant &state) : QObject(network),
+NetworkConnection::NetworkConnection(Network *network, CoreSession *session) : QObject(network),
_connectionState(Network::Disconnected),
_network(network),
_coreSession(session),
_ircServerHandler(new IrcServerHandler(this)),
_userInputHandler(new UserInputHandler(this)),
_ctcpHandler(new CtcpHandler(this)),
- _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()));
connect(&socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(socketStateChanged(QAbstractSocket::SocketState)));
connect(&socket, SIGNAL(readyRead()), this, SLOT(socketHasData()));
+ connect(_ircServerHandler, SIGNAL(nickChanged(const QString &, const QString &)),
+ this, SLOT(nickChanged(const QString &, const QString &)));
}
NetworkConnection::~NetworkConnection() {
- disconnectFromIrc();
+ if(connectionState() != Network::Disconnected && connectionState() != Network::Reconnecting)
+ disconnectFromIrc();
delete _ircServerHandler;
delete _userInputHandler;
delete _ctcpHandler;
return network()->networkName();
}
+Identity *NetworkConnection::identity() const {
+ return coreSession()->identity(network()->identity());
+}
+
Network *NetworkConnection::network() const {
return _network;
}
}
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);
}
}
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);
}
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()) {
// 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() {
- sendPerform();
+void NetworkConnection::networkInitialized(const QString ¤tServer) {
+ if(currentServer.isEmpty()) return;
- // 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!
+ if(network()->useAutoReconnect() && !network()->unlimitedReconnectRetries()) {
+ _autoReconnectCount = network()->autoReconnectRetries(); // reset counter
}
- // delete _previousState, we won't need it again
- _previousState = QVariant();
+
+ sendPerform();
+
// now we are initialized
setConnectionState(Network::Initialized);
network()->setConnected(true);
emit connected(networkId());
+
}
void NetworkConnection::sendPerform() {
- // TODO: reimplement perform List!
- //// send performlist
- //QStringList performList = networkSettings["Perform"].toString().split( "\n" );
- //int count = performList.count();
- //for(int a = 0; a < count; a++) {
- // if(!performList[a].isEmpty() ) {
- // userInput(network, "", performList[a]);
- // }
- //}
-
-}
+ 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(statusBuf, line);
+ }
-QVariant NetworkConnection::state() const {
- IrcUser *me = network()->ircUser(network()->myNick());
- if(!me) return QVariant(); // this shouldn't really happen, I guess
- return me->channels();
+ // rejoin channels we've been in
+ QStringList channels, keys;
+ foreach(QString chan, network()->persistentChannels().keys()) {
+ QString key = network()->persistentChannels()[chan];
+ if(!key.isEmpty()) {
+ channels.prepend(chan); keys.prepend(key);
+ } else {
+ channels.append(chan);
+ }
+ }
+ userInputHandler()->handleJoin(statusBuf, QString("%1 %2").arg(channels.join(",")).arg(keys.join(",")));
}
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() {
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() {
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) {
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
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 ¶ms, 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);
}
+void NetworkConnection::addChannelKey(const QString &channel, const QString &key) {
+ if(key.isEmpty()) removeChannelKey(channel);
+ else _channelKeys[channel] = key;
+}
+
+void NetworkConnection::removeChannelKey(const QString &channel) {
+ _channelKeys.remove(channel);
+}
+
+void NetworkConnection::nickChanged(const QString &newNick, const QString &oldNick) {
+ emit nickChanged(_network->networkId(), newNick, oldNick);
+}
+
/* Exception classes for message handling */
NetworkConnection::ParseError::ParseError(QString cmd, QString prefix, QStringList params) {
Q_UNUSED(prefix);
Q_UNUSED(prefix);
_msg = QString("Unknown Command: ") + cmd + params.join(" ");
}
+
projects / quassel.git / blobdiff