Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolver: Fix UB and resolve localhost

Browse Source
This commit is contained in:
Bananymous
2026-05-25 03:19:20 +03:00
parent 585e021c7f
commit c79e412215
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
userspace/programs/resolver/main.cpp
View File

@@ -66,7 +66,7 @@ struct DNSEntry
DNSEntry(DNSEntry&& other) DNSEntry(DNSEntry&& other)
{ {
*this = BAN::move(other); initialize_no_clear(BAN::move(other));
} }
~DNSEntry() { clear(); } ~DNSEntry() { clear(); }
@@ -74,6 +74,12 @@ struct DNSEntry
DNSEntry& operator=(DNSEntry&& other) DNSEntry& operator=(DNSEntry&& other)
{ {
clear(); clear();
initialize_no_clear(BAN::move(other));
return *this;
}
void initialize_no_clear(DNSEntry&& other)
{
valid_until = other.valid_until; valid_until = other.valid_until;
switch (type = other.type) switch (type = other.type)
{ {
@@ -88,7 +94,6 @@ struct DNSEntry
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
} }
other.clear(); other.clear();
return *this;
} }
void clear() void clear()
@@ -448,6 +453,7 @@ int main(int, char**)
if (send(client.socket, &addr, sizeof(addr), 0) == -1) if (send(client.socket, &addr, sizeof(addr), 0) == -1)
dprintln("send: {}", strerror(errno)); dprintln("send: {}", strerror(errno));
dwarnln("{} -> {}", client.query.data(), inet_ntoa({ .s_addr = resolved->raw }));
client.close = true; client.close = true;
break; break;
} }
@@ -460,14 +466,8 @@ int main(int, char**)
if (!client.query.empty()) if (!client.query.empty())
{ {
static uint8_t buffer[4096]; dprintln("unexpected data from client");
ssize_t nrecv = recv(client.socket, buffer, sizeof(buffer), 0); client.close = true;
if (nrecv < 0)
dprintln("{}", strerror(errno));
if (nrecv <= 0)
client.close = true;
else
dprintln("Client already has a query");
continue; continue;
} }
@@ -480,8 +480,11 @@ int main(int, char**)
BAN::Optional<BAN::IPv4Address> result; BAN::Optional<BAN::IPv4Address> result;
// TODO: add and parse /etc/hosts
if (*hostname && strcmp(query->data(), hostname) == 0) if (*hostname && strcmp(query->data(), hostname) == 0)
result = BAN::IPv4Address(ntohl(INADDR_LOOPBACK)); result = BAN::IPv4Address(ntohl(INADDR_LOOPBACK));
else if (strcmp(query->data(), "localhost") == 0)
result = BAN::IPv4Address(ntohl(INADDR_LOOPBACK));
else if (auto resolved = resolve_from_dns_cache(dns_cache, query.value()); resolved.has_value()) else if (auto resolved = resolve_from_dns_cache(dns_cache, query.value()); resolved.has_value())
result = resolved.release_value(); result = resolved.release_value();