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

nshlib/ifconfig: Let "dns" option depends on CONFIG_NETDB_DNSCLIENT

Browse Source 
"dns" option of `ifconfig` can work just with `CONFIG_NETDB_DNSCLIENT`,
no need to depend on `CONFIG_NETINIT_DNS` or `CONFIG_NETINIT_DHCPC`.

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2023-12-29 17:14:42 +08:00 committed by Xiang Xiao
parent d9b8a0ee62
commit 4c0bd143eb
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nshlib/nsh_netcmds.c
View File

@ -90,7 +90,7 @@
# endif # endif
#endif #endif
#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS) #ifdef CONFIG_NETINIT_DHCPC
# include "netutils/dhcpc.h" # include "netutils/dhcpc.h"
#endif #endif
@ -569,7 +569,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
#ifdef HAVE_HWADDR #ifdef HAVE_HWADDR
FAR char *hw = NULL; FAR char *hw = NULL;
#endif #endif
#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS) #ifdef CONFIG_NETDB_DNSCLIENT
FAR char *dns = NULL; FAR char *dns = NULL;
#endif #endif
#if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6) #if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)
@ -705,7 +705,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
} }
#endif #endif
#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS) #ifdef CONFIG_NETDB_DNSCLIENT
else if (!strcmp(tmp, "dns")) else if (!strcmp(tmp, "dns"))
{ {
if (argc - 1 >= i + 1) if (argc - 1 >= i + 1)
@ -994,7 +994,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
UNUSED(ifname); /* Not used in all configurations */ UNUSED(ifname); /* Not used in all configurations */
#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS) #ifdef CONFIG_NETDB_DNSCLIENT
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
if (inet6) if (inet6)
@ -1039,7 +1039,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
netlib_set_ipv4dnsaddr(&addr); netlib_set_ipv4dnsaddr(&addr);
} }
#endif /* CONFIG_NET_IPv4 */ #endif /* CONFIG_NET_IPv4 */
#endif /* CONFIG_NETINIT_DHCPC || CONFIG_NETINIT_DNS */ #endif /* CONFIG_NETDB_DNSCLIENT */
#if defined(CONFIG_NETINIT_DHCPC) #if defined(CONFIG_NETINIT_DHCPC)
/* Get the MAC address of the NIC */ /* Get the MAC address of the NIC */
@ -1074,10 +1074,12 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
netlib_set_dripv4addr("eth0", &ds.default_router); netlib_set_dripv4addr("eth0", &ds.default_router);
} }
#ifdef CONFIG_NETDB_DNSCLIENT
if (ds.dnsaddr.s_addr != 0) if (ds.dnsaddr.s_addr != 0)
{ {
netlib_set_ipv4dnsaddr(&ds.dnsaddr); netlib_set_ipv4dnsaddr(&ds.dnsaddr);
} }
#endif
dhcpc_close(handle); dhcpc_close(handle);
} }