diff --git a/include/common.h b/include/common.h index 995993bc..e97d025e 100644 --- a/include/common.h +++ b/include/common.h @@ -16,7 +16,7 @@ namespace kiwix { -enum class IpMode { ipv4, ipv6, all }; +enum class IpMode { IPV4, IPV6, ALL }; typedef zim::size_type size_type; typedef zim::offset_type offset_type; diff --git a/include/server.h b/include/server.h index d44c5207..250bace7 100644 --- a/include/server.h +++ b/include/server.h @@ -81,7 +81,7 @@ namespace kiwix bool m_withTaskbar = true; bool m_withLibraryButton = true; bool m_blockExternalLinks = false; - IpMode m_ipMode = IpMode::ipv4; + IpMode m_ipMode = IpMode::IPV4; int m_ipConnectionLimit = 0; std::unique_ptr mp_server; }; diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp index 476e1a18..95a26349 100644 --- a/src/server/internalServer.cpp +++ b/src/server/internalServer.cpp @@ -466,25 +466,25 @@ bool InternalServer::start() { sockAddr6.sin6_addr = in6addr_any; sockAddr4.sin_addr.s_addr = htonl(INADDR_ANY); } - m_addr = kiwix::getBestPublicIp(m_ipMode == IpMode::ipv6 || m_ipMode == IpMode::all); + m_addr = kiwix::getBestPublicIp(m_ipMode == IpMode::IPV6 || m_ipMode == IpMode::ALL); } else { bool ipv6 = inet_pton(AF_INET6, m_addr.c_str(), &(sockAddr6.sin6_addr.s6_addr)) == 1; bool ipv4 = inet_pton(AF_INET, m_addr.c_str(), &(sockAddr4.sin_addr.s_addr)) == 1; if (ipv6){ - m_ipMode = IpMode::all; + m_ipMode = IpMode::ALL; } else if (!ipv4) { std::cerr << "Ip address " << m_addr << " is not a valid ip address" << std::endl; return false; } } - if (m_ipMode == IpMode::all) { + if (m_ipMode == IpMode::ALL) { flags|=MHD_USE_DUAL_STACK; - } else if (m_ipMode == IpMode::ipv6) { + } else if (m_ipMode == IpMode::IPV6) { flags|=MHD_USE_IPv6; } - struct sockaddr* sockaddr = (m_ipMode==IpMode::all || m_ipMode==IpMode::ipv6) + struct sockaddr* sockaddr = (m_ipMode==IpMode::ALL || m_ipMode==IpMode::IPV6) ? (struct sockaddr*)&sockAddr6 : (struct sockaddr*)&sockAddr4;