Set Turn from CLI

reitovo · May 13, 2024 · a1eca66 · a1eca66
1 parent 62380e9
commit a1eca66
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 1 deletion.
diff --git a/core/peer.cpp b/core/peer.cpp
@@ -2,6 +2,7 @@
 #include <QTimer>
 #include <utility>
 #include "util.h"
+#include "QCommandLineParser"
 #include <QSettings>
 
 Peer::Peer(CollabRoom *room, QString id) {
@@ -10,6 +11,10 @@ Peer::Peer(CollabRoom *room, QString id) {
 
     QSettings s;
     forceRelay = s.value("forceRelay").toBool();
+    if (vts::info::OverrideForceUseTurn) {
+        forceRelay = true;
+        qDebug() << "Use force turn server from command line";
+    }
 
     dcThreadAlive = true;
     dcThread = std::unique_ptr<QThread>(QThread::create([=, this]() {

diff --git a/core/util.cpp b/core/util.cpp
@@ -14,6 +14,8 @@
 
 namespace vts::info {
     QString BuildId = "debug";
+    bool OverrideForceUseTurn = true;
+    QString OverrideTurnServer = "";
 }
 
 #ifdef HAS_DIRECTXTK

diff --git a/core/util.h b/core/util.h
@@ -22,6 +22,8 @@
 
 namespace vts::info {
     extern QString BuildId;
+    extern bool OverrideForceUseTurn;
+    extern QString OverrideTurnServer;
 }
 
 class Elapsed {

diff --git a/main.cpp b/main.cpp
@@ -150,10 +150,19 @@ int main(int argc, char *argv[]) {
 
     QCommandLineParser parser;
     parser.addOption(QCommandLineOption("build-id", QString(), "build-id", "Debug"));
+    parser.addOption(QCommandLineOption("turn-server", QString(), "turn-server"));
+    parser.addOption(QCommandLineOption("force-use-turn", QString()));
     parser.process(app);
 
     vts::info::BuildId = parser.value("build-id");
 
+    if (parser.isSet("turn-server")) {
+        vts::info::OverrideTurnServer = parser.value("turn-server");
+    }
+    if (parser.isSet("force-use-turn")) {
+        vts::info::OverrideForceUseTurn = true;
+    }
+
     std::vector<int> fonts;
     fonts.push_back(QFontDatabase::addApplicationFont(":/fonts/SmileySans-Oblique.ttf"));
     fonts.push_back(QFontDatabase::addApplicationFont(":/fonts/MiSans-Demibold.ttf"));

diff --git a/ui/windows/collabroom.cpp b/ui/windows/collabroom.cpp
@@ -287,8 +287,13 @@ CollabRoom::CollabRoom(bool isServer, QString roomId, QWidget *parent) :
         }
 
         turnServer = settings.value("turnServer", QString()).toString();
-        ui->relayInput->setText(turnServer);
         qDebug() << "Turn server" << turnServer;
+        if (!vts::info::OverrideTurnServer.isEmpty()) {
+            turnServer = vts::info::OverrideTurnServer;
+            qDebug() << "Use turn server from command line " << turnServer;
+        }
+
+        ui->relayInput->setText(turnServer);
     }
 
     roomOpenWaiting = new QMessageBox(this);