RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 19:35:08 +00:00
Code Issues Activity Actions

TCP: Collect the payload if present in a packet with FIN set.

Browse source
This commit is contained in:
Andreas Kling 2019-03-14 15:28:23 +01:00
parent 25e521f510
commit f9569db1e5
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/IPv4Socket.cpp
View file

@ -222,9 +222,11 @@ ssize_t IPv4Socket::recvfrom(void* buffer, size_t buffer_length, int flags, sock
void IPv4Socket::did_receive(ByteBuffer&& packet) void IPv4Socket::did_receive(ByteBuffer&& packet)
{ {
LOCKER(lock()); LOCKER(lock());
auto packet_size = packet.size();
m_receive_queue.append(move(packet)); m_receive_queue.append(move(packet));
m_can_read = true; m_can_read = true;
m_bytes_received += packet_size;
#ifdef IPV4_SOCKET_DEBUG #ifdef IPV4_SOCKET_DEBUG
kprintf("IPv4Socket(%p): did_receive %d bytes, packets in queue: %d\n", this, packet.size(), m_receive_queue.size_slow()); kprintf("IPv4Socket(%p): did_receive %d bytes, total_received=%u, packets in queue: %d\n", this, packet_size, m_bytes_received, m_receive_queue.size_slow());
#endif #endif
} }

2
Kernel/IPv4Socket.h
View file

@ -68,6 +68,8 @@ private:
word m_source_port { 0 }; word m_source_port { 0 };
word m_destination_port { 0 }; word m_destination_port { 0 };
dword m_bytes_received { 0 };
bool m_can_read { false }; bool m_can_read { false };
}; };

4
Kernel/NetworkTask.cpp
View file

@ -302,6 +302,10 @@ void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
if (tcp_packet.has_fin()) { if (tcp_packet.has_fin()) {
kprintf("handle_tcp: Got FIN, payload_size=%u\n", payload_size); kprintf("handle_tcp: Got FIN, payload_size=%u\n", payload_size);
if (payload_size != 0)
socket->did_receive(ByteBuffer::copy((const byte*)&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
socket->set_ack_number(tcp_packet.sequence_number() + payload_size + 1); socket->set_ack_number(tcp_packet.sequence_number() + payload_size + 1);
socket->send_tcp_packet(TCPFlags::FIN | TCPFlags::ACK); socket->send_tcp_packet(TCPFlags::FIN | TCPFlags::ACK);
socket->set_state(TCPSocket::State::Disconnecting); socket->set_state(TCPSocket::State::Disconnecting);