|
90 | 90 | # endif
|
91 | 91 | #endif
|
92 | 92 |
|
93 |
| -#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS) |
| 93 | +#ifdef CONFIG_NETINIT_DHCPC |
94 | 94 | # include "netutils/dhcpc.h"
|
95 | 95 | #endif
|
96 | 96 |
|
@@ -569,7 +569,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
|
569 | 569 | #ifdef HAVE_HWADDR
|
570 | 570 | FAR char *hw = NULL;
|
571 | 571 | #endif
|
572 |
| -#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS) |
| 572 | +#ifdef CONFIG_NETDB_DNSCLIENT |
573 | 573 | FAR char *dns = NULL;
|
574 | 574 | #endif
|
575 | 575 | #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)
|
705 | 705 | }
|
706 | 706 | #endif
|
707 | 707 |
|
708 |
| -#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS) |
| 708 | +#ifdef CONFIG_NETDB_DNSCLIENT |
709 | 709 | else if (!strcmp(tmp, "dns"))
|
710 | 710 | {
|
711 | 711 | if (argc - 1 >= i + 1)
|
@@ -994,7 +994,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
|
994 | 994 |
|
995 | 995 | UNUSED(ifname); /* Not used in all configurations */
|
996 | 996 |
|
997 |
| -#if defined(CONFIG_NETINIT_DHCPC) || defined(CONFIG_NETINIT_DNS) |
| 997 | +#ifdef CONFIG_NETDB_DNSCLIENT |
998 | 998 | #ifdef CONFIG_NET_IPv6
|
999 | 999 | #ifdef CONFIG_NET_IPv4
|
1000 | 1000 | if (inet6)
|
@@ -1039,7 +1039,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
|
1039 | 1039 | netlib_set_ipv4dnsaddr(&addr);
|
1040 | 1040 | }
|
1041 | 1041 | #endif /* CONFIG_NET_IPv4 */
|
1042 |
| -#endif /* CONFIG_NETINIT_DHCPC || CONFIG_NETINIT_DNS */ |
| 1042 | +#endif /* CONFIG_NETDB_DNSCLIENT */ |
1043 | 1043 |
|
1044 | 1044 | #if defined(CONFIG_NETINIT_DHCPC)
|
1045 | 1045 | /* 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)
|
1074 | 1074 | netlib_set_dripv4addr("eth0", &ds.default_router);
|
1075 | 1075 | }
|
1076 | 1076 |
|
| 1077 | +#ifdef CONFIG_NETDB_DNSCLIENT |
1077 | 1078 | if (ds.dnsaddr.s_addr != 0)
|
1078 | 1079 | {
|
1079 | 1080 | netlib_set_ipv4dnsaddr(&ds.dnsaddr);
|
1080 | 1081 | }
|
| 1082 | +#endif |
1081 | 1083 |
|
1082 | 1084 | dhcpc_close(handle);
|
1083 | 1085 | }
|
|
0 commit comments