From f2833a522bec8b651a3ad5db72c29032957e12d5 Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Sat, 17 Sep 2016 22:34:07 +0200 Subject: [PATCH] Remove kernel_prepare_packet from DNS layer The kernel does not need to send DNS packets. This is up to the user space. --- kernel/include/net/dns_layer.hpp | 1 - kernel/src/net/dns_layer.cpp | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/kernel/include/net/dns_layer.hpp b/kernel/include/net/dns_layer.hpp index 80fefc1f..7260c40b 100644 --- a/kernel/include/net/dns_layer.hpp +++ b/kernel/include/net/dns_layer.hpp @@ -22,7 +22,6 @@ static_assert(sizeof(header) == 12, "DNS flags must be 96 bits"); void decode(network::interface_descriptor& interface, network::ethernet::packet& packet); -std::expected kernel_prepare_packet_query(network::interface_descriptor& interface, const packet_descriptor& descriptor); std::expected user_prepare_packet_query(char* buffer, network::interface_descriptor& interface, const packet_descriptor* descriptor); std::expected finalize_packet(network::interface_descriptor& interface, network::ethernet::packet& p); diff --git a/kernel/src/net/dns_layer.cpp b/kernel/src/net/dns_layer.cpp index 9a3dae38..bdd8d3fe 100644 --- a/kernel/src/net/dns_layer.cpp +++ b/kernel/src/net/dns_layer.cpp @@ -192,18 +192,6 @@ void network::dns::decode(network::interface_descriptor& /*interface*/, network: network::propagate_packet(packet, network::socket_protocol::DNS); } -std::expected network::dns::kernel_prepare_packet_query(network::interface_descriptor& interface, const packet_descriptor& descriptor) { - // Ask the UDP layer to craft a packet - network::udp::packet_descriptor desc{descriptor.target_ip, descriptor.source_port, 53, sizeof(header) + descriptor.payload_size}; - auto packet = network::udp::kernel_prepare_packet(interface, desc); - - if (packet) { - ::prepare_packet_query(*packet, descriptor.identification); - } - - return packet; -} - std::expected network::dns::user_prepare_packet_query(char* buffer, network::interface_descriptor& interface, const packet_descriptor* descriptor) { // Ask the UDP layer to craft a packet network::udp::packet_descriptor desc{descriptor->target_ip, descriptor->source_port, 53, sizeof(header) + descriptor->payload_size};