Add listen option.

The listen option changes what address the core will listen on, the default is
to listen on all available IPv4 and IPv6 addresses.

diff --git a/src/common/main.cpp b/src/common/main.cpp
index eef7947..3bcecbb 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -87,6 +87,7 @@ int main(int argc, char **argv) {
 #endif
 #ifndef BUILD_QTCLIENT
   // put core-only arguments here
 #endif
 #ifndef BUILD_QTCLIENT
   // put core-only arguments here

+  cliParser->addOption("listen <address>[,<address[,...]]>", 0, "The address(es) quasselcore will listen on", "0.0.0.0,::");

   cliParser->addOption("port <port>",'p', "The port quasselcore will listen at", QString("4242"));
   cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
   cliParser->addOption("logfile <path>", 'l', "Path to logfile");
   cliParser->addOption("port <port>",'p', "The port quasselcore will listen at", QString("4242"));
   cliParser->addSwitch("norestore", 'n', "Don't restore last core's state");
   cliParser->addOption("logfile <path>", 'l', "Path to logfile");

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 93a6d13..08d4c07 100644 (file)
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -244,19 +244,49 @@ bool Core::startListening() {
   bool success = false;
   uint port = Quassel::optionValue("port").toUInt();
 
   bool success = false;
   uint port = Quassel::optionValue("port").toUInt();
 

-  if(_server.listen(QHostAddress::Any, port)) {
-    quInfo() << "Listening for GUI clients on IPv4 port" << _server.serverPort()
-             << "using protocol version" << Quassel::buildInfo().protocolVersion;
-    success = true;
-  }
-  if(_v6server.listen(QHostAddress::AnyIPv6, port)) {
-    quInfo() << "Listening for GUI clients on IPv6 port" << _v6server.serverPort()
-             << "using protocol version" << Quassel::buildInfo().protocolVersion;
-    success = true;
-  }
-
-  if(!success) {
-    qCritical() << qPrintable(QString("Could not open GUI client port %1: %2").arg(port).arg(_server.errorString()));
+  const QString listen = Quassel::optionValue("listen");
+  const QStringList listen_list = listen.split(",", QString::SkipEmptyParts);
+  if (listen_list.size() > 0) {
+    foreach (const QString listen_term, listen_list) {
+      QHostAddress addr;
+      if (! addr.setAddress(listen_term)) {
+        qCritical() << qPrintable(
+          QString("Invalid listen address %1")
+            .arg(listen_term)
+        );
+      } else {
+        switch (addr.protocol()) {
+          case QAbstractSocket::IPv4Protocol:
+            if (_server.listen(addr, port)) {
+              quInfo() << qPrintable(
+                QString("Listening for GUI clients on IPv4 %1 port %2 using protocol version %3")
+                  .arg(addr.toString())
+                  .arg(_server.serverPort())
+                  .arg(Quassel::buildInfo().protocolVersion)
+              );
+              success = true;
+            }
+            break;
+          case QAbstractSocket::IPv6Protocol:
+            if (_v6server.listen(addr, port)) {
+              quInfo() << qPrintable(
+                QString("Listening for GUI clients on IPv6 %1 port %2 using protocol version %3")
+                  .arg(addr.toString())
+                  .arg(_server.serverPort())
+                  .arg(Quassel::buildInfo().protocolVersion)
+              );
+              success = true;
+            }
+            break;
+          default:
+            qCritical() << qPrintable(
+              QString("Invalid listen address %1, unknown network protocol")
+                .arg(listen_term)
+            );
+            break;
+        }
+      }
+    }

   }
 
   return success;
   }
 
   return success;