From 0ee21466cd9d2afb2eba47282fec470e0f999d94 Mon Sep 17 00:00:00 2001 From: valentinbreiz Date: Fri, 22 Jan 2021 14:31:15 +0100 Subject: [PATCH] Return time value for Discover packet --- .../Network/IPV4/UDP/DHCP/DHCPClient.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPClient.cs b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPClient.cs index 94dd711ea..b712a28e9 100644 --- a/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPClient.cs +++ b/source/Cosmos.System2/Network/IPV4/UDP/DHCP/DHCPClient.cs @@ -71,7 +71,7 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP { if (packet.RawData[284] == 0x02) //Offer packet received { - SendRequestPacket(packet.Client, packet.Server); + return SendRequestPacket(packet.Client, packet.Server); } else if (packet.RawData[284] == 0x05 || packet.RawData[284] == 0x06) //ACK or NAK DHCP packet received { @@ -113,7 +113,8 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP /// /// Send a packet to find the DHCP server and tell that we want a new IP address /// - public void SendDiscoverPacket() + /// time value (-1 = timeout) + public int SendDiscoverPacket() { NetworkStack.RemoveAllConfigIP(); @@ -128,13 +129,14 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP asked = true; } - Receive(); + return Receive(); } /// /// Send a request to apply the new IP configuration /// - private void SendRequestPacket(Address RequestedAddress, Address DHCPServerAddress) + /// time value (-1 = timeout) + private int SendRequestPacket(Address RequestedAddress, Address DHCPServerAddress) { foreach (NetworkDevice networkDevice in NetworkDevice.Devices) { @@ -142,7 +144,7 @@ namespace Cosmos.System.Network.IPv4.UDP.DHCP OutgoingBuffer.AddPacket(dhcp_request); NetworkStack.Update(); } - Receive(); + return Receive(); } /*