Merge pull request #1145 from kiwix/ci_fix

Fix broken CI on Linux (aarch64, focal)
kiwix · Oct 3, 2024 · 4a1498d · 4a1498d
2 parents 8bbda99 + f6df234
commit 4a1498d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
@@ -89,7 +89,8 @@ bool ipAvailable(const std::string addr)
 {
   auto interfaces = kiwix::getNetworkInterfacesIPv4Or6();
 
-  for (const auto& [_, interfaceIps] : interfaces) {
+  for (const auto& kv : interfaces) {
+    const auto& interfaceIps = kv.second;
     if ((interfaceIps.addr == addr) || (interfaceIps.addr6 == addr)) {
       return true;
     }
@@ -495,14 +496,14 @@ bool InternalServer::start() {
     if (!validV4 && !validV6) {
       std::cerr << "ERROR: invalid IP address: " << addr << std::endl;
       return false;
-    } 
+    }
 
     if (!ipAvailable(addr)) {
       std::cerr << "ERROR: IP address is not available on this system: " << addr << std::endl;
       return false;
     }
 
-    m_ipMode = !m_addr.addr.empty() ? IpMode::IPV4 : IpMode::IPV6; 
+    m_ipMode = !m_addr.addr.empty() ? IpMode::IPV4 : IpMode::IPV6;
   }
 
   if (m_ipMode == IpMode::ALL) {

diff --git a/src/tools/networkTools.cpp b/src/tools/networkTools.cpp
@@ -63,7 +63,7 @@ size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdat
   return nmemb;
 }
 
-void updatePublicIpAddress(IpAddress& publicIpAddr, const IpAddress& interfaceIpAddr) 
+void updatePublicIpAddress(IpAddress& publicIpAddr, const IpAddress& interfaceIpAddr)
 {
   if (publicIpAddr.addr.empty())  publicIpAddr.addr  = interfaceIpAddr.addr;
   if (publicIpAddr.addr6.empty()) publicIpAddr.addr6 = interfaceIpAddr.addr6;
@@ -231,7 +231,8 @@ IpAddress getBestPublicIps() {
 #endif
   const char* const v4prefixes[] = { "192.168", "172.16", "10.0", "169.254" };
   for (const auto& prefix : v4prefixes) {
-    for (const auto& [_, interfaceIps] : interfaces) {
+    for (const auto& kv : interfaces) {
+      const auto& interfaceIps = kv.second;
       if (kiwix::startsWith(interfaceIps.addr, prefix)) {
         updatePublicIpAddress(bestPublicIps, interfaceIps);
       }