TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-08-04 01:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Insert the listener only once

Browse Source
This commit is contained in:
Baptiste Wicht 2016-09-15 22:37:17 +02:00
parent a71551720f
commit d7fc1a0c60
1 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,23 @@ struct tcp_listener {
// Note: We need a list to not invalidate the values during insertions // Note: We need a list to not invalidate the values during insertions
std::list<tcp_listener> listeners; std::list<tcp_listener> listeners;
tcp_listener* get_listener(size_t source_port, size_t target_port){
auto end = listeners.end();
auto it = listeners.begin();
while(it != end){
auto& listener = *it;
if(listener.source_port == source_port && listener.target_port == target_port){
return &listener;
}
++it;
}
return nullptr;
}
void compute_checksum(network::ethernet::packet& packet) { void compute_checksum(network::ethernet::packet& packet) {
auto* ip_header = reinterpret_cast<network::ip::header*>(packet.payload + packet.tag(1)); auto* ip_header = reinterpret_cast<network::ip::header*>(packet.payload + packet.tag(1));
auto* tcp_header = reinterpret_cast<network::tcp::header*>(packet.payload + packet.index); auto* tcp_header = reinterpret_cast<network::tcp::header*>(packet.payload + packet.index);
@ -196,9 +213,14 @@ void network::tcp::finalize_packet(network::interface_descriptor& interface, net
auto source = socket.local_port; auto source = socket.local_port;
auto target = socket.server_port; auto target = socket.server_port;
// TODO Wait for ACK or resend auto listener_ptr = get_listener(target, source);
auto& listener = listeners.emplace_back(target, source); if(!listener_ptr){
logging::logf(logging::log_level::ERROR, "tcp: Unable to find listener!\n");
return;
}
auto& listener = *listener_ptr;
listener.active = true; listener.active = true;
@ -236,18 +258,6 @@ void network::tcp::finalize_packet(network::interface_descriptor& interface, net
socket.seq_number = ack; socket.seq_number = ack;
socket.ack_number = seq; socket.ack_number = seq;
auto end = listeners.end();
auto it = listeners.begin();
while (it != end) {
if (&(*it) == &listener) {
listeners.erase(it);
break;
}
++it;
}
} }
std::expected<void> network::tcp::connect(network::socket& sock, network::interface_descriptor& interface) { std::expected<void> network::tcp::connect(network::socket& sock, network::interface_descriptor& interface) {
@ -336,18 +346,6 @@ std::expected<void> network::tcp::connect(network::socket& sock, network::interf
tcp::finalize_packet(interface, *packet); tcp::finalize_packet(interface, *packet);
} }
auto end = listeners.end();
auto it = listeners.begin();
while (it != end) {
if (&(*it) == &listener) {
listeners.erase(it);
break;
}
++it;
}
return {}; return {};
} }
@ -372,8 +370,6 @@ std::expected<void> network::tcp::disconnect(network::socket& sock, network::int
(flag_ack(&flags)) = 1; (flag_ack(&flags)) = 1;
tcp_header->flags = switch_endian_16(flags); tcp_header->flags = switch_endian_16(flags);
// Create the listener
auto& listener = listeners.emplace_back(target, source); auto& listener = listeners.emplace_back(target, source);
listener.active = true; listener.active = true;