mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 10:57:35 +00:00
LookupServer: Convert to Core::Stream::UDPSocket
This commit is contained in:
parent
17d3592cab
commit
4ca0669d1e
5 changed files with 43 additions and 45 deletions
|
@ -15,7 +15,7 @@
|
|||
#include <LibCore/ConfigFile.h>
|
||||
#include <LibCore/File.h>
|
||||
#include <LibCore/LocalServer.h>
|
||||
#include <LibCore/UDPSocket.h>
|
||||
#include <LibCore/Stream.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
@ -131,7 +131,7 @@ static String get_hostname()
|
|||
return buffer;
|
||||
}
|
||||
|
||||
Vector<DNSAnswer> LookupServer::lookup(const DNSName& name, DNSRecordType record_type)
|
||||
ErrorOr<Vector<DNSAnswer>> LookupServer::lookup(const DNSName& name, DNSRecordType record_type)
|
||||
{
|
||||
dbgln_if(LOOKUPSERVER_DEBUG, "Got request for '{}'", name.as_string());
|
||||
|
||||
|
@ -196,7 +196,7 @@ Vector<DNSAnswer> LookupServer::lookup(const DNSName& name, DNSRecordType record
|
|||
int retries = 3;
|
||||
Vector<DNSAnswer> upstream_answers;
|
||||
do {
|
||||
upstream_answers = lookup(name, nameserver, did_get_response, record_type);
|
||||
upstream_answers = TRY(lookup(name, nameserver, did_get_response, record_type));
|
||||
if (did_get_response)
|
||||
break;
|
||||
} while (--retries);
|
||||
|
@ -215,13 +215,13 @@ Vector<DNSAnswer> LookupServer::lookup(const DNSName& name, DNSRecordType record
|
|||
// Sixth, fail.
|
||||
if (answers.is_empty()) {
|
||||
dbgln("Tried all nameservers but never got a response :(");
|
||||
return {};
|
||||
return Vector<DNSAnswer> {};
|
||||
}
|
||||
|
||||
return answers;
|
||||
}
|
||||
|
||||
Vector<DNSAnswer> LookupServer::lookup(const DNSName& name, const String& nameserver, bool& did_get_response, DNSRecordType record_type, ShouldRandomizeCase should_randomize_case)
|
||||
ErrorOr<Vector<DNSAnswer>> LookupServer::lookup(const DNSName& name, const String& nameserver, bool& did_get_response, DNSRecordType record_type, ShouldRandomizeCase should_randomize_case)
|
||||
{
|
||||
DNSPacket request;
|
||||
request.set_is_query();
|
||||
|
@ -233,41 +233,27 @@ Vector<DNSAnswer> LookupServer::lookup(const DNSName& name, const String& namese
|
|||
|
||||
auto buffer = request.to_byte_buffer();
|
||||
|
||||
auto udp_socket = Core::UDPSocket::construct();
|
||||
udp_socket->set_blocking(true);
|
||||
auto udp_socket = TRY(Core::Stream::UDPSocket::connect(nameserver, 53, Time::from_seconds(1)));
|
||||
TRY(udp_socket->set_blocking(true));
|
||||
|
||||
struct timeval timeout {
|
||||
1, 0
|
||||
};
|
||||
|
||||
int rc = setsockopt(udp_socket->fd(), SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout));
|
||||
if (rc < 0) {
|
||||
perror("setsockopt(SOL_SOCKET, SO_RCVTIMEO)");
|
||||
return {};
|
||||
}
|
||||
|
||||
if (!udp_socket->connect(nameserver, 53))
|
||||
return {};
|
||||
|
||||
if (!udp_socket->write(buffer))
|
||||
return {};
|
||||
TRY(udp_socket->write(buffer));
|
||||
|
||||
u8 response_buffer[4096];
|
||||
int nrecv = udp_socket->read(response_buffer, sizeof(response_buffer));
|
||||
if (nrecv == 0)
|
||||
return {};
|
||||
int nrecv = TRY(udp_socket->read({ response_buffer, sizeof(response_buffer) }));
|
||||
if (udp_socket->is_eof())
|
||||
return Vector<DNSAnswer> {};
|
||||
|
||||
did_get_response = true;
|
||||
|
||||
auto o_response = DNSPacket::from_raw_packet(response_buffer, nrecv);
|
||||
if (!o_response.has_value())
|
||||
return {};
|
||||
return Vector<DNSAnswer> {};
|
||||
|
||||
auto& response = o_response.value();
|
||||
|
||||
if (response.id() != request.id()) {
|
||||
dbgln("LookupServer: ID mismatch ({} vs {}) :(", response.id(), request.id());
|
||||
return {};
|
||||
return Vector<DNSAnswer> {};
|
||||
}
|
||||
|
||||
if (response.code() == DNSPacket::Code::REFUSED) {
|
||||
|
@ -275,12 +261,12 @@ Vector<DNSAnswer> LookupServer::lookup(const DNSName& name, const String& namese
|
|||
// Retry with 0x20 case randomization turned off.
|
||||
return lookup(name, nameserver, did_get_response, record_type, ShouldRandomizeCase::No);
|
||||
}
|
||||
return {};
|
||||
return Vector<DNSAnswer> {};
|
||||
}
|
||||
|
||||
if (response.question_count() != request.question_count()) {
|
||||
dbgln("LookupServer: Question count ({} vs {}) :(", response.question_count(), request.question_count());
|
||||
return {};
|
||||
return Vector<DNSAnswer> {};
|
||||
}
|
||||
|
||||
// Verify the questions in our request and in their response match exactly, including case.
|
||||
|
@ -294,13 +280,13 @@ Vector<DNSAnswer> LookupServer::lookup(const DNSName& name, const String& namese
|
|||
dbgln("Request and response questions do not match");
|
||||
dbgln(" Request: name=_{}_, type={}, class={}", request_question.name().as_string(), response_question.record_type(), response_question.class_code());
|
||||
dbgln(" Response: name=_{}_, type={}, class={}", response_question.name().as_string(), response_question.record_type(), response_question.class_code());
|
||||
return {};
|
||||
return Vector<DNSAnswer> {};
|
||||
}
|
||||
}
|
||||
|
||||
if (response.answer_count() < 1) {
|
||||
dbgln("LookupServer: No answers :(");
|
||||
return {};
|
||||
return Vector<DNSAnswer> {};
|
||||
}
|
||||
|
||||
Vector<DNSAnswer, 8> answers;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue