X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=13a7fd90b1ac33b266a01a4da34fbd0ddc5139f9;hp=b156b2dc70dd900d975aae58f4e575bbfb1138c4;hb=452077390e20d20d20c9b1f97c3772a5690f58ce;hpb=2f953e817b56e8dfd3770b2109b3a81b0854f3a8

diff --git a/src/core/core.cpp b/src/core/core.cpp
index b156b2dc..13a7fd90 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -55,6 +55,9 @@ Core::Core() : storage(0) {
 
   if(!_storageBackends.count()) {
     qWarning() << qPrintable(tr("Could not initialize any storage backend! Exiting..."));
+    qWarning() << qPrintable(tr("Currently, Quassel only supports SQLite3. You need to build your\n"
+                                "Qt library with the sqlite plugin enabled in order for quasselcore\n"
+                                "to work."));
     exit(1); // TODO make this less brutal (especially for mono client -> popup)
   }
   connect(&_storageSyncTimer, SIGNAL(timeout()), this, SLOT(syncStorage()));
@@ -86,8 +89,8 @@ void Core::init() {
 }
 
 Core::~Core() {
-  foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys();
-    socket->disconnectFromHost();  // disconnect local (i.e. non-authed) clients
+  foreach(QTcpSocket *socket, blocksizes.keys()) {
+    socket->disconnectFromHost();  // disconnect non authed clients
   }
   qDeleteAll(sessions);
   qDeleteAll(_storageBackends);
@@ -309,6 +312,11 @@ QList<BufferInfo> Core::requestBuffers(UserId user) {
   return instance()->storage->requestBuffers(user);
 }
 
+QList<BufferId> Core::requestBufferIdsForNetwork(UserId user, NetworkId networkId) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->requestBufferIdsForNetwork(user, networkId);
+}
+
 bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
   QMutexLocker locker(&mutex);
   return instance()->storage->removeBuffer(user, bufferId);
@@ -332,12 +340,23 @@ QHash<BufferId, MsgId> Core::bufferLastSeenMsgIds(UserId user) {
 /*** Network Management ***/
 
 bool Core::startListening(uint port) {
-  if(!server.listen(QHostAddress::Any, port)) {
+  bool success = false;
+
+  // 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(!success) {
     qWarning("%s", qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(server.errorString())));
-    return false;
+  } else {
+    qDebug() << "Listening for GUI clients on port" << server.serverPort();
   }
-  qDebug() << "Listening for GUI clients on port" << server.serverPort();
-  return true;
+  
+  return success;
 }
 
 void Core::stopListening() {
@@ -386,8 +405,10 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
     QVariantMap reply;
 
     // Just version information -- check it!
-    if((msg.contains("ClientBuild") && msg["ClientBuild"].toUInt() < 732)
-       || (!msg.contains("ClientBuild") && msg["ProtocolVersion"].toUInt() < Global::coreNeedsProtocol)) {
+    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) {
       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>"
@@ -507,13 +528,34 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
 
 // Potentially called during the initialization phase (before handing the connection off to the session)
 void Core::clientDisconnected() {
-  QTcpSocket *socket = dynamic_cast<QTcpSocket*>(sender());  // Note: This might be a QObject* already (if called by ~Core())!
-  Q_ASSERT(socket);
-  blocksizes.remove(socket);
-  clientInfo.remove(socket);
-  qDebug() << qPrintable(tr("Non-authed client disconnected."));
-  socket->deleteLater();
-  socket = 0;
+  QTcpSocket *socket = qobject_cast<QTcpSocket *>(sender());
+  if(socket) {
+    // here it's safe to call methods on socket!
+    qDebug() << qPrintable(tr("Non-authed client disconnected.")) << qPrintable(socket->peerAddress().toString());
+    socket->deleteLater();
+  } else {
+    // we have to crawl through the hashes and see if we find a victim to remove
+
+    // 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) {
+	blocksizes.erase(blockSizeIter);
+      }
+      blockSizeIter++;
+    }
+
+    QHash<QTcpSocket *, QVariantMap>::iterator clientInfoIter = clientInfo.begin();
+    while(clientInfoIter != clientInfo.end()) {
+      if(clientInfoIter.key() == socket) {
+	clientInfo.erase(clientInfoIter);
+      }
+      clientInfoIter++;
+    }
+  }
+
 
   // make server listen again if still not configured
   if (!configured) {