Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-10-07 14:15:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

netutils/netlib: Encapsulate the dhcp configuration network code and modify at all calling locations

Browse source 
The DHCP configuration network code is called multiple times, so it is encapsulated

Signed-off-by: zhangshuai39 <zhangshuai39@xiaomi.com>
This commit is contained in:
zhangshuai39 2024-08-19 10:15:10 +08:00 • committed by Xiang Xiao
parent 054edfc653
commit 6d52a0fbc1
7 changed files with 199 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

50
netutils/netinit/netinit.c
View file

@ -34,15 +34,12 @@
#endif
#include <arpa/inet.h>
#include <assert.h>
#include <debug.h>
#include <net/if.h>
#include <netinet/in.h>
#include <pthread.h>
#include <sched.h>
#include <semaphore.h>
#include <signal.h>
#include <stdint.h>
#include <string.h>
#include <sys/ioctl.h>
#include <unistd.h>
@ -51,9 +48,6 @@
#include <sys/boardctl.h>
#include "netutils/netlib.h"
#if defined(CONFIG_NETUTILS_DHCPC) || defined(CONFIG_NETINIT_DNS)
# include "netutils/dhcpc.h"
#endif
#ifdef CONFIG_NET_6LOWPAN
# include <nuttx/net/sixlowpan.h>
@ -627,12 +621,6 @@ static void netinit_set_ipaddrs(void)
#if defined(NETINIT_HAVE_NETDEV) && !defined(CONFIG_NETINIT_NETLOCAL)
static void netinit_net_bringup(void)
{
#ifdef CONFIG_NETUTILS_DHCPC
uint8_t mac[IFHWADDRLEN];
struct dhcpc_state ds;
FAR void *handle;
#endif
/* Bring the network up. */
if (netlib_ifup(NET_DEVNAME) < 0)
@ -658,46 +646,10 @@ static void netinit_net_bringup(void)
#ifdef CONFIG_NETUTILS_DHCPC
if (g_use_dhcpc)
{
/* Get the MAC address of the NIC */
netlib_getmacaddr(NET_DEVNAME, mac);
/* Set up the DHCPC modules */
handle = dhcpc_open(NET_DEVNAME, &mac, IFHWADDRLEN);
if (handle == NULL)
if (netlib_obtain_ipv4addr(NET_DEVNAME) < 0)
{
return;
}
/* Get an IP address. Note that there is no logic for renewing the
* IP address in this example. The address should be renewed in
* (ds.lease_time / 2) seconds.
*/
if (dhcpc_request(handle, &ds) == OK)
{
netlib_set_ipv4addr(NET_DEVNAME, &ds.ipaddr);
if (ds.netmask.s_addr != 0)
{
netlib_set_ipv4netmask(NET_DEVNAME, &ds.netmask);
}
if (ds.default_router.s_addr != 0)
{
netlib_set_dripv4addr(NET_DEVNAME, &ds.default_router);
}
# ifdef CONFIG_NETINIT_DNS
if (ds.dnsaddr.s_addr != 0)
{
netlib_set_ipv4dnsaddr(&ds.dnsaddr);
}
# endif
}
dhcpc_close(handle);
}
#endif