patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net/dhcpv4: Adjust state names to reflect rfc2131

Browse source 
The dhcpv4 state machine implementation names differ from the names
used by the relevant rfc.  There is no good reason for them to be
different, so rename them.

Change-Id: I837f1bc4788c0ed4d2949b12eb6f5bfeef9a0be8
Signed-off-by: Marcus Shawcroft <marcus.shawcroft@arm.com>
This commit is contained in:
Marcus Shawcroft 2017-02-11 16:40:34 +00:00 committed by Jukka Rissanen
parent 1f279e13b3
commit b840664c11
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/net/dhcpv4.h
View file

@ -27,10 +27,10 @@
*/
enum net_dhcpv4_state {
NET_DHCPV4_INIT,
NET_DHCPV4_DISCOVER,
NET_DHCPV4_REQUEST,
NET_DHCPV4_RENEWAL,
NET_DHCPV4_ACK,
NET_DHCPV4_SELECTING,
NET_DHCPV4_REQUESTING,
NET_DHCPV4_RENEWING,
NET_DHCPV4_BOUND,
};
/**

32
subsys/net/ip/dhcpv4.c
View file

@ -121,10 +121,10 @@ const char *net_dhcpv4_state_name(enum net_dhcpv4_state state)
{
static const char * const name[] = {
"init",
"discover",
"request",
"renewal",
"ack"
"selecting",
"requesting",
"renewing",
"bound",
};
__ASSERT_NO_MSG(state >= 0 && state < sizeof(name));
@ -391,9 +391,9 @@ static void send_request(struct net_if *iface, bool renewal)
}
if (renewal) {
iface->dhcpv4.state = NET_DHCPV4_RENEWAL;
iface->dhcpv4.state = NET_DHCPV4_RENEWING;
} else {
iface->dhcpv4.state = NET_DHCPV4_REQUEST;
iface->dhcpv4.state = NET_DHCPV4_REQUESTING;
}
timeout = DHCPV4_INITIAL_RETRY_TIMEOUT << iface->dhcpv4.attempts;
@ -442,7 +442,7 @@ static void send_discover(struct net_if *iface)
timeout = DHCPV4_INITIAL_RETRY_TIMEOUT << iface->dhcpv4.attempts;
iface->dhcpv4.state = NET_DHCPV4_DISCOVER;
iface->dhcpv4.state = NET_DHCPV4_SELECTING;
NET_DBG("enter state=%s xid=0x%"PRIx32" timeout=%"PRIu32"s",
net_dhcpv4_state_name(iface->dhcpv4.state),
@ -478,11 +478,11 @@ static void dhcpv4_timeout(struct k_work *work)
/* Send an initial discover */
send_discover(iface);
break;
case NET_DHCPV4_DISCOVER:
case NET_DHCPV4_SELECTING:
/* Failed to get OFFER message, send DISCOVER again */
send_discover(iface);
break;
case NET_DHCPV4_REQUEST:
case NET_DHCPV4_REQUESTING:
/* Maximum number of renewal attempts failed, so start
* from the beginning.
*/
@ -495,7 +495,7 @@ static void dhcpv4_timeout(struct k_work *work)
send_request(iface, false);
}
break;
case NET_DHCPV4_RENEWAL:
case NET_DHCPV4_RENEWING:
if (iface->dhcpv4.attempts >= DHCPV4_MAX_NUMBER_OF_ATTEMPTS) {
iface->dhcpv4.attempts = 0;
NET_DBG("too many attempts, restart");
@ -695,7 +695,7 @@ static inline void handle_dhcpv4_reply(struct net_if *iface,
* receives multiple OFFER messages, first one will be handled.
* Rest of the replies are discarded.
*/
if (iface->dhcpv4.state == NET_DHCPV4_DISCOVER) {
if (iface->dhcpv4.state == NET_DHCPV4_SELECTING) {
if (msg_type != DHCPV4_MSG_TYPE_OFFER) {
NET_DBG("Reply ignored");
return;
@ -707,8 +707,8 @@ static inline void handle_dhcpv4_reply(struct net_if *iface,
iface->dhcpv4.attempts = 0;
send_request(iface, false);
} else if (iface->dhcpv4.state == NET_DHCPV4_REQUEST ||
iface->dhcpv4.state == NET_DHCPV4_RENEWAL) {
} else if (iface->dhcpv4.state == NET_DHCPV4_REQUESTING ||
iface->dhcpv4.state == NET_DHCPV4_RENEWING) {
uint32_t timeout;
if (msg_type != DHCPV4_MSG_TYPE_ACK) {
@ -721,7 +721,7 @@ static inline void handle_dhcpv4_reply(struct net_if *iface,
iface->dhcpv4.attempts = 0;
switch (iface->dhcpv4.state) {
case NET_DHCPV4_REQUEST:
case NET_DHCPV4_REQUESTING:
NET_INFO("Received: %s",
net_sprint_ipv4_addr(
&iface->dhcpv4.requested_ip));
@ -735,7 +735,7 @@ static inline void handle_dhcpv4_reply(struct net_if *iface,
}
break;
case NET_DHCPV4_RENEWAL:
case NET_DHCPV4_RENEWING:
/* TODO: If the renewal is success, update only
* vlifetime on iface.
*/
@ -745,7 +745,7 @@ static inline void handle_dhcpv4_reply(struct net_if *iface,
}
timeout = get_dhcpv4_renewal_time(iface);
iface->dhcpv4.state = NET_DHCPV4_ACK;
iface->dhcpv4.state = NET_DHCPV4_BOUND;
NET_DBG("enter state=%s timeout=%"PRIu32"s",
net_dhcpv4_state_name(iface->dhcpv4.state),
timeout);