From ae21ba42da3a7667253f5214c4555d31e63148be Mon Sep 17 00:00:00 2001 From: Vighnesh Date: Sun, 26 Oct 2025 23:58:14 +0530 Subject: [PATCH] Display better message when using standard port --- src/server/kiwix-serve.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp index 5ae11a7..6da1711 100644 --- a/src/server/kiwix-serve.cpp +++ b/src/server/kiwix-serve.cpp @@ -104,16 +104,6 @@ std::string loadCustomTemplate (std::string customIndexPath) { return indexTemplateString; } -inline std::string normalizeRootUrl(std::string rootUrl) -{ - while ( !rootUrl.empty() && rootUrl.back() == '/' ) - rootUrl.pop_back(); - - while ( !rootUrl.empty() && rootUrl.front() == '/' ) - rootUrl = rootUrl.substr(1); - return rootUrl.empty() ? rootUrl : "/" + rootUrl; -} - #ifndef _WIN32 volatile sig_atomic_t waiting = false; volatile sig_atomic_t libraryMustBeReloaded = false; @@ -393,13 +383,11 @@ int main(int argc, char** argv) if (! server.start()) { exit(1); } - - std::string prefix = "http://"; - kiwix::IpAddress addresses = server.getAddress(); - std::string suffix = ":" + std::to_string(server.getPort()) + normalizeRootUrl(rootLocation); + std::cout << "The Kiwix server is running and can be accessed in the local network at: " << std::endl; - if(!addresses.addr.empty()) std::cout << " - " << prefix << addresses.addr << suffix << std::endl; - if(!addresses.addr6.empty()) std::cout << " - " << prefix << "[" << addresses.addr6 << "]" << suffix << std::endl; + for (const auto& url : server.getServerAccessUrls()) { + std::cout << " - " << url << std::endl; + } /* Run endless (until PPID dies) */ waiting = true;