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

netutils/dhcpc: Make the network device name a configuration option. Was hardcoded to eth0 but may, instead, need to be wlan0

Browse Source
This commit is contained in:
Gregory Nutt 2017-05-02 08:20:05 -06:00
parent 5b7f2b0ce2
commit 4ba1f8665d
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netutils/dhcpc/Kconfig
View File

@ -11,4 +11,12 @@ config NETUTILS_DHCPC
Enable support for the DHCP client. Enable support for the DHCP client.
if NETUTILS_DHCPC if NETUTILS_DHCPC
config NETUTILS_DHCPC_DEVNAME
string "DHCP device name"
default "eth0"
depends on NET_UDP && NET_BROADCAST && NET_IPv4
---help---
Specify the Ethernet or IEEE 802.15.4 device to use.
endif endif

18
netutils/dhcpc/dhcpc.c
View File

@ -61,6 +61,16 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration */
#ifdef CONFIG_NETUTILS_DHCPC_DEVNAME
# define DEVNAME CONFIG_NETUTILS_DHCPC_DEVNAME
#else
# define DEVNAME "eth0"
#endif
/* DHCP Definitions */
#define STATE_INITIAL 0 #define STATE_INITIAL 0
#define STATE_HAVE_OFFER 1 #define STATE_HAVE_OFFER 1
#define STATE_HAVE_LEASE 2 #define STATE_HAVE_LEASE 2
@ -447,7 +457,7 @@ int dhcpc_request(void *handle, struct dhcpc_state *presult)
/* Save the currently assigned IP address (should be INADDR_ANY) */ /* Save the currently assigned IP address (should be INADDR_ANY) */
oldaddr.s_addr = 0; oldaddr.s_addr = 0;
netlib_get_ipv4addr("eth0", &oldaddr); netlib_get_ipv4addr(DEVNAME, &oldaddr);
/* Loop until we receive the lease (or an error occurs) */ /* Loop until we receive the lease (or an error occurs) */
@ -456,7 +466,7 @@ int dhcpc_request(void *handle, struct dhcpc_state *presult)
/* Set the IP address to INADDR_ANY. */ /* Set the IP address to INADDR_ANY. */
newaddr.s_addr = INADDR_ANY; newaddr.s_addr = INADDR_ANY;
(void)netlib_set_ipv4addr("eth0", &newaddr); (void)netlib_set_ipv4addr(DEVNAME, &newaddr);
/* Loop sending DISCOVER until we receive an OFFER from a DHCP /* Loop sending DISCOVER until we receive an OFFER from a DHCP
* server. We will lock on to the first OFFER and decline any * server. We will lock on to the first OFFER and decline any
@ -496,7 +506,7 @@ int dhcpc_request(void *handle, struct dhcpc_state *presult)
* out of the loop. * out of the loop.
*/ */
(void)netlib_set_ipv4addr("eth0", &presult->ipaddr); (void)netlib_set_ipv4addr(DEVNAME, &presult->ipaddr);
state = STATE_HAVE_OFFER; state = STATE_HAVE_OFFER;
} }
} }
@ -588,7 +598,7 @@ int dhcpc_request(void *handle, struct dhcpc_state *presult)
{ {
/* An error other than a timeout was received */ /* An error other than a timeout was received */
(void)netlib_set_ipv4addr("eth0", &oldaddr); (void)netlib_set_ipv4addr(DEVNAME, &oldaddr);
return ERROR; return ERROR;
} }
} }