Skip to content

Commit 4c0bd14

Browse files
wengzhexiaoxiang781216
authored andcommitted
nshlib/ifconfig: Let "dns" option depends on CONFIG_NETDB_DNSCLIENT
"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>
1 parent d9b8a0e commit 4c0bd14

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

nshlib/nsh_netcmds.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
# endif
9191
#endif
9292

93-
#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS)
93+
#ifdef CONFIG_NETINIT_DHCPC
9494
# include "netutils/dhcpc.h"
9595
#endif
9696

@@ -569,7 +569,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
569569
#ifdef HAVE_HWADDR
570570
FAR char *hw = NULL;
571571
#endif
572-
#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS)
572+
#ifdef CONFIG_NETDB_DNSCLIENT
573573
FAR char *dns = NULL;
574574
#endif
575575
#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)
705705
}
706706
#endif
707707

708-
#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS)
708+
#ifdef CONFIG_NETDB_DNSCLIENT
709709
else if (!strcmp(tmp, "dns"))
710710
{
711711
if (argc - 1 >= i + 1)
@@ -994,7 +994,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
994994

995995
UNUSED(ifname); /* Not used in all configurations */
996996

997-
#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS)
997+
#ifdef CONFIG_NETDB_DNSCLIENT
998998
#ifdef CONFIG_NET_IPv6
999999
#ifdef CONFIG_NET_IPv4
10001000
if (inet6)
@@ -1039,7 +1039,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
10391039
netlib_set_ipv4dnsaddr(&addr);
10401040
}
10411041
#endif /* CONFIG_NET_IPv4 */
1042-
#endif /* CONFIG_NETINIT_DHCPC || CONFIG_NETINIT_DNS */
1042+
#endif /* CONFIG_NETDB_DNSCLIENT */
10431043

10441044
#if defined(CONFIG_NETINIT_DHCPC)
10451045
/* 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)
10741074
netlib_set_dripv4addr("eth0", &ds.default_router);
10751075
}
10761076

1077+
#ifdef CONFIG_NETDB_DNSCLIENT
10771078
if (ds.dnsaddr.s_addr != 0)
10781079
{
10791080
netlib_set_ipv4dnsaddr(&ds.dnsaddr);
10801081
}
1082+
#endif
10811083

10821084
dhcpc_close(handle);
10831085
}

0 commit comments

Comments
 (0)