RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 01:17:35 +00:00
Code Issues Activity Actions

LookupServer: Rename DNSPacket -> DNSPacketHeader

Browse source 
This is a more appropriate name for what the class represents, and we'll be
reusing the name DNSPacket for something different soon.
This commit is contained in:
Sergey Bugaev 2021-02-06 17:41:58 +03:00 • committed by Andreas Kling
parent d8967e4dff
commit e3135e7ca5
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Services/LookupServer/DNSPacket.h → Userland/Services/LookupServer/DNSPacketHeader.h
View file

@ -31,9 +31,9 @@
namespace LookupServer { namespace LookupServer {
class [[gnu::packed]] DNSPacket { class [[gnu::packed]] DNSPacketHeader {
public: public:
DNSPacket() DNSPacketHeader()
: m_recursion_desired(false) : m_recursion_desired(false)
, m_truncated(false) , m_truncated(false)
, m_authoritative_answer(false) , m_authoritative_answer(false)
@ -114,6 +114,6 @@ private:
NetworkOrdered<u16> m_additional_count; NetworkOrdered<u16> m_additional_count;
}; };
static_assert(sizeof(DNSPacket) == 12); static_assert(sizeof(DNSPacketHeader) == 12);
} }

4
Userland/Services/LookupServer/DNSRequest.cpp
View file

@ -25,7 +25,7 @@
*/ */
#include "DNSRequest.h" #include "DNSRequest.h"
#include "DNSPacket.h" #include "DNSPacketHeader.h"
#include <AK/MemoryStream.h> #include <AK/MemoryStream.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <arpa/inet.h> #include <arpa/inet.h>
@ -71,7 +71,7 @@ void DNSRequest::add_question(const String& name, u16 record_type, ShouldRandomi
ByteBuffer DNSRequest::to_byte_buffer() const ByteBuffer DNSRequest::to_byte_buffer() const
{ {
DNSPacket request_header; DNSPacketHeader request_header;
request_header.set_id(m_id); request_header.set_id(m_id);
request_header.set_is_query(); request_header.set_is_query();
request_header.set_opcode(0); request_header.set_opcode(0);

10
Userland/Services/LookupServer/DNSResponse.cpp
View file

@ -25,7 +25,7 @@
*/ */
#include "DNSResponse.h" #include "DNSResponse.h"
#include "DNSPacket.h" #include "DNSPacketHeader.h"
#include "DNSRequest.h" #include "DNSRequest.h"
#include <AK/Debug.h> #include <AK/Debug.h>
#include <AK/IPv4Address.h> #include <AK/IPv4Address.h>
@ -58,12 +58,12 @@ static_assert(sizeof(DNSRecordWithoutName) == 10);
Optional<DNSResponse> DNSResponse::from_raw_response(const u8* raw_data, size_t raw_size) Optional<DNSResponse> DNSResponse::from_raw_response(const u8* raw_data, size_t raw_size)
{ {
if (raw_size < sizeof(DNSPacket)) { if (raw_size < sizeof(DNSPacketHeader)) {
dbgln("DNS response not large enough ({} out of {}) to be a DNS packet.", raw_size, sizeof(DNSPacket)); dbgln("DNS response not large enough ({} out of {}) to be a DNS packet.", raw_size, sizeof(DNSPacketHeader));
return {}; return {};
} }
auto& response_header = *(const DNSPacket*)(raw_data); auto& response_header = *(const DNSPacketHeader*)(raw_data);
#if LOOKUPSERVER_DEBUG #if LOOKUPSERVER_DEBUG
dbgln("Got response (ID: {})", response_header.id()); dbgln("Got response (ID: {})", response_header.id());
dbgln(" Question count: {}", response_header.question_count()); dbgln(" Question count: {}", response_header.question_count());
@ -79,7 +79,7 @@ Optional<DNSResponse> DNSResponse::from_raw_response(const u8* raw_data, size_t
if (response.code() != DNSResponse::Code::NOERROR) if (response.code() != DNSResponse::Code::NOERROR)
return response; return response;
size_t offset = sizeof(DNSPacket); size_t offset = sizeof(DNSPacketHeader);
for (u16 i = 0; i < response_header.question_count(); ++i) { for (u16 i = 0; i < response_header.question_count(); ++i) {
auto name = parse_dns_name(raw_data, offset, raw_size); auto name = parse_dns_name(raw_data, offset, raw_size);