diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-06-10 00:59:19 -0700 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-06-10 00:59:19 -0700 |
commit | 63f029ef9bf022844c70c7c6f9e12fbc5726b0b3 (patch) | |
tree | 51c598a0112b4065d7b2fbfccf31411527897949 /Kernel/Net | |
parent | 487909dd7b87293969c4a186a054aa4387aea838 (diff) | |
download | serenity-63f029ef9bf022844c70c7c6f9e12fbc5726b0b3.zip |
Kernel: Use NetworkOrdered<T> in ARPPacket.
Diffstat (limited to 'Kernel/Net')
-rw-r--r-- | Kernel/Net/ARP.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Kernel/Net/ARP.h b/Kernel/Net/ARP.h index 5c544e3fc6..6f3a3cb0ab 100644 --- a/Kernel/Net/ARP.h +++ b/Kernel/Net/ARP.h @@ -1,5 +1,6 @@ #pragma once +#include <AK/NetworkOrdered.h> #include <Kernel/Net/EtherType.h> #include <Kernel/Net/IPv4.h> #include <Kernel/Net/MACAddress.h> @@ -20,11 +21,11 @@ struct ARPHardwareType { class [[gnu::packed]] ARPPacket { public: - word hardware_type() const { return ntohs(m_hardware_type); } - void set_hardware_type(word w) { m_hardware_type = htons(w); } + word hardware_type() const { return m_hardware_type; } + void set_hardware_type(word w) { m_hardware_type = w; } - word protocol_type() const { return ntohs(m_protocol_type); } - void set_protocol_type(word w) { m_protocol_type = htons(w); } + word protocol_type() const { return m_protocol_type; } + void set_protocol_type(word w) { m_protocol_type = w; } byte hardware_address_length() const { return m_hardware_address_length; } 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; } void set_protocol_address_length(byte b) { m_protocol_address_length = b; } - word operation() const { return ntohs(m_operation); } - void set_operation(word w) { m_operation = htons(w); } + word operation() const { return m_operation; } + void set_operation(word w) { m_operation = w; } const MACAddress& sender_hardware_address() const { return m_sender_hardware_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; } private: - word m_hardware_type { 0x0100 }; - word m_protocol_type { 0x0008 }; + NetworkOrdered<word> m_hardware_type { ARPHardwareType::Ethernet }; + NetworkOrdered<word> m_protocol_type { EtherType::IPv4 }; byte m_hardware_address_length { sizeof(MACAddress) }; byte m_protocol_address_length { sizeof(IPv4Address) }; - word m_operation { 0 }; + NetworkOrdered<word> m_operation; MACAddress m_sender_hardware_address; IPv4Address m_sender_protocol_address; MACAddress m_target_hardware_address; |