Ok this is the major rework of quassel we've all been waiting for. For the actual...

[quassel.git] / src / core / core.cpp

diff --git a/src/core/core.cpp b/src/core/core.cpp
index b3e6d03..7b57661 100644 (file)
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -25,7 +25,7 @@
 
 Core *Core::instanceptr = 0;
 
-Core * Core::instance() {
+Core *Core::instance() {
   if(instanceptr) return instanceptr;
   instanceptr = new Core();
   instanceptr->init();
@@ -38,7 +38,6 @@ void Core::destroy() {
 }
 
 Core::Core() {
-
 }
 
 void Core::init() {
@@ -48,26 +47,11 @@ void Core::init() {
   //SqliteStorage::init();
   storage = new SqliteStorage();
   connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
-  //startListening(); // FIXME
+  startListening(); // FIXME make configurable
   guiUser = 0;
-  /*
-  if(Global::runMode == Global::Monolithic) {  // TODO Make GUI user configurable
-    try {
-      guiUser = storage->validateUser("Default", "password");
-    } catch(Storage::AuthError) {
-      guiUser = storage->addUser("Default", "password");
-    }
-    Q_ASSERT(guiUser);
-    Global::setGuiUser(guiUser);
-    createSession(guiUser);
-  } else guiUser = 0;
-  */
 }
 
 Core::~Core() {
-  foreach(QTcpSocket *sock, validClients.keys()) {
-    delete sock;
-  }
   qDeleteAll(sessions);
   delete storage;
 }
@@ -89,7 +73,6 @@ CoreSession *Core::createSession(UserId uid) {
   Q_ASSERT(!core->sessions.contains(uid));
   CoreSession *sess = new CoreSession(uid, core->storage);
   core->sessions[uid] = sess;
-  connect(sess, SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), core, SLOT(recvProxySignal(CoreSignal, QVariant, QVariant, QVariant)));
   return sess;
 }
 
@@ -110,6 +93,7 @@ void Core::stopListening() {
 
 void Core::incomingConnection() {
   // TODO implement SSL
+  // TODO While
   QTcpSocket *socket = server.nextPendingConnection();
   connect(socket, SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
   connect(socket, SIGNAL(readyRead()), this, SLOT(clientHasData()));
@@ -122,33 +106,27 @@ void Core::clientHasData() {
   Q_ASSERT(socket && blockSizes.contains(socket));
   quint32 bsize = blockSizes.value(socket);
   QVariant item;
-  while(readDataFromDevice(socket, bsize, item)) {
-    if(validClients.contains(socket)) {
-      QList<QVariant> sigdata = item.toList();
-      sessions[validClients[socket]]->processSignal((ClientSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]);
-    } else {
-      // we need to auth the client
-      try {
-        processClientInit(socket, item);
-      } catch(Storage::AuthError) {
-        qWarning() << "Authentification error!";  // FIXME
-        socket->close();
-        return;
-      } catch(Exception e) {
-        qWarning() << "Client init error:" << e.msg();
-        socket->close();
-        return;
-      }
+  if(readDataFromDevice(socket, bsize, item)) {
+    // we need to auth the client
+    try {
+      processClientInit(socket, item);
+    } catch(Storage::AuthError) {
+      qWarning() << "Authentification error!";  // FIXME: send auth error to client
+      socket->close();
+      return;
+    } catch(Exception e) {
+      qWarning() << "Client init error:" << e.msg();
+      socket->close();
+      return;
     }
-    blockSizes[socket] = bsize = 0;
   }
-  blockSizes[socket] = bsize;
+  blockSizes[socket] = bsize = 0;  // FIXME blockSizes aufräum0rn!
 }
 
+// FIXME: no longer called, since connection handling is now in SignalProxy
 void Core::clientDisconnected() {
   QTcpSocket *socket = dynamic_cast<QTcpSocket*>(sender());
   blockSizes.remove(socket);
-  validClients.remove(socket);
   qDebug() << "Client disconnected.";
   // TODO remove unneeded sessions - if necessary/possible...
 }
@@ -167,41 +145,28 @@ void Core::disconnectLocalClient() {
 }
 
 void Core::processClientInit(QTcpSocket *socket, const QVariant &v) {
-  VarMap msg = v.toMap();
-  if(msg["GUIProtocol"].toUInt() != GUI_PROTOCOL) {
+  QVariantMap msg = v.toMap();
+  if(msg["GuiProtocol"].toUInt() != GUI_PROTOCOL) {
     //qWarning() << "Client version mismatch.";
     throw Exception("GUI client version mismatch");
   }
     // Auth
   UserId uid = storage->validateUser(msg["User"].toString(), msg["Password"].toString());  // throws exception if this failed
-  VarMap reply = initSession(uid).toMap();
-  validClients[socket] = uid;
-  QList<QVariant> sigdata;
-  sigdata.append(CS_CORE_STATE); sigdata.append(QVariant(reply)); sigdata.append(QVariant()); sigdata.append(QVariant());
-  writeDataToDevice(socket, QVariant(sigdata));
+  QVariant reply = initSession(uid);
+  disconnect(socket, 0, this, 0);
+  sessions[uid]->addClient(socket);
+  qDebug() << "Client initialized successfully.";
+  writeDataToDevice(socket, reply);
 }
 
 QVariant Core::initSession(UserId uid) {
   // Find or create session for validated user
   CoreSession *sess;
-  if(sessions.contains(uid)) sess = sessions[uid];
-  else {
+  if(sessions.contains(uid))
+    sess = sessions[uid];
+  else
     sess = createSession(uid);
-    //validClients[socket] = uid;
-  }
-  VarMap reply;
+  QVariantMap reply;
   reply["SessionState"] = sess->sessionState();
   return reply;
 }
-
-void Core::recvProxySignal(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
-  CoreSession *sess = qobject_cast<CoreSession*>(sender());
-  Q_ASSERT(sess);
-  UserId uid = sess->userId();
-  QList<QVariant> sigdata;
-  sigdata.append(sig); sigdata.append(arg1); sigdata.append(arg2); sigdata.append(arg3);
-  //qDebug() << "Sending signal: " << sigdata;
-  foreach(QTcpSocket *socket, validClients.keys()) {
-    if(validClients[socket] == uid) writeDataToDevice(socket, QVariant(sigdata));
-  }
-}