sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes in DHCPc.

Browse Source
This commit is contained in:
Fotis Panagiotopoulos 2022-10-13 12:44:45 +03:00 committed by Petro Karashchenko
parent 6e3b402cf4
commit bcbf3ae89d
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netutils/dhcpc/dhcpc.c
View File

@ -689,7 +689,6 @@ int dhcpc_request(FAR void *handle, FAR struct dhcpc_state *presult)
{ {
FAR struct dhcpc_state_s *pdhcpc = (FAR struct dhcpc_state_s *)handle; FAR struct dhcpc_state_s *pdhcpc = (FAR struct dhcpc_state_s *)handle;
struct in_addr oldaddr; struct in_addr oldaddr;
struct in_addr newaddr;
ssize_t result; ssize_t result;
uint8_t msgtype; uint8_t msgtype;
int retries; int retries;
@ -703,16 +702,13 @@ int dhcpc_request(FAR void *handle, FAR struct dhcpc_state *presult)
pdhcpc->xid[3]++; pdhcpc->xid[3]++;
/* Save the currently assigned IP address (should be INADDR_ANY) */ /* Save the currently assigned IP address. It should be INADDR_ANY
* if this is the initial request, or a valid IP if this is a renewal.
*/
oldaddr.s_addr = 0; oldaddr.s_addr = 0;
netlib_get_ipv4addr(pdhcpc->interface, &oldaddr); netlib_get_ipv4addr(pdhcpc->interface, &oldaddr);
/* Set the IP address to INADDR_ANY. */
newaddr.s_addr = INADDR_ANY;
netlib_set_ipv4addr(pdhcpc->interface, &newaddr);
/* Loop sending the DISCOVER up to CONFIG_NETUTILS_DHCPC_RETRIES /* Loop sending the DISCOVER up to CONFIG_NETUTILS_DHCPC_RETRIES
* times * times
*/ */
@ -792,7 +788,7 @@ int dhcpc_request(FAR void *handle, FAR struct dhcpc_state *presult)
while (state == STATE_INITIAL && while (state == STATE_INITIAL &&
retries < CONFIG_NETUTILS_DHCPC_RETRIES); retries < CONFIG_NETUTILS_DHCPC_RETRIES);
/* If no DHCPOFFER recveived here, error out */ /* If no DHCPOFFER received here, error out */
if (state == STATE_INITIAL) if (state == STATE_INITIAL)
{ {
@ -851,6 +847,8 @@ int dhcpc_request(FAR void *handle, FAR struct dhcpc_state *presult)
else if (msgtype == DHCPNAK) else if (msgtype == DHCPNAK)
{ {
ninfo("Received NAK\n"); ninfo("Received NAK\n");
oldaddr.s_addr = INADDR_ANY;
netlib_set_ipv4addr(pdhcpc->interface, &oldaddr);
return ERROR; return ERROR;
} }
@ -893,7 +891,7 @@ int dhcpc_request(FAR void *handle, FAR struct dhcpc_state *presult)
while (state == STATE_HAVE_OFFER && while (state == STATE_HAVE_OFFER &&
retries < CONFIG_NETUTILS_DHCPC_RETRIES); retries < CONFIG_NETUTILS_DHCPC_RETRIES);
/* If no DHCPLEASE recveived here, error out */ /* If no DHCPLEASE received here, error out */
if (state != STATE_HAVE_LEASE) if (state != STATE_HAVE_LEASE)
{ {