From 81e6bc583381aa0e51d5e1ac6da399a7c404f2f6 Mon Sep 17 00:00:00 2001 From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com> Date: Fri, 3 Oct 2025 09:07:12 +0100 Subject: [PATCH] disable sftp as it was unused and very slow compared to other clients. --- sphaira/CMakeLists.txt | 2 +- sphaira/source/utils/devoptab.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sphaira/CMakeLists.txt b/sphaira/CMakeLists.txt index 0bda3b4..86b3f9a 100644 --- a/sphaira/CMakeLists.txt +++ b/sphaira/CMakeLists.txt @@ -26,7 +26,7 @@ option(ENABLE_DEVOPTAB_WEBDAV "" ON) # max speed is 8MiB/s, which is fine for wifi, but awful for ethernet. # other clients get 36-40MiB/s. # it also adds 230k to binary size, and i don't think anyone will use it. -option(ENABLE_DEVOPTAB_SFTP "" ON) +option(ENABLE_DEVOPTAB_SFTP "" OFF) set(sphaira_VERSION 0.13.3) diff --git a/sphaira/source/utils/devoptab.cpp b/sphaira/source/utils/devoptab.cpp index 82c4257..0faf841 100644 --- a/sphaira/source/utils/devoptab.cpp +++ b/sphaira/source/utils/devoptab.cpp @@ -25,10 +25,13 @@ namespace { using namespace sphaira::ui; using namespace sphaira::devoptab::common; +// todo: support for disabling some / all mounts. enum class DevoptabType { HTTP, FTP, +#ifdef ENABLE_DEVOPTAB_SFTP SFTP, +#endif NFS, SMB, WEBDAV, @@ -44,7 +47,9 @@ struct TypeEntry { const TypeEntry TYPE_ENTRIES[] = { {"HTTP", "http://", 80, DevoptabType::HTTP}, {"FTP", "ftp://", 21, DevoptabType::FTP}, +#ifdef ENABLE_DEVOPTAB_SFTP {"SFTP", "sftp://", 22, DevoptabType::SFTP}, +#endif {"NFS", "nfs://", 2049, DevoptabType::NFS}, {"SMB", "smb://", 445, DevoptabType::SMB}, {"WEBDAV", "webdav://", 80, DevoptabType::WEBDAV}, @@ -60,7 +65,9 @@ auto BuildIniPathFromType(DevoptabType type) -> fs::FsPath { switch (type) { case DevoptabType::HTTP: return MOUNT_PATH "/http.ini"; case DevoptabType::FTP: return MOUNT_PATH "/ftp.ini"; +#ifdef ENABLE_DEVOPTAB_SFTP case DevoptabType::SFTP: return MOUNT_PATH "/sftp.ini"; +#endif case DevoptabType::NFS: return MOUNT_PATH "/nfs.ini"; case DevoptabType::SMB: return MOUNT_PATH "/smb.ini"; case DevoptabType::WEBDAV: return MOUNT_PATH "/webdav.ini";