RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 07:38:10 +00:00
Code Issues Activity Actions

NetworkTask: Don't crash on startup if there's no E1000 NIC present.

Browse source
This commit is contained in:
Andreas Kling 2019-05-18 00:22:08 +02:00
parent 33d0916d29
commit 8f3022b5c1
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Kernel/Net/NetworkTask.cpp
View file

@ -54,10 +54,12 @@ void NetworkTask_main()
{
LoopbackAdapter::the();
auto* adapter_ptr = E1000NetworkAdapter::the();
ASSERT(adapter_ptr);
auto& adapter = *adapter_ptr;
adapter.set_ipv4_address(IPv4Address(192, 168, 5, 2));
auto* adapter = E1000NetworkAdapter::the();
if (!adapter)
dbgprintf("E1000 network card not found!\n");
if (adapter)
adapter->set_ipv4_address(IPv4Address(192, 168, 5, 2));
auto dequeue_packet = [&] () -> ByteBuffer {
auto packet = LoopbackAdapter::the().dequeue_packet();
@ -65,8 +67,8 @@ void NetworkTask_main()
dbgprintf("Receive loopback packet (%d bytes)\n", packet.size());
return packet;
}
if (adapter.has_queued_packets())
return adapter.dequeue_packet();
if (adapter && adapter->has_queued_packets())
return adapter->dequeue_packet();
return { };
};