From c899471d7d405b0eb296c6ec5844a30663c62027 Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Sun, 25 Sep 2016 20:53:03 +0200 Subject: [PATCH] Cleanup --- kernel/include/net/tcp_layer.hpp | 2 +- kernel/src/net/network.cpp | 2 +- kernel/src/net/tcp_layer.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/include/net/tcp_layer.hpp b/kernel/include/net/tcp_layer.hpp index 17fb367b..d8c23044 100644 --- a/kernel/include/net/tcp_layer.hpp +++ b/kernel/include/net/tcp_layer.hpp @@ -56,7 +56,7 @@ std::expected receive(char* buffer, network::socket& socket, size_t n); std::expected receive(char* buffer, network::socket& socket, size_t n, size_t ms); std::expected connect(network::socket& socket, network::interface_descriptor& interface, size_t server_port, network::ip::address server); -std::expected server_start(network::socket& socket, network::interface_descriptor& interface, size_t server_port, network::ip::address server); +std::expected server_start(network::socket& socket, size_t server_port, network::ip::address server); std::expected disconnect(network::socket& socket); } // end of tcp namespace diff --git a/kernel/src/net/network.cpp b/kernel/src/net/network.cpp index ed390e88..3be68421 100644 --- a/kernel/src/net/network.cpp +++ b/kernel/src/net/network.cpp @@ -736,7 +736,7 @@ std::expected network::server_start(socket_fd_t socket_fd, network::ip::ad switch(stream_protocol(socket.protocol)){ case socket_protocol::TCP: - return network::tcp::server_start(socket, select_interface(server), port, server); + return network::tcp::server_start(socket, port, server); default: return std::make_unexpected(std::ERROR_SOCKET_INVALID_TYPE_PROTOCOL); diff --git a/kernel/src/net/tcp_layer.cpp b/kernel/src/net/tcp_layer.cpp index 7c22fa7e..b158569e 100644 --- a/kernel/src/net/tcp_layer.cpp +++ b/kernel/src/net/tcp_layer.cpp @@ -41,8 +41,8 @@ using flag_syn = std::bit_field; using flag_fin = std::bit_field; struct tcp_connection { - size_t local_port; ///< The local source port - size_t server_port; ///< The server port + size_t local_port = 0; ///< The local source port + size_t server_port = 0; ///< The server port network::ip::address server_address; ///< The server address std::atomic listening; ///< Indicates if a kernel thread is listening on this connection @@ -57,8 +57,8 @@ struct tcp_connection { network::socket* socket = nullptr; - tcp_connection(){ - listening = false; + tcp_connection() : listening(false) { + //Nothing else to init } tcp_connection(const tcp_connection& rhs) = delete; @@ -574,7 +574,7 @@ std::expected network::tcp::connect(network::socket& sock, network::inte return connection.local_port; } -std::expected network::tcp::server_start(network::socket& sock, network::interface_descriptor& interface, size_t server_port, network::ip::address server) { +std::expected network::tcp::server_start(network::socket& sock, size_t server_port, network::ip::address server) { // Create the connection auto& connection = connections.create_connection();