From d6f83df4bb0ac993083f5b94a3fffe7485b6c6fe Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 25 Jul 2015 11:11:03 -0400 Subject: [PATCH] servers/net: DHCPClient: Hard-code the message IDs. Even though C++ should increment the enum for us, since these IDs are set and used by things outside of this file, we should hard-code the numbers. No functional change (or if there is, it means there's a compiler bug somewhere.) --- src/servers/net/DHCPClient.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/servers/net/DHCPClient.cpp b/src/servers/net/DHCPClient.cpp index 850861a4cb..b3d4c1ab5c 100644 --- a/src/servers/net/DHCPClient.cpp +++ b/src/servers/net/DHCPClient.cpp @@ -85,14 +85,14 @@ enum message_option { enum message_type { DHCP_NONE = 0, - DHCP_DISCOVER, - DHCP_OFFER, - DHCP_REQUEST, - DHCP_DECLINE, - DHCP_ACK, - DHCP_NACK, - DHCP_RELEASE, - DHCP_INFORM + DHCP_DISCOVER = 1, + DHCP_OFFER = 2, + DHCP_REQUEST = 3, + DHCP_DECLINE = 4, + DHCP_ACK = 5, + DHCP_NACK = 6, + DHCP_RELEASE = 7, + DHCP_INFORM = 8 }; struct dhcp_option_cookie { @@ -913,7 +913,7 @@ DHCPClient::_TimeoutShift(int socket, dhcp_state& state, time_t& timeout, state = INIT; return false; } - + tries++; timeout += timeout; if (timeout > MAX_TIMEOUT)