TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-09 12:31:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup TCP numbers

Browse Source
This commit is contained in:
Baptiste Wicht 2016-10-05 19:50:56 +02:00
parent 748d3727f1
commit 2f5b56b4c0
No known key found for this signature in database
GPG Key ID: C5566B6C7F884532
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/include/net/tcp_layer.hpp
View File

@ -46,6 +46,9 @@ struct tcp_connection {
uint32_t ack_number = 0; ///< The next ack number
uint32_t seq_number = 0; ///< The next sequence number
uint32_t fina_ack_number = 0; ///< The next ack number (from finalize)
uint32_t fina_seq_number = 0; ///< The next sequence number (from finalize)
network::socket* socket = nullptr; ///< Pointer to the user socket
tcp_connection() : listening(false) {

12
kernel/src/net/tcp_layer.cpp
View File

@ -465,6 +465,9 @@ std::expected<void> network::tcp::layer::finalize_packet(network::interface_desc
if (correct_ack) {
logging::logf(logging::log_level::TRACE, "tcp:finalize: Received ACK\n");
connection.fina_ack_number = switch_endian_32(tcp_header->ack_number);
connection.fina_seq_number = switch_endian_32(tcp_header->sequence_number);
received = true;
break;
@ -529,6 +532,9 @@ std::expected<size_t> network::tcp::layer::connect(network::socket& sock, networ
return std::make_unexpected<size_t, size_t>(status.error());
}
connection.seq_number = connection.fina_ack_number;
connection.ack_number = connection.fina_seq_number + 1;
// The SYN/ACK is ensured by finalize_packet
logging::logf(logging::log_level::TRACE, "tcp:connect: Received SYN/ACK\n");
@ -639,6 +645,10 @@ std::expected<size_t> network::tcp::layer::accept(network::socket& socket){
child_sock.connection_data = &child_connection;
child_connection.socket = &child_sock;
// Child connection numbers
child_connection.seq_number = connection.seq_number;
child_connection.ack_number = connection.ack_number;
child_connection.connected = true;
auto& interface = network::select_interface(source_address);
@ -678,7 +688,7 @@ std::expected<size_t> network::tcp::layer::accept(network::socket& socket){
}
std::expected<size_t> network::tcp::layer::accept(network::socket& socket, size_t ms){
//TODO
}
std::expected<void> network::tcp::layer::server_start(network::socket& sock, size_t server_port, network::ip::address server) {