Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
arm64v8a
2023-05-02 19:58:02 +09:00
parent 86e7e5b3b1
commit 9f08acc0d2
6 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/ConfigBuilder.cpp
View File

@@ -873,7 +873,7 @@ namespace NekoRay {
// built-in rules // built-in rules
status->routingRules += QJsonObject{ status->routingRules += QJsonObject{
{"network", "udp"}, {"network", "udp"},
{"port", QJsonArray{135, 137, 138, 5353}}, {"port", QJsonArray{135, 137, 138, 139, 5353}},
{"outbound", "block"}, {"outbound", "block"},
}; };
status->routingRules += QJsonObject{ status->routingRules += QJsonObject{

9
fmt/Bean2CoreObj_box.cpp
View File

@@ -21,6 +21,15 @@ namespace NekoRay::fmt {
if (!path.isEmpty()) transport["service_name"] = path; if (!path.isEmpty()) transport["service_name"] = path;
} }
outbound->insert("transport", transport); outbound->insert("transport", transport);
} else if (header_type == "http") {
// TCP + headerType
QJsonObject transport{
{"type", "http"},
{"method", "GET"},
{"path", path},
{"headers", QJsonObject{{"Host", QList2QJsonArray(host.split(","))}}},
};
outbound->insert("transport", transport);
} }
// 对应字段 tls // 对应字段 tls

2
sys/ExternalProcess.cpp
View File

@@ -50,7 +50,7 @@ namespace NekoRay::sys {
QProcess::setEnvironment(env); QProcess::setEnvironment(env);
if (NekoRay::dataStore->flag_linux_run_core_as_admin && dynamic_cast<CoreProcess *>(this)) { if (NekoRay::dataStore->flag_linux_run_core_as_admin && dynamic_cast<CoreProcess *>(this) && program != "pkexec") {
arguments.prepend(program); arguments.prepend(program);
arguments.prepend("--keep-cwd"); arguments.prepend("--keep-cwd");
program = "pkexec"; program = "pkexec";

2
ui/dialog_manage_routes.cpp
View File

@@ -79,6 +79,8 @@ DialogManageRoutes::DialogManageRoutes(QWidget *parent) : QDialog(parent), ui(ne
ui->blockIPLayout->addWidget(blockIPTxt, 0, 0); ui->blockIPLayout->addWidget(blockIPTxt, 0, 0);
// //
REFRESH_ACTIVE_ROUTING(NekoRay::dataStore->active_routing, NekoRay::dataStore->routing) REFRESH_ACTIVE_ROUTING(NekoRay::dataStore->active_routing, NekoRay::dataStore->routing)
ADD_ASTERISK(this)
} }
DialogManageRoutes::~DialogManageRoutes() { DialogManageRoutes::~DialogManageRoutes() {

2
ui/edit/dialog_edit_profile.cpp
View File

@@ -75,8 +75,6 @@ DialogEditProfile::DialogEditProfile(const QString &_type, int profileOrGroupId,
} }
// 传输设置 for NekoBox // 传输设置 for NekoBox
if (IS_NEKO_BOX) { if (IS_NEKO_BOX) {
ui->header_type->setVisible(false);
ui->header_type_l->setVisible(false);
if (!ui->utlsFingerprint->count()) ui->utlsFingerprint->addItems(Preset::SingBox::UtlsFingerPrint); if (!ui->utlsFingerprint->count()) ui->utlsFingerprint->addItems(Preset::SingBox::UtlsFingerPrint);
} else { } else {
if (!ui->utlsFingerprint->count()) ui->utlsFingerprint->addItems(Preset::V2Ray::UtlsFingerPrint); if (!ui->utlsFingerprint->count()) ui->utlsFingerprint->addItems(Preset::V2Ray::UtlsFingerPrint);

4
ui/mainwindow.cpp
View File

@@ -691,7 +691,7 @@ void MainWindow::neko_set_spmode_system_proxy(bool enable, bool save) {
if (save) { if (save) {
NekoRay::dataStore->remember_spmode.removeAll("system_proxy"); NekoRay::dataStore->remember_spmode.removeAll("system_proxy");
if (enable) { if (enable && NekoRay::dataStore->remember_enable) {
NekoRay::dataStore->remember_spmode.append("system_proxy"); NekoRay::dataStore->remember_spmode.append("system_proxy");
} }
NekoRay::dataStore->Save(); NekoRay::dataStore->Save();
@@ -743,7 +743,7 @@ void MainWindow::neko_set_spmode_vpn(bool enable, bool save) {
if (save) { if (save) {
NekoRay::dataStore->remember_spmode.removeAll("vpn"); NekoRay::dataStore->remember_spmode.removeAll("vpn");
if (enable) { if (enable && NekoRay::dataStore->remember_enable) {
NekoRay::dataStore->remember_spmode.append("vpn"); NekoRay::dataStore->remember_spmode.append("vpn");
} }
NekoRay::dataStore->Save(); NekoRay::dataStore->Save();