From 90a5907b444f8fe8387d4f44a98e20e1dd297ff7 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 26 Jan 2020 14:54:08 +0100 Subject: [PATCH] LookupServer: Rename "custom_hosts" => "etc_hosts" This makes it more obvious that these mappings come from /etc/hosts. --- Servers/LookupServer/LookupServer.cpp | 7 +++---- Servers/LookupServer/LookupServer.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Servers/LookupServer/LookupServer.cpp b/Servers/LookupServer/LookupServer.cpp index a4c137b155..2fba96b888 100644 --- a/Servers/LookupServer/LookupServer.cpp +++ b/Servers/LookupServer/LookupServer.cpp @@ -62,7 +62,6 @@ LookupServer::LookupServer() void LookupServer::load_etc_hosts() { - dbg() << "Loading hosts from /etc/hosts"; auto file = CFile::construct("/etc/hosts"); if (!file->open(CIODevice::ReadOnly)) return; @@ -82,7 +81,7 @@ void LookupServer::load_etc_hosts() }; auto name = fields[1]; - m_dns_custom_hostnames.set(name, addr.to_string()); + m_etc_hosts.set(name, addr.to_string()); IPv4Address reverse_addr { (u8)atoi(sections[3].characters()), @@ -93,7 +92,7 @@ void LookupServer::load_etc_hosts() StringBuilder builder; builder.append(reverse_addr.to_string()); builder.append(".in-addr.arpa"); - m_dns_custom_hostnames.set(builder.to_string(), name); + m_etc_hosts.set(builder.to_string(), name); } } @@ -118,7 +117,7 @@ void LookupServer::service_client(RefPtr socket) Vector responses; - if (auto known_host = m_dns_custom_hostnames.get(hostname)) { + if (auto known_host = m_etc_hosts.get(hostname)) { responses.append(known_host.value()); } else if (!hostname.is_empty()) { bool did_timeout; diff --git a/Servers/LookupServer/LookupServer.h b/Servers/LookupServer/LookupServer.h index 7c11ab26f7..d7048931d6 100644 --- a/Servers/LookupServer/LookupServer.h +++ b/Servers/LookupServer/LookupServer.h @@ -52,6 +52,6 @@ private: RefPtr m_local_server; String m_nameserver; - HashMap m_dns_custom_hostnames; + HashMap m_etc_hosts; HashMap m_lookup_cache; };