Add functions which return displayable addresses

Author: vighnesh-sawant

include/server.h

@@ -69,6 +69,8 @@ namespace kiwix
        int getPort() const;
        IpAddress getAddress() const;
        IpMode getIpMode() const;
+       std::string getDisplayableAddress();
+       std::string getDisplayableAddress6();
 
      protected:
        std::shared_ptr<Library> mp_library;

src/server.cpp

@@ -106,4 +106,27 @@ IpMode Server::getIpMode() const
   return mp_server->getIpMode();
 }
 
+std::string Server::getDisplayableAddress()
+{
+  kiwix::IpAddress addresses = Server::getAddress();
+  if(addresses.addr.empty()) return getDisplayableAddress6(); //as a fallback return ipv6 address as one of them has to be set
+  
+  std::string result = "http://";
+  std::string suffix = mp_server->getSuffixOfRootUrlWithPort();
+
+  result = result + addresses.addr + suffix;
+  return result;
+}
+
+std::string Server::getDisplayableAddress6()
+{
+  kiwix::IpAddress addresses = Server::getAddress();
+  if(addresses.addr6.empty()) return getDisplayableAddress(); //as a fallback return ipv4 address as one of them has to be set
+  
+  std::string result = "http://";
+  std::string suffix = mp_server->getSuffixOfRootUrlWithPort();
+
+  result = result + "[" + addresses.addr6 + "]" + suffix;
+  return result;
 }
+}

src/server/internalServer.cpp

@@ -79,6 +79,7 @@ extern "C" {
 #include "response.h"
 
 #define DEFAULT_CACHE_SIZE 2
+#define HTTP_DEFAULT_PORT 80
 
 namespace kiwix {
 
@@ -272,6 +273,19 @@ struct NoDelete
 
 } // unnamed namespace
 
+std::string InternalServer::getSuffixOfRootUrlWithPort()
+{
+  std::string suffix;
+   if (m_port == HTTP_DEFAULT_PORT)
+  {
+    suffix = m_rootPrefixOfDecodedURL;
+  } else
+  {
+    suffix = ":" + std::to_string(m_port) + m_rootPrefixOfDecodedURL;
+  }
+  return suffix;
+}
+
 std::pair<std::string, Library::BookIdSet> InternalServer::selectBooks(const RequestContext& request) const
 {
   // Try old API

src/server/internalServer.h

@@ -124,6 +124,7 @@ class InternalServer {
     IpAddress getAddress() const { return m_addr; }
     int getPort() const { return m_port; }
     IpMode getIpMode() const { return m_ipMode; }
+    std::string getSuffixOfRootUrlWithPort();
 
   private: // functions
     std::unique_ptr<Response> handle_request(const RequestContext& request);