diff --git a/kernel/include/net/tcp_layer.hpp b/kernel/include/net/tcp_layer.hpp index d3ce5984..88a74907 100644 --- a/kernel/include/net/tcp_layer.hpp +++ b/kernel/include/net/tcp_layer.hpp @@ -49,11 +49,6 @@ struct tcp_connection { struct layer { layer(network::ip::layer* parent); - /*! - * \brief Initialize the layer - */ - void init_layer(); - /*! * \brief Decode a network packet. * diff --git a/kernel/include/net/udp_layer.hpp b/kernel/include/net/udp_layer.hpp index 25e8cc07..8f147eef 100644 --- a/kernel/include/net/udp_layer.hpp +++ b/kernel/include/net/udp_layer.hpp @@ -57,11 +57,6 @@ struct udp_connection { struct layer { layer(network::ip::layer* parent); - /*! - * \brief Initialize the layer - */ - void init_layer(); - /*! * \brief Decode a network packet. * diff --git a/kernel/src/net/network.cpp b/kernel/src/net/network.cpp index 052a7d96..ca99a5ed 100644 --- a/kernel/src/net/network.cpp +++ b/kernel/src/net/network.cpp @@ -291,13 +291,10 @@ void network::init(){ icmp_layer = new network::icmp::layer(ip_layer); udp_layer = new network::udp::layer(ip_layer); - udp_layer->init_layer(); - dns_layer = new network::dns::layer(udp_layer); dhcp_layer = new network::dhcp::layer(udp_layer); tcp_layer = new network::tcp::layer(ip_layer); - tcp_layer->init_layer(); } void network::finalize(){ diff --git a/kernel/src/net/tcp_layer.cpp b/kernel/src/net/tcp_layer.cpp index 32b8e45a..3543850c 100644 --- a/kernel/src/net/tcp_layer.cpp +++ b/kernel/src/net/tcp_layer.cpp @@ -102,9 +102,8 @@ size_t tcp_payload_len(const network::ethernet::packet& packet){ network::tcp::layer::layer(network::ip::layer* parent) : parent(parent) { parent->register_tcp_layer(this); -} -void network::tcp::layer::init_layer(){ + // The first port will be 1024 local_port = 1023; } diff --git a/kernel/src/net/udp_layer.cpp b/kernel/src/net/udp_layer.cpp index d3f71eaa..d5b39ebe 100644 --- a/kernel/src/net/udp_layer.cpp +++ b/kernel/src/net/udp_layer.cpp @@ -60,9 +60,8 @@ void prepare_packet(network::ethernet::packet& packet, size_t source, size_t tar network::udp::layer::layer(network::ip::layer* parent) : parent(parent) { parent->register_udp_layer(this); -} -void network::udp::layer::init_layer(){ + // The first port will be 1024 local_port = 1023; }