From 2de3bb3f0525deb42910c3e04db4ebbdcef0191a Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Mon, 22 Aug 2016 22:36:44 +0200 Subject: [PATCH] Cleanup --- kernel/src/net/ip_layer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/src/net/ip_layer.cpp b/kernel/src/net/ip_layer.cpp index 15fcea8a..93c3c358 100644 --- a/kernel/src/net/ip_layer.cpp +++ b/kernel/src/net/ip_layer.cpp @@ -19,11 +19,11 @@ inline network::ip::address network::ip::ip32_to_ip(uint32_t raw){ } void network::ip::decode(network::interface_descriptor& interface, network::ethernet::packet& packet){ - header* arp_header = reinterpret_cast(packet.payload + packet.index); + header* ip_header = reinterpret_cast(packet.payload + packet.index); logging::logf(logging::log_level::TRACE, "ip: Start IPv4 packet handling\n"); - auto version = arp_header->version_ihl >> 4; + auto version = ip_header->version_ihl >> 4; if(version != 4){ logging::logf(logging::log_level::ERROR, "ip: IPv6 Packet received instead of IPv4\n"); @@ -31,22 +31,22 @@ void network::ip::decode(network::interface_descriptor& interface, network::ethe return; } - auto ihl = arp_header->version_ihl & 0xF; - auto length = switch_endian_16(arp_header->total_len); + auto ihl = ip_header->version_ihl & 0xF; + auto length = switch_endian_16(ip_header->total_len); auto data_length = length - ihl * 4; logging::logf(logging::log_level::TRACE, "ip: Data Length: %u\n", size_t(data_length)); - logging::logf(logging::log_level::TRACE, "ip: Time To Live: %u\n", size_t(arp_header->ttl)); + logging::logf(logging::log_level::TRACE, "ip: Time To Live: %u\n", size_t(ip_header->ttl)); - auto source = ip32_to_ip(arp_header->source_ip); - auto target = ip32_to_ip(arp_header->target_ip); + auto source = ip32_to_ip(ip_header->source_ip); + auto target = ip32_to_ip(ip_header->target_ip); logging::logf(logging::log_level::TRACE, "ip: Source Protocol Address %u.%u.%u.%u \n", uint64_t(source(0)), uint64_t(source(1)), uint64_t(source(2)), uint64_t(source(3))); logging::logf(logging::log_level::TRACE, "ip: Target Protocol Address %u.%u.%u.%u \n", uint64_t(target(0)), uint64_t(target(1)), uint64_t(target(2)), uint64_t(target(3))); - auto protocol = arp_header->protocol; + auto protocol = ip_header->protocol; packet.index += sizeof(header);