From 026406da50109e9cbc4b1c17266519c3966833db Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Thu, 8 Sep 2016 12:17:32 +0200 Subject: [PATCH] Use explicit error for timeout --- kernel/src/net/arp_cache.cpp | 4 +++- tlib/include/tlib/errors.hpp | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel/src/net/arp_cache.cpp b/kernel/src/net/arp_cache.cpp index 38244834..bd91f226 100644 --- a/kernel/src/net/arp_cache.cpp +++ b/kernel/src/net/arp_cache.cpp @@ -9,6 +9,8 @@ #include #include +#include "tlib/errors.hpp" + #include "net/arp_cache.hpp" #include "net/arp_layer.hpp" @@ -181,7 +183,7 @@ std::expected network::arp::get_mac_force(network::interface_descripto auto end = timer::milliseconds(); if(start - end > ms){ logging::logf(logging::log_level::TRACE, "arp: reached timeout, exiting\n"); - return std::make_expected_from_error(0); + return std::make_expected_from_error(std::ERROR_SOCKET_TIMEOUT); } } } diff --git a/tlib/include/tlib/errors.hpp b/tlib/include/tlib/errors.hpp index 300b7e53..128b78ec 100644 --- a/tlib/include/tlib/errors.hpp +++ b/tlib/include/tlib/errors.hpp @@ -39,6 +39,7 @@ constexpr const size_t ERROR_SOCKET_UNIMPLEMENTED = 24; constexpr const size_t ERROR_SOCKET_NO_INTERFACE = 25; constexpr const size_t ERROR_SOCKET_INVALID_PACKET_FD = 26; constexpr const size_t ERROR_SOCKET_NOT_LISTEN = 27; +constexpr const size_t ERROR_SOCKET_TIMEOUT = 28; inline const char* error_message(size_t error){ switch(error){ @@ -96,6 +97,8 @@ inline const char* error_message(size_t error){ return "The packet file descriptor is invalid"; case ERROR_SOCKET_NOT_LISTEN: return "The socket is not configured to listen"; + case ERROR_SOCKET_TIMEOUT: + return "Network timeout"; default: return "Unknonwn error"; }