#include "core.h"
#include "coresession.h"
#include "coresettings.h"
+#include "quassel.h"
#include "signalproxy.h"
#include "sqlitestorage.h"
#include "network.h"
}
Core::Core() : storage(0) {
- _startTime = QDateTime::currentDateTime(); // for uptime :)
+ _startTime = QDateTime::currentDateTime().toUTC(); // for uptime :)
// Register storage backends here!
registerStorageBackend(new SqliteStorage(this));
}
}
- connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
- if(!startListening(cs.port())) exit(1); // TODO make this less brutal
+ connect(&_server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
+ connect(&_v6server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
+ if(!startListening()) exit(1); // TODO make this less brutal
}
Core::~Core() {
/*** Network Management ***/
-bool Core::startListening(uint port) {
+bool Core::startListening() {
bool success = false;
+ uint port = Quassel::optionValue("port").toUInt();
- // let's see if ipv6 is available
- success = server.listen(QHostAddress::AnyIPv6, port);
-
- if(!success && server.serverError() == QAbstractSocket::UnsupportedSocketOperationError) {
- // fall back to v4
- success = server.listen(QHostAddress::Any, port);
+ if(_server.listen(QHostAddress::Any, port)) {
+ quInfo() << "Listening for GUI clients on IPv6 port" << _server.serverPort()
+ << "using protocol version" << Quassel::buildInfo().protocolVersion;
+ success = true;
+ }
+ if(_v6server.listen(QHostAddress::AnyIPv6, port)) {
+ quInfo() << "Listening for GUI clients on IPv4 port" << _v6server.serverPort()
+ << "using protocol version" << Quassel::buildInfo().protocolVersion;
+ success = true;
}
if(!success) {
- quError() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString()));
- } else {
- quInfo() << "Listening for GUI clients on port" << server.serverPort() << "using protocol version" << Global::protocolVersion;
+ quError() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(_server.errorString()));
}
-
+
return success;
}
void Core::stopListening() {
- server.close();
+ _server.close();
+ _v6server.close();
quInfo() << "No longer listening for GUI clients.";
}
void Core::incomingConnection() {
- while(server.hasPendingConnections()) {
- QTcpSocket *socket = server.nextPendingConnection();
+ QTcpServer *server = qobject_cast<QTcpServer *>(sender());
+ Q_ASSERT(server);
+ while(server->hasPendingConnections()) {
+ QTcpSocket *socket = server->nextPendingConnection();
connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData()));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError)));
-
+
QVariantMap clientInfo;
blocksizes.insert(socket, (quint32)0);
quInfo() << qPrintable(tr("Client connected from")) << qPrintable(socket->peerAddress().toString());
- if (!configured) {
- server.close();
+ if(!configured) {
+ _server.close();
+ _v6server.close();
quDebug() << "Closing server for basic setup.";
}
}
QVariantMap reply;
// Just version information -- check it!
- uint ver = 0;
- if(!msg.contains("ProtocolVersion") && msg["ClientBuild"].toUInt() >= 732) ver = 1; // FIXME legacy
- if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt();
- if(ver < Global::coreNeedsProtocol) {
+ uint ver = msg["ProtocolVersion"].toUInt();
+ if(ver < Quassel::buildInfo().coreNeedsProtocol) {
reply["MsgType"] = "ClientInitReject";
reply["Error"] = tr("<b>Your Quassel Client is too old!</b><br>"
"This core needs at least client/core protocol version %1.<br>"
- "Please consider upgrading your client.").arg(Global::coreNeedsProtocol);
+ "Please consider upgrading your client.").arg(Quassel::buildInfo().coreNeedsProtocol);
SignalProxy::writeDataToDevice(socket, reply);
quWarning() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("too old, rejecting."));
socket->close(); return;
}
- reply["CoreVersion"] = Global::quasselVersion;
- reply["CoreDate"] = Global::quasselBuildDate;
- reply["CoreBuild"] = 860; // FIXME legacy
- reply["ProtocolVersion"] = Global::protocolVersion;
+ reply["CoreVersion"] = Quassel::buildInfo().fancyVersionString;
+ reply["CoreDate"] = Quassel::buildInfo().buildDate;
+ reply["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
// TODO: Make the core info configurable
- int uptime = startTime().secsTo(QDateTime::currentDateTime());
+ int uptime = startTime().secsTo(QDateTime::currentDateTime().toUTC());
int updays = uptime / 86400; uptime %= 86400;
int uphours = uptime / 3600; uptime %= 3600;
int upmins = uptime / 60;
reply["CoreInfo"] = tr("<b>Quassel Core Version %1</b><br>"
"Built: %2<br>"
- "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuildDate)
+ "Up %3d%4h%5m (since %6)").arg(Quassel::buildInfo().fancyVersionString)
+ .arg(Quassel::buildInfo().buildDate)
.arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime().toString(Qt::TextDate));
#ifdef HAVE_SSL
- SslServer *sslServer = qobject_cast<SslServer *>(&server);
+ SslServer *sslServer = qobject_cast<SslServer *>(&_server);
QSslSocket *sslSocket = qobject_cast<QSslSocket *>(socket);
bool supportSsl = (bool)sslServer && (bool)sslSocket && sslServer->certIsValid();
#else
quDebug() << "Using compression for Client:" << qPrintable(socket->peerAddress().toString());
}
#endif
-
+
} else {
// for the rest, we need an initialized connection
if(!clientInfo.contains(socket)) {
// DO NOT CALL ANY METHODS ON socket!!
socket = static_cast<QTcpSocket *>(sender());
-
+
QHash<QTcpSocket *, quint32>::iterator blockSizeIter = blocksizes.begin();
while(blockSizeIter != blocksizes.end()) {
if(blockSizeIter.key() == socket) {
sess->addClient(socket);
}
+void Core::setupInternalClientSession(SignalProxy *proxy) {
+ UserId uid = 3; // FIXME!!!11
+ // Find or create session for validated user
+ SessionThread *sess;
+ if(sessions.contains(uid))
+ sess = sessions[uid];
+ else
+ sess = createSession(uid);
+ sess->addClient(proxy);
+}
+
SessionThread *Core::createSession(UserId uid, bool restore) {
if(sessions.contains(uid)) {
quWarning() << "Calling createSession() when a session for the user already exists!";
projects / quassel.git / blobdiff