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

TCP: Correct checksum for packets with odd number of bytes.

Browse source
This commit is contained in:
Andreas Kling 2019-03-14 19:57:54 +01:00
parent 4919b926f4
commit 5dfdcf796d
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Kernel/TCPSocket.cpp
View file

@ -50,6 +50,7 @@ int TCPSocket::protocol_receive(const ByteBuffer& packet_buffer, void* buffer, s
auto& ipv4_packet = *(const IPv4Packet*)(packet_buffer.pointer()); auto& ipv4_packet = *(const IPv4Packet*)(packet_buffer.pointer());
auto& tcp_packet = *static_cast<const TCPPacket*>(ipv4_packet.payload()); auto& tcp_packet = *static_cast<const TCPPacket*>(ipv4_packet.payload());
size_t payload_size = packet_buffer.size() - sizeof(IPv4Packet) - tcp_packet.header_size(); size_t payload_size = packet_buffer.size() - sizeof(IPv4Packet) - tcp_packet.header_size();
kprintf("payload_size %u, will it fit in %u?\n", payload_size, buffer_size);
ASSERT(buffer_size >= payload_size); ASSERT(buffer_size >= payload_size);
if (addr) { if (addr) {
auto& ia = *(sockaddr_in*)addr; auto& ia = *(sockaddr_in*)addr;
@ -141,7 +142,7 @@ NetworkOrdered<word> TCPSocket::compute_tcp_checksum(const IPv4Address& source,
checksum = (checksum >> 16) + (checksum & 0xffff); checksum = (checksum >> 16) + (checksum & 0xffff);
} }
if (payload_size & 1) { if (payload_size & 1) {
word expanded_byte = ((const byte*)packet.payload())[payload_size - 1]; word expanded_byte = ((const byte*)packet.payload())[payload_size - 1] << 8;
checksum += expanded_byte; checksum += expanded_byte;
if (checksum > 0xffff) if (checksum > 0xffff)
checksum = (checksum >> 16) + (checksum & 0xffff); checksum = (checksum >> 16) + (checksum & 0xffff);