diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-07-03 21:17:35 +0200 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-07-03 21:20:13 +0200 |
commit | 27f699ef0c8c2dce0f1dff19eef25f02e3da397e (patch) | |
tree | 52f95be1d05ba2a621d3bb8ac9129341f8d9973b /Kernel/Net/TCP.h | |
parent | c4c4bbc5ba5119e9ccc8ded948b26e7c4851a909 (diff) | |
download | serenity-27f699ef0c8c2dce0f1dff19eef25f02e3da397e.zip |
AK: Rename the common integer typedefs to make it obvious what they are.
These types can be picked up by including <AK/Types.h>:
* u8, u16, u32, u64 (unsigned)
* i8, i16, i32, i64 (signed)
Diffstat (limited to 'Kernel/Net/TCP.h')
-rw-r--r-- | Kernel/Net/TCP.h | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/Kernel/Net/TCP.h b/Kernel/Net/TCP.h index 611c451105..b994b9d47f 100644 --- a/Kernel/Net/TCP.h +++ b/Kernel/Net/TCP.h @@ -3,7 +3,7 @@ #include <Kernel/Net/IPv4.h> struct TCPFlags { - enum : word { + enum : u16 { FIN = 0x01, SYN = 0x02, RST = 0x04, @@ -19,52 +19,52 @@ public: TCPPacket() {} ~TCPPacket() {} - size_t header_size() const { return data_offset() * sizeof(dword); } + size_t header_size() const { return data_offset() * sizeof(u32); } - word source_port() const { return m_source_port; } - void set_source_port(word port) { m_source_port = port; } + u16 source_port() const { return m_source_port; } + void set_source_port(u16 port) { m_source_port = port; } - word destination_port() const { return m_destination_port; } - void set_destination_port(word port) { m_destination_port = port; } + u16 destination_port() const { return m_destination_port; } + void set_destination_port(u16 port) { m_destination_port = port; } - dword sequence_number() const { return m_sequence_number; } - void set_sequence_number(dword number) { m_sequence_number = number; } + u32 sequence_number() const { return m_sequence_number; } + void set_sequence_number(u32 number) { m_sequence_number = number; } - dword ack_number() const { return m_ack_number; } - void set_ack_number(dword number) { m_ack_number = number; } + u32 ack_number() const { return m_ack_number; } + void set_ack_number(u32 number) { m_ack_number = number; } - word flags() const { return m_flags_and_data_offset & 0x1ff; } - void set_flags(word flags) { m_flags_and_data_offset = (m_flags_and_data_offset & ~0x1ff) | (flags & 0x1ff); } + u16 flags() const { return m_flags_and_data_offset & 0x1ff; } + void set_flags(u16 flags) { m_flags_and_data_offset = (m_flags_and_data_offset & ~0x1ff) | (flags & 0x1ff); } bool has_syn() const { return flags() & TCPFlags::SYN; } bool has_ack() const { return flags() & TCPFlags::ACK; } bool has_fin() const { return flags() & TCPFlags::FIN; } - byte data_offset() const { return (m_flags_and_data_offset & 0xf000) >> 12; } - void set_data_offset(word data_offset) { m_flags_and_data_offset = (m_flags_and_data_offset & ~0xf000) | data_offset << 12; } + u8 data_offset() const { return (m_flags_and_data_offset & 0xf000) >> 12; } + void set_data_offset(u16 data_offset) { m_flags_and_data_offset = (m_flags_and_data_offset & ~0xf000) | data_offset << 12; } - word window_size() const { return m_window_size; } - void set_window_size(word window_size) { m_window_size = window_size; } + u16 window_size() const { return m_window_size; } + void set_window_size(u16 window_size) { m_window_size = window_size; } - word checksum() const { return m_checksum; } - void set_checksum(word checksum) { m_checksum = checksum; } + u16 checksum() const { return m_checksum; } + void set_checksum(u16 checksum) { m_checksum = checksum; } - word urgent() const { return m_urgent; } - void set_urgent(word urgent) { m_urgent = urgent; } + u16 urgent() const { return m_urgent; } + void set_urgent(u16 urgent) { m_urgent = urgent; } - const void* payload() const { return ((const byte*)this) + header_size(); } - void* payload() { return ((byte*)this) + header_size(); } + const void* payload() const { return ((const u8*)this) + header_size(); } + void* payload() { return ((u8*)this) + header_size(); } private: - NetworkOrdered<word> m_source_port; - NetworkOrdered<word> m_destination_port; - NetworkOrdered<dword> m_sequence_number; - NetworkOrdered<dword> m_ack_number; - - NetworkOrdered<word> m_flags_and_data_offset; - NetworkOrdered<word> m_window_size; - NetworkOrdered<word> m_checksum; - NetworkOrdered<word> m_urgent; + NetworkOrdered<u16> m_source_port; + NetworkOrdered<u16> m_destination_port; + NetworkOrdered<u32> m_sequence_number; + NetworkOrdered<u32> m_ack_number; + + NetworkOrdered<u16> m_flags_and_data_offset; + NetworkOrdered<u16> m_window_size; + NetworkOrdered<u16> m_checksum; + NetworkOrdered<u16> m_urgent; }; static_assert(sizeof(TCPPacket) == 20); |