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

IPv4: More work on the TCP implementation.

Browse source 
I can now establish a connection to my little test server on the host.
This commit is contained in:
Andreas Kling 2019-03-14 00:20:44 +01:00
parent 032d9d7065
commit 66d55f8e0c
9 changed files with 36 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Kernel/NetworkTask.cpp
View file

@ -281,8 +281,10 @@ void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
{
LOCKER(IPv4Socket::sockets_by_tcp_port().lock());
auto it = IPv4Socket::sockets_by_tcp_port().resource().find(tcp_packet.destination_port());
if (it == IPv4Socket::sockets_by_tcp_port().resource().end())
if (it == IPv4Socket::sockets_by_tcp_port().resource().end()) {
kprintf("handle_tcp: No TCP socket for port %u\n", tcp_packet.destination_port());
return;
}
ASSERT((*it).value);
socket = *(*it).value;
}
@ -291,15 +293,18 @@ void handle_tcp(const EthernetFrameHeader& eth, int frame_size)
ASSERT(socket->type() == SOCK_STREAM);
ASSERT(socket->source_port() == tcp_packet.destination_port());
size_t payload_size = ipv4_packet.payload_size() - sizeof(TCPPacket);
size_t payload_size = ipv4_packet.payload_size() - tcp_packet.header_size();
if (tcp_packet.has_syn() && tcp_packet.has_ack()) {
socket->set_tcp_ack_number(socket->tcp_sequence_number() + payload_size + 1);
socket->send_tcp_packet(*adapter, TCPFlags::ACK);
socket->set_connected(true);
kprintf("Connected!\n");
socket->set_tcp_state(Connected);
return;
}
socket->send_tcp_packet(*adapter, TCPFlags::ACK);
socket->did_receive(ByteBuffer::copy((const byte*)&ipv4_packet, sizeof(IPv4Packet) + ipv4_packet.payload_size()));
}