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

Kernel: Use NetworkOrdered<T> in ARPPacket.

Browse source
This commit is contained in:
Andreas Kling 2019-06-10 00:59:19 -07:00
parent 487909dd7b
commit 63f029ef9b
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Kernel/Net/ARP.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <AK/NetworkOrdered.h>
#include <Kernel/Net/EtherType.h> #include <Kernel/Net/EtherType.h>
#include <Kernel/Net/IPv4.h> #include <Kernel/Net/IPv4.h>
#include <Kernel/Net/MACAddress.h> #include <Kernel/Net/MACAddress.h>
@ -20,11 +21,11 @@ struct ARPHardwareType {
class [[gnu::packed]] ARPPacket class [[gnu::packed]] ARPPacket
{ {
public: public:
word hardware_type() const { return ntohs(m_hardware_type); } word hardware_type() const { return m_hardware_type; }
void set_hardware_type(word w) { m_hardware_type = htons(w); } void set_hardware_type(word w) { m_hardware_type = w; }
word protocol_type() const { return ntohs(m_protocol_type); } word protocol_type() const { return m_protocol_type; }
void set_protocol_type(word w) { m_protocol_type = htons(w); } void set_protocol_type(word w) { m_protocol_type = w; }
byte hardware_address_length() const { return m_hardware_address_length; } byte hardware_address_length() const { return m_hardware_address_length; }
void set_hardware_address_length(byte b) { m_hardware_address_length = b; } void set_hardware_address_length(byte b) { m_hardware_address_length = b; }
@ -32,8 +33,8 @@ public:
byte protocol_address_length() const { return m_protocol_address_length; } byte protocol_address_length() const { return m_protocol_address_length; }
void set_protocol_address_length(byte b) { m_protocol_address_length = b; } void set_protocol_address_length(byte b) { m_protocol_address_length = b; }
word operation() const { return ntohs(m_operation); } word operation() const { return m_operation; }
void set_operation(word w) { m_operation = htons(w); } void set_operation(word w) { m_operation = w; }
const MACAddress& sender_hardware_address() const { return m_sender_hardware_address; } const MACAddress& sender_hardware_address() const { return m_sender_hardware_address; }
void set_sender_hardware_address(const MACAddress& address) { m_sender_hardware_address = address; } void set_sender_hardware_address(const MACAddress& address) { m_sender_hardware_address = address; }
@ -48,11 +49,11 @@ public:
void set_target_protocol_address(const IPv4Address& address) { m_target_protocol_address = address; } void set_target_protocol_address(const IPv4Address& address) { m_target_protocol_address = address; }
private: private:
word m_hardware_type { 0x0100 }; NetworkOrdered<word> m_hardware_type { ARPHardwareType::Ethernet };
word m_protocol_type { 0x0008 }; NetworkOrdered<word> m_protocol_type { EtherType::IPv4 };
byte m_hardware_address_length { sizeof(MACAddress) }; byte m_hardware_address_length { sizeof(MACAddress) };
byte m_protocol_address_length { sizeof(IPv4Address) }; byte m_protocol_address_length { sizeof(IPv4Address) };
word m_operation { 0 }; NetworkOrdered<word> m_operation;
MACAddress m_sender_hardware_address; MACAddress m_sender_hardware_address;
IPv4Address m_sender_protocol_address; IPv4Address m_sender_protocol_address;
MACAddress m_target_hardware_address; MACAddress m_target_hardware_address;