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

Cleanup

Browse Source
This commit is contained in:
Baptiste Wicht 2016-09-25 20:53:03 +02:00
parent 87eaf1b797
commit c899471d7d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ std::expected<size_t> receive(char* buffer, network::socket& socket, size_t n);
std::expected<size_t> receive(char* buffer, network::socket& socket, size_t n, size_t ms);
std::expected<size_t> connect(network::socket& socket, network::interface_descriptor& interface, size_t server_port, network::ip::address server);
std::expected<void> server_start(network::socket& socket, network::interface_descriptor& interface, size_t server_port, network::ip::address server);
std::expected<void> server_start(network::socket& socket, size_t server_port, network::ip::address server);
std::expected<void> disconnect(network::socket& socket);
} // end of tcp namespace

2
kernel/src/net/network.cpp
View File

@ -736,7 +736,7 @@ std::expected<void> 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<void>(std::ERROR_SOCKET_INVALID_TYPE_PROTOCOL);

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

@ -41,8 +41,8 @@ using flag_syn = std::bit_field<uint16_t, uint8_t, 1, 1>;
using flag_fin = std::bit_field<uint16_t, uint8_t, 0, 1>;
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<bool> 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<size_t> network::tcp::connect(network::socket& sock, network::inte
return connection.local_port;
}
std::expected<void> network::tcp::server_start(network::socket& sock, network::interface_descriptor& interface, size_t server_port, network::ip::address server) {
std::expected<void> network::tcp::server_start(network::socket& sock, size_t server_port, network::ip::address server) {
// Create the connection
auto& connection = connections.create_connection();