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

dhcpc: Rename timeout Kconfig

Browse Source 
NETUTILS_DHCPC_RECV_TIMEOUT -> NETUTILS_DHCPC_RECV_TIMEOUT_MS

Recently its unit has been changed from second to millisecond. [1]
Using the same Kconfig name for a different meaning is a pitfall
for an upgrade. I was using 3ms timeout because of this.

This commit renames it so that at least the default value
is used for a careless user like me.

[1]
```
commit 8fd4b6105be2a535ecea2312858602d9ffa4e670
Author: zrrong <zrrong@bouffalolab.com>
Date:   Fri May 27 11:35:23 2022 +0800

    netutils/dhcpc: Change the timeout unit to milliseconds
```
This commit is contained in:
YAMAMOTO Takashi 2022-07-07 17:08:50 +09:00 committed by Xiang Xiao
parent ca4ef69661
commit 83505e217b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netutils/dhcpc/Kconfig
View File

@ -17,7 +17,7 @@ config NETUTILS_DHCPC_HOST_NAME
string "DHCP client host name" string "DHCP client host name"
default "nuttx" default "nuttx"
config NETUTILS_DHCPC_RECV_TIMEOUT config NETUTILS_DHCPC_RECV_TIMEOUT_MS
int "Number of receive timeout in millisecond" int "Number of receive timeout in millisecond"
default 3000 default 3000
---help--- ---help---

4
netutils/dhcpc/dhcpc.c
View File

@ -552,8 +552,8 @@ FAR void *dhcpc_open(FAR const char *interface, FAR const void *macaddr,
/* Configure for read timeouts */ /* Configure for read timeouts */
tv.tv_sec = CONFIG_NETUTILS_DHCPC_RECV_TIMEOUT / 1000; tv.tv_sec = CONFIG_NETUTILS_DHCPC_RECV_TIMEOUT_MS / 1000;
tv.tv_usec = (CONFIG_NETUTILS_DHCPC_RECV_TIMEOUT % 1000) * 1000; tv.tv_usec = (CONFIG_NETUTILS_DHCPC_RECV_TIMEOUT_MS % 1000) * 1000;
ret = setsockopt(pdhcpc->sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, ret = setsockopt(pdhcpc->sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv,
sizeof(struct timeval)); sizeof(struct timeval));