From dde626d5e5b9ec4e66dc6ee45addb7e21a1de132 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 18 Aug 2022 22:47:23 -0500 Subject: [PATCH] refactor: remove unused (#3675) * refactor: remove unused define TR_PATH_DELIMITER_STR * refactor: make TR_DEFAULT_BIND_ADDRESS_IPV4 private * refactor: make TR_DEFAULT_BIND_ADDRESS_IPV6 private * refactor: make TR_DEFAULT_RPC_HOST_WHITELIST private * refactor: remove unused function tr_sessionSetRPCUrl() * refactor: remove unused function tr_sessionGetRPCUrl() * refactor: remove unused field native_local_path_prefix * refactor: remove unused field native_unc_path_prefix --- libtransmission/file-win32.cc | 3 --- libtransmission/session.cc | 29 +++++++++------------------ libtransmission/session.h | 2 -- libtransmission/tr-macros.h | 1 - libtransmission/transmission.h | 20 ------------------ tests/libtransmission/session-test.cc | 11 ---------- 6 files changed, 9 insertions(+), 57 deletions(-) diff --git a/libtransmission/file-win32.cc b/libtransmission/file-win32.cc index ecd71f379..6f5245f05 100644 --- a/libtransmission/file-win32.cc +++ b/libtransmission/file-win32.cc @@ -44,9 +44,6 @@ struct tr_sys_dir_win32 static auto constexpr NativeLocalPathPrefix = L"\\\\?\\"sv; static auto constexpr NativeUncPathPrefix = L"\\\\?\\UNC\\"sv; -static wchar_t const native_local_path_prefix[] = { '\\', '\\', '?', '\\' }; -static wchar_t const native_unc_path_prefix[] = { '\\', '\\', '?', '\\', 'U', 'N', 'C', '\\' }; - static void set_system_error(tr_error** error, DWORD code) { if (error == nullptr) diff --git a/libtransmission/session.cc b/libtransmission/session.cc index 83d42c9ab..4efb8660b 100644 --- a/libtransmission/session.cc +++ b/libtransmission/session.cc @@ -69,6 +69,9 @@ using namespace std::literals; std::recursive_mutex tr_session::session_mutex_; +static auto constexpr DefaultBindAddressIpv4 = "0.0.0.0"sv; +static auto constexpr DefaultBindAddressIpv6 = "::"sv; +static auto constexpr DefaultRpcHostWhitelist = ""sv; #ifdef TR_LIGHTWEIGHT static auto constexpr DefaultCacheSizeMB = int{ 2 }; static auto constexpr DefaultPrefetchEnabled = bool{ false }; @@ -273,10 +276,10 @@ tr_session::PublicAddressResult tr_session::publicAddress(tr_address_type type) switch (type) { case TR_AF_INET: - return { bind_ipv4.addr_, bind_ipv4.addr_.readable() == TR_DEFAULT_BIND_ADDRESS_IPV4 }; + return { bind_ipv4.addr_, bind_ipv4.addr_.readable() == DefaultBindAddressIpv4 }; case TR_AF_INET6: - return { bind_ipv6.addr_, bind_ipv6.addr_.readable() == TR_DEFAULT_BIND_ADDRESS_IPV6 }; + return { bind_ipv6.addr_, bind_ipv6.addr_.readable() == DefaultBindAddressIpv6 }; default: TR_ASSERT_MSG(false, "invalid type"); @@ -343,7 +346,7 @@ void tr_sessionGetDefaultSettings(tr_variant* setme_dictionary) tr_variantDictAddStrView(d, TR_KEY_rpc_username, ""); tr_variantDictAddStrView(d, TR_KEY_rpc_whitelist, TR_DEFAULT_RPC_WHITELIST); tr_variantDictAddBool(d, TR_KEY_rpc_whitelist_enabled, true); - tr_variantDictAddStrView(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST); + tr_variantDictAddStrView(d, TR_KEY_rpc_host_whitelist, DefaultRpcHostWhitelist); tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true); tr_variantDictAddInt(d, TR_KEY_rpc_port, TR_DEFAULT_RPC_PORT); tr_variantDictAddStrView(d, TR_KEY_rpc_url, TR_DEFAULT_RPC_URL_STR); @@ -368,8 +371,8 @@ void tr_sessionGetDefaultSettings(tr_variant* setme_dictionary) tr_variantDictAddBool(d, TR_KEY_speed_limit_up_enabled, false); tr_variantDictAddStr(d, TR_KEY_umask, fmt::format("{:03o}", DefaultUmask)); tr_variantDictAddInt(d, TR_KEY_upload_slots_per_torrent, 8); - tr_variantDictAddStrView(d, TR_KEY_bind_address_ipv4, TR_DEFAULT_BIND_ADDRESS_IPV4); - tr_variantDictAddStrView(d, TR_KEY_bind_address_ipv6, TR_DEFAULT_BIND_ADDRESS_IPV6); + tr_variantDictAddStrView(d, TR_KEY_bind_address_ipv4, DefaultBindAddressIpv4); + tr_variantDictAddStrView(d, TR_KEY_bind_address_ipv6, DefaultBindAddressIpv6); tr_variantDictAddBool(d, TR_KEY_start_added_torrents, true); tr_variantDictAddBool(d, TR_KEY_trash_original_torrent_files, false); tr_variantDictAddInt(d, TR_KEY_anti_brute_force_threshold, 100); @@ -426,7 +429,7 @@ void tr_sessionGetSettings(tr_session const* s, tr_variant* setme_dictionary) tr_variantDictAddStr(d, TR_KEY_rpc_password, tr_sessionGetRPCPassword(s)); tr_variantDictAddInt(d, TR_KEY_rpc_port, tr_sessionGetRPCPort(s)); tr_variantDictAddStr(d, TR_KEY_rpc_socket_mode, fmt::format("{:#o}", s->rpc_server_->socket_mode_)); - tr_variantDictAddStr(d, TR_KEY_rpc_url, tr_sessionGetRPCUrl(s)); + tr_variantDictAddStr(d, TR_KEY_rpc_url, s->rpc_server_->url()); tr_variantDictAddStr(d, TR_KEY_rpc_username, tr_sessionGetRPCUsername(s)); tr_variantDictAddStr(d, TR_KEY_rpc_whitelist, tr_sessionGetRPCWhitelist(s)); tr_variantDictAddBool(d, TR_KEY_rpc_whitelist_enabled, tr_sessionGetRPCWhitelistEnabled(s)); @@ -2405,20 +2408,6 @@ uint16_t tr_sessionGetRPCPort(tr_session const* session) return session->rpc_server_ ? session->rpc_server_->port().host() : uint16_t{}; } -void tr_sessionSetRPCUrl(tr_session* session, char const* url) -{ - TR_ASSERT(session != nullptr); - - session->rpc_server_->setUrl(url != nullptr ? url : ""); -} - -char const* tr_sessionGetRPCUrl(tr_session const* session) -{ - TR_ASSERT(session != nullptr); - - return session->rpc_server_->url().c_str(); -} - void tr_sessionSetRPCCallback(tr_session* session, tr_rpc_func func, void* user_data) { TR_ASSERT(session != nullptr); diff --git a/libtransmission/session.h b/libtransmission/session.h index d62749d93..a4aca19be 100644 --- a/libtransmission/session.h +++ b/libtransmission/session.h @@ -710,7 +710,6 @@ private: friend bool tr_sessionIsRPCEnabled(tr_session const* session); friend bool tr_sessionIsRPCPasswordEnabled(tr_session const* session); friend char const* tr_sessionGetRPCPassword(tr_session const* session); - friend char const* tr_sessionGetRPCUrl(tr_session const* session); friend char const* tr_sessionGetRPCUsername(tr_session const* session); friend char const* tr_sessionGetRPCWhitelist(tr_session const* session); friend int tr_sessionGetAntiBruteForceThreshold(tr_session const* session); @@ -747,7 +746,6 @@ private: friend void tr_sessionSetRPCPassword(tr_session* session, char const* password); friend void tr_sessionSetRPCPasswordEnabled(tr_session* session, bool enabled); friend void tr_sessionSetRPCPort(tr_session* session, uint16_t hport); - friend void tr_sessionSetRPCUrl(tr_session* session, char const* url); friend void tr_sessionSetRPCUsername(tr_session* session, char const* username); friend void tr_sessionSetRatioLimit(tr_session* session, double desired_ratio); friend void tr_sessionSetRatioLimited(tr_session* session, bool is_limited); diff --git a/libtransmission/tr-macros.h b/libtransmission/tr-macros.h index 31a43b27f..9c473878b 100644 --- a/libtransmission/tr-macros.h +++ b/libtransmission/tr-macros.h @@ -59,7 +59,6 @@ ***/ #define TR_PATH_DELIMITER '/' -#define TR_PATH_DELIMITER_STR "/" /* Only use this macro to suppress false-positive alignment warnings */ #define TR_DISCARD_ALIGN(ptr, type) ((type)(void*)(ptr)) diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h index 71ded48c9..0be6778b2 100644 --- a/libtransmission/transmission.h +++ b/libtransmission/transmission.h @@ -129,10 +129,7 @@ size_t tr_getDefaultConfigDirToBuf(char const* appname, char* buf, size_t buflen /** @brief buffer variant of tr_getDefaultDownloadDir(). See tr_strvToBuf(). */ size_t tr_getDefaultDownloadDirToBuf(char* buf, size_t buflen); -#define TR_DEFAULT_BIND_ADDRESS_IPV4 "0.0.0.0" -#define TR_DEFAULT_BIND_ADDRESS_IPV6 "::" #define TR_DEFAULT_RPC_WHITELIST "127.0.0.1,::1" -#define TR_DEFAULT_RPC_HOST_WHITELIST "" #define TR_DEFAULT_RPC_PORT_STR "9091" #define TR_DEFAULT_RPC_PORT 9091 #define TR_DEFAULT_RPC_URL_STR "/transmission/" @@ -347,23 +344,6 @@ void tr_sessionSetRPCPort(tr_session* session, uint16_t port); @see tr_sessionSetRPCPort */ uint16_t tr_sessionGetRPCPort(tr_session const* session); -/** - * @brief Specify which base URL to use. - * - * @param session the session to set - * @param url the base url to use. The RPC API is accessible under /rpc, the web interface under * /web. - * - * @see tr_sessionGetRPCUrl - */ -void tr_sessionSetRPCUrl(tr_session* session, char const* url); - -/** - * @brief Get the base URL. - * @see tr_sessionInit() - * @see tr_sessionSetRPCUrl - */ -char const* tr_sessionGetRPCUrl(tr_session const* session); - /** * @brief Specify a whitelist for remote RPC access * diff --git a/tests/libtransmission/session-test.cc b/tests/libtransmission/session-test.cc index 3cdac9a80..e93000bb6 100644 --- a/tests/libtransmission/session-test.cc +++ b/tests/libtransmission/session-test.cc @@ -132,17 +132,6 @@ TEST_F(SessionTest, propertiesApi) EXPECT_EQ(""sv, session->blocklistUrl()); EXPECT_EQ(""sv, tr_blocklistGetURL(session)); - // rpc url - - for (auto const& value : { "http://www.example.com/"sv, "http://www.example.org/transmission"sv, ""sv }) - { - tr_sessionSetRPCUrl(session, std::string{ value }.c_str()); - EXPECT_EQ(value, tr_sessionGetRPCUrl(session)); - } - - tr_sessionSetRPCUrl(session, nullptr); - EXPECT_EQ(""sv, tr_sessionGetRPCUrl(session)); - // rpc username for (auto const& value : { "foo"sv, "bar"sv, ""sv })