From 5895f9f59028717449a244b8bb19be48b6080d11 Mon Sep 17 00:00:00 2001 From: Nova Date: Sat, 19 Apr 2025 12:50:21 +0330 Subject: [PATCH] always enable auto redirect on linux --- include/global/NekoGui_DataStore.hpp | 1 - include/ui/setting/dialog_vpn_settings.ui | 14 -------------- src/configs/ConfigBuilder.cpp | 2 +- src/global/NekoGui.cpp | 1 - src/ui/setting/dialog_vpn_settings.cpp | 5 ----- 5 files changed, 1 insertion(+), 22 deletions(-) diff --git a/include/global/NekoGui_DataStore.hpp b/include/global/NekoGui_DataStore.hpp index 9672725..5524530 100644 --- a/include/global/NekoGui_DataStore.hpp +++ b/include/global/NekoGui_DataStore.hpp @@ -113,7 +113,6 @@ namespace NekoGui { // VPN bool fake_dns = false; - bool auto_redirect = true; #ifdef Q_OS_MACOS QString vpn_implementation = "gvisor"; #else diff --git a/include/ui/setting/dialog_vpn_settings.ui b/include/ui/setting/dialog_vpn_settings.ui index ca7a143..0349ba8 100644 --- a/include/ui/setting/dialog_vpn_settings.ui +++ b/include/ui/setting/dialog_vpn_settings.ui @@ -93,20 +93,6 @@ - - - - Qt::Orientation::Vertical - - - - - - - Auto Redirect - - - diff --git a/src/configs/ConfigBuilder.cpp b/src/configs/ConfigBuilder.cpp index d6c2951..f223553 100644 --- a/src/configs/ConfigBuilder.cpp +++ b/src/configs/ConfigBuilder.cpp @@ -498,7 +498,7 @@ namespace NekoGui { inboundObj["stack"] = dataStore->vpn_implementation; inboundObj["strict_route"] = dataStore->vpn_strict_route; #ifdef Q_OS_LINUX - inboundObj["auto_redirect"] = dataStore->auto_redirect; + inboundObj["auto_redirect"] = true; #endif auto tunAddress = QJsonArray{"172.19.0.1/24"}; if (dataStore->vpn_ipv6) tunAddress += "fdfe:dcba:9876::1/96"; diff --git a/src/global/NekoGui.cpp b/src/global/NekoGui.cpp index c4d6afd..0d14764 100644 --- a/src/global/NekoGui.cpp +++ b/src/global/NekoGui.cpp @@ -274,7 +274,6 @@ namespace NekoGui { _add(new configItem("vpn_mtu", &vpn_mtu, itemType::integer)); _add(new configItem("vpn_ipv6", &vpn_ipv6, itemType::boolean)); _add(new configItem("vpn_strict_route", &vpn_strict_route, itemType::boolean)); - _add(new configItem("auto_redirect", &auto_redirect, itemType::boolean)); _add(new configItem("sub_clear", &sub_clear, itemType::boolean)); _add(new configItem("sub_insecure", &sub_insecure, itemType::boolean)); _add(new configItem("sub_auto_update", &sub_auto_update, itemType::integer)); diff --git a/src/ui/setting/dialog_vpn_settings.cpp b/src/ui/setting/dialog_vpn_settings.cpp index 1b0c5e9..7407e76 100644 --- a/src/ui/setting/dialog_vpn_settings.cpp +++ b/src/ui/setting/dialog_vpn_settings.cpp @@ -15,10 +15,6 @@ DialogVPNSettings::DialogVPNSettings(QWidget *parent) : QDialog(parent), ui(new ui->vpn_implementation->setCurrentText(NekoGui::dataStore->vpn_implementation); ui->vpn_mtu->setCurrentText(Int2String(NekoGui::dataStore->vpn_mtu)); ui->vpn_ipv6->setChecked(NekoGui::dataStore->vpn_ipv6); - ui->auto_redir->setChecked(NekoGui::dataStore->auto_redirect); -#ifndef __linux__ - ui->auto_redir->setVisible(false); -#endif ui->strict_route->setChecked(NekoGui::dataStore->vpn_strict_route); ADJUST_SIZE } @@ -35,7 +31,6 @@ void DialogVPNSettings::accept() { NekoGui::dataStore->vpn_mtu = mtu; NekoGui::dataStore->vpn_ipv6 = ui->vpn_ipv6->isChecked(); NekoGui::dataStore->vpn_strict_route = ui->strict_route->isChecked(); - NekoGui::dataStore->auto_redirect = ui->auto_redir->isChecked(); // QStringList msg{"UpdateDataStore"}; msg << "VPNChanged";