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 d633038..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() {
@@ -94,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()));
@@ -111,7 +111,7 @@ void Core::clientHasData() {
     try {
       processClientInit(socket, item);
     } catch(Storage::AuthError) {
-      qWarning() << "Authentification error!";  // FIXME
+      qWarning() << "Authentification error!";  // FIXME: send auth error to client
       socket->close();
       return;
     } catch(Exception e) {
@@ -120,7 +120,7 @@ void Core::clientHasData() {
       return;
     }
   }
-  blockSizes[socket] = bsize = 0;  // FIXME blockSizes aufräum0rn!
+  blockSizes[socket] = bsize = 0;  // FIXME blockSizes aufräum0rn!
 }
 
 // FIXME: no longer called, since connection handling is now in SignalProxy
@@ -155,16 +155,17 @@ void Core::processClientInit(QTcpSocket *socket, const QVariant &v) {
   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);
-  }
   QVariantMap reply;
   reply["SessionState"] = sess->sessionState();
   return reply;