#include "ctcphandler.h"
NetworkConnection::NetworkConnection(Network *network, CoreSession *session, const QVariant &state) : QObject(network),
+ _connectionState(Network::Disconnected),
_network(network),
_coreSession(session),
_ircServerHandler(new IrcServerHandler(this)),
_ctcpHandler(new CtcpHandler(this)),
_previousState(state)
{
- connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(sendPerform()));
+ connect(network, SIGNAL(currentServerSet(const QString &)), this, SLOT(networkInitialized()));
connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected()));
- connect(&socket, SIGNAL(disconnected()), this, SLOT(quit()));
+ 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)));
connect(&socket, SIGNAL(readyRead()), this, SLOT(socketHasData()));
}
NetworkConnection::~NetworkConnection() {
+ disconnectFromIrc();
delete _ircServerHandler;
delete _userInputHandler;
delete _ctcpHandler;
}
bool NetworkConnection::isConnected() const {
- return socket.state() == QAbstractSocket::ConnectedState;
+ // return socket.state() == QAbstractSocket::ConnectedState;
+ return connectionState() == Network::Initialized;
+}
+
+Network::ConnectionState NetworkConnection::connectionState() const {
+ return _connectionState;
+}
+
+void NetworkConnection::setConnectionState(Network::ConnectionState state) {
+ _connectionState = state;
+ network()->setConnectionState(state);
+ emit connectionStateChanged(state);
}
NetworkId NetworkConnection::networkId() const {
void NetworkConnection::connectToIrc() {
- QList<QVariantMap> serverList = network()->serverList();
+ QVariantList serverList = network()->serverList();
Identity *identity = coreSession()->identity(network()->identity());
if(!serverList.count()) {
qWarning() << "Server list empty, ignoring connect request!";
qWarning() << "Invalid identity configures, ignoring connect request!";
return;
}
-
// TODO implement cycling / random servers
- QString host = serverList[0]["Address"].toString();
- quint16 port = serverList[0]["Port"].toUInt();
+ QString host = serverList[0].toMap()["Host"].toString();
+ quint16 port = serverList[0].toMap()["Port"].toUInt();
displayStatusMsg(QString("Connecting to %1:%2...").arg(host).arg(port));
socket.connectToHost(host, port);
}
+void NetworkConnection::networkInitialized() {
+ 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!
+ }
+ // delete _previousState, we won't need it again
+ _previousState = QVariant();
+ // now we are initialized
+ setConnectionState(Network::Initialized);
+ network()->setConnected(true);
+ emit connected(networkId());
+}
+
void NetworkConnection::sendPerform() {
// TODO: reimplement perform List!
//// send performlist
// }
//}
- // 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));
- }
- // delete _previousState, we won't need it again
- _previousState = QVariant();
}
QVariant NetworkConnection::state() const {
}
}
-void NetworkConnection::socketError( QAbstractSocket::SocketError err ) {
- qDebug() << "Socket Error!";
+void NetworkConnection::socketError(QAbstractSocket::SocketError) {
+ qDebug() << qPrintable(tr("Could not connect to %1 (%2)").arg(network()->networkName(), socket.errorString()));
+ emit connectionError(socket.errorString());
+ emit displayMsg(Message::Error, "", tr("Connection failure: %1").arg(socket.errorString()));
+ network()->emitConnectionError(socket.errorString());
}
void NetworkConnection::socketConnected() {
- emit connected(networkId());
+ //emit connected(networkId()); initialize first!
Identity *identity = coreSession()->identity(network()->identity());
if(!identity) {
qWarning() << "Identity invalid!";
putRawLine(QString("USER %1 8 * :%2").arg(identity->ident(), identity->realName()));
}
-void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState state) {
- //qDebug() << "Socket state changed: " << state;
+void NetworkConnection::socketStateChanged(QAbstractSocket::SocketState socketState) {
+ Network::ConnectionState state;
+ switch(socketState) {
+ case QAbstractSocket::UnconnectedState:
+ state = Network::Disconnected;
+ break;
+ case QAbstractSocket::HostLookupState:
+ case QAbstractSocket::ConnectingState:
+ state = Network::Connecting;
+ break;
+ case QAbstractSocket::ConnectedState:
+ state = Network::Initializing;
+ break;
+ case QAbstractSocket::ClosingState:
+ state = Network::Disconnecting;
+ break;
+ default:
+ state = Network::Disconnected;
+ }
+ setConnectionState(state);
+}
+
+void NetworkConnection::socketDisconnected() {
+ network()->setConnected(false);
+ emit disconnected(networkId());
}
// FIXME switch to BufferId