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

DHCPClient: Simplify DHCPv4PacketBuilder

Browse source 
Instead of creating a temporary ByteBuffer to hold the packet while
building it, we can just create the DHCPv4Packet struct directly.
This commit is contained in:
Andreas Kling 2021-10-25 14:30:01 +02:00
parent d203a86900
commit 765ed9677b
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Userland/Services/DHCPClient/DHCPv4.h
View file

@ -7,7 +7,6 @@
#pragma once #pragma once
#include <AK/Assertions.h> #include <AK/Assertions.h>
#include <AK/ByteBuffer.h>
#include <AK/Endian.h> #include <AK/Endian.h>
#include <AK/HashMap.h> #include <AK/HashMap.h>
#include <AK/IPv4Address.h> #include <AK/IPv4Address.h>
@ -239,9 +238,8 @@ private:
class DHCPv4PacketBuilder { class DHCPv4PacketBuilder {
public: public:
DHCPv4PacketBuilder() DHCPv4PacketBuilder()
: m_buffer(ByteBuffer::create_zeroed(sizeof(DHCPv4Packet)).release_value()) // FIXME: Handle possible OOM failure.
{ {
auto* options = peek().options(); auto* options = m_packet.options();
// set the magic DHCP cookie value // set the magic DHCP cookie value
options[0] = 99; options[0] = 99;
options[1] = 130; options[1] = 130;
@ -255,7 +253,7 @@ public:
// we need enough space to fit the option value, its length, and its data // we need enough space to fit the option value, its length, and its data
VERIFY(next_option_offset + length + 2 < DHCPV4_OPTION_FIELD_MAX_LENGTH); VERIFY(next_option_offset + length + 2 < DHCPV4_OPTION_FIELD_MAX_LENGTH);
auto* options = peek().options(); auto* options = m_packet.options();
options[next_option_offset++] = (u8)option; options[next_option_offset++] = (u8)option;
memcpy(options + next_option_offset, &length, 1); memcpy(options + next_option_offset, &length, 1);
next_option_offset++; next_option_offset++;
@ -266,17 +264,16 @@ public:
void set_message_type(DHCPMessageType type) { add_option(DHCPOption::DHCPMessageType, 1, &type); } void set_message_type(DHCPMessageType type) { add_option(DHCPOption::DHCPMessageType, 1, &type); }
DHCPv4Packet& peek() { return *(DHCPv4Packet*)m_buffer.data(); } DHCPv4Packet& peek() { return m_packet; }
DHCPv4Packet& build() DHCPv4Packet& build()
{ {
add_option(DHCPOption::End, 0, nullptr); add_option(DHCPOption::End, 0, nullptr);
m_can_add = false; m_can_add = false;
return *(DHCPv4Packet*)m_buffer.data(); return m_packet;
} }
size_t size() const { return m_buffer.size(); }
private: private:
ByteBuffer m_buffer; DHCPv4Packet m_packet;
size_t next_option_offset { 4 }; size_t next_option_offset { 4 };
bool m_can_add { true }; bool m_can_add { true };
}; };