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

examples/dhcpd: reuse the router ip/mask from dhcpd lib

Browse Source 
Change-Id: I6a9a783b9d9c8b9a4e56a885232a759f0adaeccb
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2020-05-09 14:29:24 +08:00 committed by patacongo
parent 018c9420ac
commit 3aefe08cba
3 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/README.txt
View File

@ -249,9 +249,6 @@ examples/dhcpd
CONFIG_NETUTILS_NETLIB=y - The networking library is needed CONFIG_NETUTILS_NETLIB=y - The networking library is needed
CONFIG_EXAMPLES_DHCPD_NOMAC - (May be defined to use software assigned MAC) CONFIG_EXAMPLES_DHCPD_NOMAC - (May be defined to use software assigned MAC)
CONFIG_EXAMPLES_DHCPD_IPADDR - Target IP address
CONFIG_EXAMPLES_DHCPD_DRIPADDR - Default router IP address
CONFIG_EXAMPLES_DHCPD_NETMASK - Network mask
See also CONFIG_NETUTILS_DHCPD_* settings described elsewhere See also CONFIG_NETUTILS_DHCPD_* settings described elsewhere
and used in netutils/dhcpd/dhcpd.c. These settings are required and used in netutils/dhcpd/dhcpd.c. These settings are required

12
examples/dhcpd/Kconfig
View File

@ -15,16 +15,4 @@ config EXAMPLES_DHCPD_NOMAC
bool "Use Canned MAC Address" bool "Use Canned MAC Address"
default n default n
config EXAMPLES_DHCPD_IPADDR
hex "Target IP address"
default 0x0a000002
config EXAMPLES_DHCPD_DRIPADDR
hex "Default Router IP address (Gateway)"
default 0x0a000001
config EXAMPLES_DHCPD_NETMASK
hex "Network Mask"
default 0xffffff00
endif endif

18
examples/dhcpd/dhcpd_daemon.c
View File

@ -44,18 +44,6 @@
* but there are default values for those so we cannot check them here. * but there are default values for those so we cannot check them here.
*/ */
#ifndef CONFIG_EXAMPLES_DHCPD_IPADDR
# error "You must define CONFIG_EXAMPLES_DHCPD_IPADDR"
#endif
#ifndef CONFIG_EXAMPLES_DHCPD_DRIPADDR
# error "You must define CONFIG_EXAMPLES_DHCPD_DRIPADDR"
#endif
#ifndef CONFIG_EXAMPLES_DHCPD_NETMASK
# error "You must define CONFIG_EXAMPLES_DHCPD_NETMASK"
#endif
#ifndef CONFIG_NET #ifndef CONFIG_NET
# error "You must define CONFIG_NET" # error "You must define CONFIG_NET"
#endif #endif
@ -122,17 +110,17 @@ int dhcpd_daemon(int argc, FAR char *argv[], bool daemon)
/* Set up our host address */ /* Set up our host address */
addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_IPADDR); addr.s_addr = HTONL(CONFIG_NETUTILS_DHCPD_ROUTERIP);
netlib_set_ipv4addr(devname, &addr); netlib_set_ipv4addr(devname, &addr);
/* Set up the default router address */ /* Set up the default router address */
addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_DRIPADDR); addr.s_addr = HTONL(CONFIG_NETUTILS_DHCPD_ROUTERIP);
netlib_set_dripv4addr(devname, &addr); netlib_set_dripv4addr(devname, &addr);
/* Setup the subnet mask */ /* Setup the subnet mask */
addr.s_addr = HTONL(CONFIG_EXAMPLES_DHCPD_NETMASK); addr.s_addr = HTONL(CONFIG_NETUTILS_DHCPD_NETMASK);
netlib_set_ipv4netmask(devname, &addr); netlib_set_ipv4netmask(devname, &addr);
/* New versions of netlib_set_ipvXaddr will not bring the network up, /* New versions of netlib_set_ipvXaddr will not bring the network up,