diff --git a/src/init.cpp b/src/init.cpp index 4ea73df..1302f83 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1223,10 +1223,10 @@ bool AppInit2() fUseUPnP = false; #endif } else { - std::string torError = CTorEmbedded::GetInstance()->GetLastError(); + std::string torError = CTorEmbedded::GetInstance()->GetStartupError(); if (torError.empty()) torError = "No detailed Tor startup error was recorded."; - return InitError(strprintf(_("Tor failed to start. Triangles requires Tor to operate.\n\nDetails: %s"), torError)); + return InitError(strprintf(_("Tor failed to start. Triangles requires Tor to operate.\n\nDetails: %s"), torError.c_str())); } // Initialize Tor V3 identity (Ed25519 keys, onion address) diff --git a/src/tor/tor_embedded.cpp b/src/tor/tor_embedded.cpp index fe7b18e..a39ae80 100644 --- a/src/tor/tor_embedded.cpp +++ b/src/tor/tor_embedded.cpp @@ -248,7 +248,7 @@ bool CTorEmbedded::Start(int socks, int hsPort, bool enableHiddenService) torDataDir = (::GetDataDir() / "tor_data").string(); running.store(StartTorProcess(torDataDir, socksPort, hiddenServicePort, hiddenServiceEnabled)); if (!running.load()) { - lastError = CTorProcess::GetInstance()->GetLastError(); + lastError = CTorProcess::GetInstance()->GetStartupError(); } return running.load(); } diff --git a/src/tor/tor_embedded.h b/src/tor/tor_embedded.h index abe26a5..91f1590 100644 --- a/src/tor/tor_embedded.h +++ b/src/tor/tor_embedded.h @@ -44,8 +44,8 @@ public: // Get our .onion address (available after bootstrap) std::string GetOnionAddress() const { return onionHostname; } - std::string GetLastError() const { return lastError; } - void SetLastError(const std::string& value) { lastError = value; } + std::string GetStartupError() const { return lastError; } + void SetStartupError(const std::string& value) { lastError = value; } // Get the hidden service port int GetHiddenServicePort() const { return hiddenServicePort; } diff --git a/src/tor/tor_process.cpp b/src/tor/tor_process.cpp index 2b97e07..8d12294 100644 --- a/src/tor/tor_process.cpp +++ b/src/tor/tor_process.cpp @@ -314,7 +314,7 @@ bool CTorProcess::Start(const std::string& dataDir, int socks, int hsPort, bool NULL, NULL, &si, &pi)) { - DWORD err = GetLastError(); + DWORD err = ::GetLastError(); lastError = strprintf("CreateProcess failed for Tor binary '%s' with Windows error %lu", torBinaryPath.c_str(), err); printf("ERROR: Failed to start Tor process (error %lu)\n", err); return false; diff --git a/src/tor/tor_process.h b/src/tor/tor_process.h index 2784e09..0d93902 100644 --- a/src/tor/tor_process.h +++ b/src/tor/tor_process.h @@ -60,7 +60,7 @@ public: // Get the Tor binary path (for diagnostics) std::string GetBinaryPath() const { return torBinaryPath; } - std::string GetLastError() const { return lastError; } + std::string GetStartupError() const { return lastError; } // Singleton access static CTorProcess* GetInstance();