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

Add default timeout for ARP resolution

Browse Source
This commit is contained in:
Baptiste Wicht 2016-09-08 12:20:53 +02:00
parent 026406da50
commit 1505fe2f70
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/net/ip_layer.cpp
View File

@ -18,6 +18,8 @@
namespace { namespace {
constexpr const size_t ARP_TIMEOUT = 5000;
void compute_checksum(network::ip::header* header){ void compute_checksum(network::ip::header* header){
auto ihl = header->version_ihl & 0xF; auto ihl = header->version_ihl & 0xF;
@ -111,7 +113,7 @@ void network::ip::decode(network::interface_descriptor& interface, network::ethe
} }
std::expected<network::ethernet::packet> network::ip::prepare_packet(network::interface_descriptor& interface, size_t size, address& target_ip, size_t protocol){ std::expected<network::ethernet::packet> network::ip::prepare_packet(network::interface_descriptor& interface, size_t size, address& target_ip, size_t protocol){
auto target_mac = network::arp::get_mac_force(interface, target_ip); auto target_mac = network::arp::get_mac_force(interface, target_ip, ARP_TIMEOUT);
if(!target_mac){ if(!target_mac){
return std::make_expected_from_error<network::ethernet::packet>(target_mac.error()); return std::make_expected_from_error<network::ethernet::packet>(target_mac.error());
@ -128,7 +130,7 @@ std::expected<network::ethernet::packet> network::ip::prepare_packet(network::in
} }
std::expected<network::ethernet::packet> network::ip::prepare_packet(char* buffer, network::interface_descriptor& interface, size_t size, address& target_ip, size_t protocol){ std::expected<network::ethernet::packet> network::ip::prepare_packet(char* buffer, network::interface_descriptor& interface, size_t size, address& target_ip, size_t protocol){
auto target_mac = network::arp::get_mac_force(interface, target_ip); auto target_mac = network::arp::get_mac_force(interface, target_ip, ARP_TIMEOUT);
if(!target_mac){ if(!target_mac){
return std::make_expected_from_error<network::ethernet::packet>(target_mac.error()); return std::make_expected_from_error<network::ethernet::packet>(target_mac.error());