From 13957a627c7128c5b24e76aa6d446ca3a1f469a5 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 10 Jul 2022 11:42:58 +0400 Subject: Common/Network: Remove unused constructors --- Source/Core/Common/Network.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'Source/Core/Common/Network.cpp') diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index d03b537e25..59d0c9026e 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -337,13 +337,6 @@ std::vector ARPPacket::Build() const TCPPacket::TCPPacket() = default; -TCPPacket::TCPPacket(const MACAddress& destination, const MACAddress& source) -{ - eth_header.destination = destination; - eth_header.source = source; - eth_header.ethertype = htons(IPV4_ETHERTYPE); -} - TCPPacket::TCPPacket(const MACAddress& destination, const MACAddress& source, const sockaddr_in& from, const sockaddr_in& to, u32 seq, u32 ack, u16 flags) { @@ -406,13 +399,6 @@ u16 TCPPacket::Size() const UDPPacket::UDPPacket() = default; -UDPPacket::UDPPacket(const MACAddress& destination, const MACAddress& source) -{ - eth_header.destination = destination; - eth_header.source = source; - eth_header.ethertype = htons(IPV4_ETHERTYPE); -} - UDPPacket::UDPPacket(const MACAddress& destination, const MACAddress& source, const sockaddr_in& from, const sockaddr_in& to, const std::vector& payload) { -- cgit v1.2.3 From b7bd2a4001ad12f03636d21b75785a032f8a8bc0 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 10 Jul 2022 12:31:59 +0400 Subject: Common/Network: Use member initializer list --- Source/Core/Common/Network.cpp | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'Source/Core/Common/Network.cpp') diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index 59d0c9026e..5bc6469912 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -85,9 +85,13 @@ std::optional StringToMacAddress(std::string_view mac_string) EthernetHeader::EthernetHeader() = default; -EthernetHeader::EthernetHeader(u16 ether_type) +EthernetHeader::EthernetHeader(u16 ether_type) : ethertype(htons(ether_type)) +{ +} + +EthernetHeader::EthernetHeader(const MACAddress& dest, const MACAddress& src, u16 ether_type) + : destination(dest), source(src), ethertype(htons(ether_type)) { - ethertype = htons(ether_type); } u16 EthernetHeader::Size() const @@ -339,13 +343,10 @@ TCPPacket::TCPPacket() = default; TCPPacket::TCPPacket(const MACAddress& destination, const MACAddress& source, const sockaddr_in& from, const sockaddr_in& to, u32 seq, u32 ack, u16 flags) + : eth_header(destination, source, IPV4_ETHERTYPE), + ip_header(Common::TCPHeader::SIZE, IPPROTO_TCP, from, to), + tcp_header(from, to, seq, ack, flags) { - eth_header.destination = destination; - eth_header.source = source; - eth_header.ethertype = htons(IPV4_ETHERTYPE); - - ip_header = Common::IPv4Header(Common::TCPHeader::SIZE, IPPROTO_TCP, from, to); - tcp_header = Common::TCPHeader(from, to, seq, ack, flags); } std::vector TCPPacket::Build() @@ -401,15 +402,10 @@ UDPPacket::UDPPacket() = default; UDPPacket::UDPPacket(const MACAddress& destination, const MACAddress& source, const sockaddr_in& from, const sockaddr_in& to, const std::vector& payload) + : eth_header(destination, source, IPV4_ETHERTYPE), + ip_header(static_cast(payload.size() + Common::UDPHeader::SIZE), IPPROTO_UDP, from, to), + udp_header(from, to, static_cast(payload.size())), data(payload) { - eth_header.destination = destination; - eth_header.source = source; - eth_header.ethertype = htons(IPV4_ETHERTYPE); - - ip_header = Common::IPv4Header(static_cast(payload.size() + Common::UDPHeader::SIZE), - IPPROTO_UDP, from, to); - udp_header = Common::UDPHeader(from, to, static_cast(payload.size())); - data = payload; } std::vector UDPPacket::Build() -- cgit v1.2.3 From 6238834c05d173e92cf5857bcecf9b9a59ebdf68 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 10 Jul 2022 13:56:33 +0400 Subject: Common/Network: Add InsertObj helper --- Source/Core/Common/Network.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'Source/Core/Common/Network.cpp') diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index 5bc6469912..2f5ddd44df 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -314,6 +314,14 @@ u16 ComputeTCPNetworkChecksum(const IPAddress& from, const IPAddress& to, const return htons(static_cast(tcp_checksum)); } +template +static inline void InsertObj(Container* container, const T& obj) +{ + static_assert(std::is_trivially_copyable_v); + const u8* const ptr = reinterpret_cast(&obj); + container->insert(container->end(), ptr, ptr + sizeof(obj)); +} + ARPPacket::ARPPacket() = default; u16 ARPPacket::Size() const @@ -332,10 +340,8 @@ std::vector ARPPacket::Build() const { std::vector result; result.reserve(EthernetHeader::SIZE + ARPHeader::SIZE); - const u8* eth_ptr = reinterpret_cast(ð_header); - result.insert(result.end(), eth_ptr, eth_ptr + EthernetHeader::SIZE); - const u8* arp_ptr = reinterpret_cast(&arp_header); - result.insert(result.end(), arp_ptr, arp_ptr + ARPHeader::SIZE); + InsertObj(&result, eth_header); + InsertObj(&result, arp_header); return result; } @@ -359,10 +365,8 @@ std::vector TCPPacket::Build() TCPHeader::SIZE + tcp_options.size() + data.size())); // copy data - const u8* eth_ptr = reinterpret_cast(ð_header); - result.insert(result.end(), eth_ptr, eth_ptr + EthernetHeader::SIZE); - const u8* ip_ptr = reinterpret_cast(&ip_header); - result.insert(result.end(), ip_ptr, ip_ptr + IPv4Header::SIZE); + InsertObj(&result, eth_header); + InsertObj(&result, ip_header); std::size_t offset = EthernetHeader::SIZE + IPv4Header::SIZE; if (ipv4_options.size() > 0) { @@ -419,10 +423,8 @@ std::vector UDPPacket::Build() udp_header.length = htons(static_cast(UDPHeader::SIZE + data.size())); // copy data - const u8* eth_ptr = reinterpret_cast(ð_header); - result.insert(result.end(), eth_ptr, eth_ptr + EthernetHeader::SIZE); - const u8* ip_ptr = reinterpret_cast(&ip_header); - result.insert(result.end(), ip_ptr, ip_ptr + IPv4Header::SIZE); + InsertObj(&result, eth_header); + InsertObj(&result, ip_header); std::size_t offset = EthernetHeader::SIZE + IPv4Header::SIZE; if (ipv4_options.size() > 0) { -- cgit v1.2.3 From b206f98261e9c24b3eb79eb1df466719216cb178 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 10 Jul 2022 14:04:03 +0400 Subject: Common/Network: Remove unnecessary size checks --- Source/Core/Common/Network.cpp | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) (limited to 'Source/Core/Common/Network.cpp') diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index 2f5ddd44df..f6aac99922 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -368,11 +368,9 @@ std::vector TCPPacket::Build() InsertObj(&result, eth_header); InsertObj(&result, ip_header); std::size_t offset = EthernetHeader::SIZE + IPv4Header::SIZE; - if (ipv4_options.size() > 0) - { - result.insert(result.end(), ipv4_options.begin(), ipv4_options.end()); - offset += ipv4_options.size(); - } + result.insert(result.end(), ipv4_options.begin(), ipv4_options.end()); + offset += ipv4_options.size(); + tcp_header.checksum = 0; const u16 props = (ntohs(tcp_header.properties) & 0xfff) | (static_cast((tcp_options.size() + TCPHeader::SIZE) & 0x3c) << 10); @@ -381,15 +379,11 @@ std::vector TCPPacket::Build() result.insert(result.end(), tcp_ptr, tcp_ptr + TCPHeader::SIZE); const std::size_t tcp_offset = offset; offset += TCPHeader::SIZE; - if (tcp_options.size() > 0) - { - result.insert(result.end(), tcp_options.begin(), tcp_options.end()); - offset += tcp_options.size(); - } - if (data.size() > 0) - { - result.insert(result.end(), data.begin(), data.end()); - } + result.insert(result.end(), tcp_options.begin(), tcp_options.end()); + offset += tcp_options.size(); + + result.insert(result.end(), data.begin(), data.end()); + tcp_header.checksum = ComputeTCPNetworkChecksum( ip_header.source_addr, ip_header.destination_addr, &result[tcp_offset], static_cast(result.size() - tcp_offset), IPPROTO_TCP); @@ -426,20 +420,16 @@ std::vector UDPPacket::Build() InsertObj(&result, eth_header); InsertObj(&result, ip_header); std::size_t offset = EthernetHeader::SIZE + IPv4Header::SIZE; - if (ipv4_options.size() > 0) - { - result.insert(result.end(), ipv4_options.begin(), ipv4_options.end()); - offset += ipv4_options.size(); - } + result.insert(result.end(), ipv4_options.begin(), ipv4_options.end()); + offset += ipv4_options.size(); + udp_header.checksum = 0; const u8* udp_ptr = reinterpret_cast(&udp_header); result.insert(result.end(), udp_ptr, udp_ptr + UDPHeader::SIZE); const std::size_t udp_offset = offset; offset += UDPHeader::SIZE; - if (data.size() > 0) - { - result.insert(result.end(), data.begin(), data.end()); - } + result.insert(result.end(), data.begin(), data.end()); + udp_header.checksum = ComputeTCPNetworkChecksum( ip_header.source_addr, ip_header.destination_addr, &result[udp_offset], static_cast(result.size() - udp_offset), IPPROTO_UDP); -- cgit v1.2.3 From d902b04ae09a7118b7551a7fbe8c31f43cbcf643 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 10 Jul 2022 14:11:50 +0400 Subject: Common/Network: Remove unused offset variables --- Source/Core/Common/Network.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Source/Core/Common/Network.cpp') diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index f6aac99922..1ee5496fcc 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -367,9 +367,8 @@ std::vector TCPPacket::Build() // copy data InsertObj(&result, eth_header); InsertObj(&result, ip_header); - std::size_t offset = EthernetHeader::SIZE + IPv4Header::SIZE; result.insert(result.end(), ipv4_options.begin(), ipv4_options.end()); - offset += ipv4_options.size(); + const std::size_t tcp_offset = result.size(); tcp_header.checksum = 0; const u16 props = (ntohs(tcp_header.properties) & 0xfff) | @@ -377,11 +376,7 @@ std::vector TCPPacket::Build() tcp_header.properties = htons(props); const u8* tcp_ptr = reinterpret_cast(&tcp_header); result.insert(result.end(), tcp_ptr, tcp_ptr + TCPHeader::SIZE); - const std::size_t tcp_offset = offset; - offset += TCPHeader::SIZE; result.insert(result.end(), tcp_options.begin(), tcp_options.end()); - offset += tcp_options.size(); - result.insert(result.end(), data.begin(), data.end()); tcp_header.checksum = ComputeTCPNetworkChecksum( @@ -419,15 +414,12 @@ std::vector UDPPacket::Build() // copy data InsertObj(&result, eth_header); InsertObj(&result, ip_header); - std::size_t offset = EthernetHeader::SIZE + IPv4Header::SIZE; result.insert(result.end(), ipv4_options.begin(), ipv4_options.end()); - offset += ipv4_options.size(); + const std::size_t udp_offset = result.size(); udp_header.checksum = 0; const u8* udp_ptr = reinterpret_cast(&udp_header); result.insert(result.end(), udp_ptr, udp_ptr + UDPHeader::SIZE); - const std::size_t udp_offset = offset; - offset += UDPHeader::SIZE; result.insert(result.end(), data.begin(), data.end()); udp_header.checksum = ComputeTCPNetworkChecksum( -- cgit v1.2.3 From 5fdf255a2da7736a791a8a35f9652ea5ac14fe06 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 10 Jul 2022 20:12:07 +0400 Subject: Common/Network: Make Build() methods const --- Source/Core/Common/Network.cpp | 74 ++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 36 deletions(-) (limited to 'Source/Core/Common/Network.cpp') diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index 1ee5496fcc..f35308a5ab 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -355,34 +355,36 @@ TCPPacket::TCPPacket(const MACAddress& destination, const MACAddress& source, { } -std::vector TCPPacket::Build() +std::vector TCPPacket::Build() const { std::vector result; - result.reserve(Size()); + result.reserve(Size()); // Useful not to invalidate .data() pointers - // recalc size - ip_header.total_len = htons(static_cast(IPv4Header::SIZE + ipv4_options.size() + - TCPHeader::SIZE + tcp_options.size() + data.size())); - - // copy data + // Copy data InsertObj(&result, eth_header); + u8* const ip_ptr = result.data() + result.size(); InsertObj(&result, ip_header); result.insert(result.end(), ipv4_options.begin(), ipv4_options.end()); - const std::size_t tcp_offset = result.size(); - - tcp_header.checksum = 0; - const u16 props = (ntohs(tcp_header.properties) & 0xfff) | - (static_cast((tcp_options.size() + TCPHeader::SIZE) & 0x3c) << 10); - tcp_header.properties = htons(props); - const u8* tcp_ptr = reinterpret_cast(&tcp_header); - result.insert(result.end(), tcp_ptr, tcp_ptr + TCPHeader::SIZE); + u8* const tcp_ptr = result.data() + result.size(); + InsertObj(&result, tcp_header); result.insert(result.end(), tcp_options.begin(), tcp_options.end()); result.insert(result.end(), data.begin(), data.end()); - tcp_header.checksum = ComputeTCPNetworkChecksum( - ip_header.source_addr, ip_header.destination_addr, &result[tcp_offset], - static_cast(result.size() - tcp_offset), IPPROTO_TCP); - std::copy(tcp_ptr, tcp_ptr + TCPHeader::SIZE, result.begin() + tcp_offset); + // Adjust size and checksum fields + const u16 tcp_length = static_cast(TCPHeader::SIZE + tcp_options.size() + data.size()); + const u16 tcp_properties = + (ntohs(tcp_header.properties) & 0xfff) | + (static_cast((tcp_options.size() + TCPHeader::SIZE) & 0x3c) << 10); + Common::BitCastPtr(tcp_ptr + offsetof(TCPHeader, properties)) = htons(tcp_properties); + + const u16 ip_total_len = static_cast(IPv4Header::SIZE + ipv4_options.size() + tcp_length); + Common::BitCastPtr(ip_ptr + offsetof(IPv4Header, total_len)) = htons(ip_total_len); + + auto checksum_bitcast_ptr = Common::BitCastPtr(tcp_ptr + offsetof(TCPHeader, checksum)); + checksum_bitcast_ptr = u16(0); + checksum_bitcast_ptr = ComputeTCPNetworkChecksum( + ip_header.source_addr, ip_header.destination_addr, tcp_ptr, tcp_length, IPPROTO_TCP); + return result; } @@ -401,31 +403,31 @@ UDPPacket::UDPPacket(const MACAddress& destination, const MACAddress& source, { } -std::vector UDPPacket::Build() +std::vector UDPPacket::Build() const { std::vector result; - result.reserve(Size()); + result.reserve(Size()); // Useful not to invalidate .data() pointers - // recalc size - ip_header.total_len = htons( - static_cast(IPv4Header::SIZE + ipv4_options.size() + UDPHeader::SIZE + data.size())); - udp_header.length = htons(static_cast(UDPHeader::SIZE + data.size())); - - // copy data + // Copy data InsertObj(&result, eth_header); + u8* const ip_ptr = result.data() + result.size(); InsertObj(&result, ip_header); result.insert(result.end(), ipv4_options.begin(), ipv4_options.end()); - const std::size_t udp_offset = result.size(); - - udp_header.checksum = 0; - const u8* udp_ptr = reinterpret_cast(&udp_header); - result.insert(result.end(), udp_ptr, udp_ptr + UDPHeader::SIZE); + u8* const udp_ptr = result.data() + result.size(); + InsertObj(&result, udp_header); result.insert(result.end(), data.begin(), data.end()); - udp_header.checksum = ComputeTCPNetworkChecksum( - ip_header.source_addr, ip_header.destination_addr, &result[udp_offset], - static_cast(result.size() - udp_offset), IPPROTO_UDP); - std::copy(udp_ptr, udp_ptr + UDPHeader::SIZE, result.begin() + udp_offset); + // Adjust size and checksum fields + const u16 udp_length = static_cast(UDPHeader::SIZE + data.size()); + Common::BitCastPtr(udp_ptr + offsetof(UDPHeader, length)) = htons(udp_length); + + const u16 ip_total_len = static_cast(IPv4Header::SIZE + ipv4_options.size() + udp_length); + Common::BitCastPtr(ip_ptr + offsetof(IPv4Header, total_len)) = htons(ip_total_len); + + auto checksum_bitcast_ptr = Common::BitCastPtr(udp_ptr + offsetof(UDPHeader, checksum)); + checksum_bitcast_ptr = u16(0); + checksum_bitcast_ptr = ComputeTCPNetworkChecksum( + ip_header.source_addr, ip_header.destination_addr, udp_ptr, udp_length, IPPROTO_UDP); return result; } -- cgit v1.2.3 From b950d038b9074fb7cba61989f3214ecbe3163355 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Sun, 10 Jul 2022 20:34:15 +0400 Subject: Common/Network: Update IP checksum since total_len might have changed --- Source/Core/Common/Network.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/Network.cpp') diff --git a/Source/Core/Common/Network.cpp b/Source/Core/Common/Network.cpp index f35308a5ab..2d532690c1 100644 --- a/Source/Core/Common/Network.cpp +++ b/Source/Core/Common/Network.cpp @@ -377,9 +377,15 @@ std::vector TCPPacket::Build() const (static_cast((tcp_options.size() + TCPHeader::SIZE) & 0x3c) << 10); Common::BitCastPtr(tcp_ptr + offsetof(TCPHeader, properties)) = htons(tcp_properties); - const u16 ip_total_len = static_cast(IPv4Header::SIZE + ipv4_options.size() + tcp_length); + const u16 ip_header_size = static_cast(IPv4Header::SIZE + ipv4_options.size()); + const u16 ip_total_len = ip_header_size + tcp_length; Common::BitCastPtr(ip_ptr + offsetof(IPv4Header, total_len)) = htons(ip_total_len); + auto ip_checksum_bitcast_ptr = + Common::BitCastPtr(ip_ptr + offsetof(IPv4Header, header_checksum)); + ip_checksum_bitcast_ptr = u16(0); + ip_checksum_bitcast_ptr = htons(Common::ComputeNetworkChecksum(ip_ptr, ip_header_size)); + auto checksum_bitcast_ptr = Common::BitCastPtr(tcp_ptr + offsetof(TCPHeader, checksum)); checksum_bitcast_ptr = u16(0); checksum_bitcast_ptr = ComputeTCPNetworkChecksum( @@ -421,9 +427,15 @@ std::vector UDPPacket::Build() const const u16 udp_length = static_cast(UDPHeader::SIZE + data.size()); Common::BitCastPtr(udp_ptr + offsetof(UDPHeader, length)) = htons(udp_length); - const u16 ip_total_len = static_cast(IPv4Header::SIZE + ipv4_options.size() + udp_length); + const u16 ip_header_size = static_cast(IPv4Header::SIZE + ipv4_options.size()); + const u16 ip_total_len = ip_header_size + udp_length; Common::BitCastPtr(ip_ptr + offsetof(IPv4Header, total_len)) = htons(ip_total_len); + auto ip_checksum_bitcast_ptr = + Common::BitCastPtr(ip_ptr + offsetof(IPv4Header, header_checksum)); + ip_checksum_bitcast_ptr = u16(0); + ip_checksum_bitcast_ptr = htons(Common::ComputeNetworkChecksum(ip_ptr, ip_header_size)); + auto checksum_bitcast_ptr = Common::BitCastPtr(udp_ptr + offsetof(UDPHeader, checksum)); checksum_bitcast_ptr = u16(0); checksum_bitcast_ptr = ComputeTCPNetworkChecksum( -- cgit v1.2.3