From 1e561ae9d1e85c6e4a486d26fdf2f2f27771827e Mon Sep 17 00:00:00 2001
From: HystericalDragon <138737572+HystericalDragon@users.noreply.github.com>
Date: Sun, 23 Jul 2023 08:58:26 +0800
Subject: [PATCH] add padding for mux
---
db/ConfigBuilder.cpp | 1 +
main/NekoGui.cpp | 1 +
main/NekoGui_DataStore.hpp | 1 +
ui/dialog_basic_settings.cpp | 3 +++
ui/dialog_basic_settings.ui | 17 ++++++++++++-----
5 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp
index ad37b82..0fc16df 100644
--- a/db/ConfigBuilder.cpp
+++ b/db/ConfigBuilder.cpp
@@ -651,6 +651,7 @@ namespace NekoGui {
auto muxObj = QJsonObject{
{"enabled", true},
{"protocol", dataStore->mux_protocol},
+ {"padding", dataStore->mux_padding},
{"max_streams", dataStore->mux_concurrency},
};
outbound["multiplex"] = muxObj;
diff --git a/main/NekoGui.cpp b/main/NekoGui.cpp
index 5ebb536..939b187 100644
--- a/main/NekoGui.cpp
+++ b/main/NekoGui.cpp
@@ -237,6 +237,7 @@ namespace NekoGui {
_add(new configItem("log_level", &log_level, itemType::string));
_add(new configItem("mux_protocol", &mux_protocol, itemType::string));
_add(new configItem("mux_concurrency", &mux_concurrency, itemType::integer));
+ _add(new configItem("mux_padding", &mux_padding, itemType::boolean));
_add(new configItem("mux_default_on", &mux_default_on, itemType::boolean));
_add(new configItem("traffic_loop_interval", &traffic_loop_interval, itemType::integer));
_add(new configItem("test_concurrent", &test_concurrent, itemType::integer));
diff --git a/main/NekoGui_DataStore.hpp b/main/NekoGui_DataStore.hpp
index 13dfa1b..3f1a40f 100644
--- a/main/NekoGui_DataStore.hpp
+++ b/main/NekoGui_DataStore.hpp
@@ -102,6 +102,7 @@ namespace NekoGui {
bool connection_statistics = false;
int current_group = 0; // group id
QString mux_protocol = "";
+ bool mux_padding = false;
int mux_concurrency = 8;
bool mux_default_on = false;
QString theme = "0";
diff --git a/ui/dialog_basic_settings.cpp b/ui/dialog_basic_settings.cpp
index df7b9fa..b5b6189 100644
--- a/ui/dialog_basic_settings.cpp
+++ b/ui/dialog_basic_settings.cpp
@@ -66,6 +66,7 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent)
} else {
ui->log_level->addItems({"debug", "info", "warning", "none"});
ui->mux_protocol->hide();
+ ui->mux_padding->hide();
}
refresh_auth();
@@ -240,6 +241,7 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent)
// Mux
D_LOAD_INT(mux_concurrency)
D_LOAD_COMBO_STRING(mux_protocol)
+ D_LOAD_BOOL(mux_padding)
D_LOAD_BOOL(mux_default_on)
// Security
@@ -309,6 +311,7 @@ void DialogBasicSettings::accept() {
// Mux
D_SAVE_INT(mux_concurrency)
D_SAVE_COMBO_STRING(mux_protocol)
+ D_SAVE_BOOL(mux_padding)
D_SAVE_BOOL(mux_default_on)
// Security
diff --git a/ui/dialog_basic_settings.ui b/ui/dialog_basic_settings.ui
index 69223cf..19f36b6 100644
--- a/ui/dialog_basic_settings.ui
+++ b/ui/dialog_basic_settings.ui
@@ -6,8 +6,8 @@
0
0
- 600
- 400
+ 650
+ 500
@@ -33,7 +33,7 @@
-
- 0
+ 3
@@ -603,6 +603,13 @@
-
+ -
+
+
+ padding
+
+
+
-
@@ -694,8 +701,8 @@
0
0
- 568
- 297
+ 515
+ 315