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

apps/system/netdb would not build unless CONFIG_NETDB_HOSTFILE was defined because it needed gethostbyname. Noted by OrbitalFox

Browse Source
This commit is contained in:
Gregory Nutt 2015-08-21 09:29:38 -06:00
parent 64fb2c63b6
commit f73ee9d352
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@ -1400,4 +1400,9 @@
command line options (2015-08-17). command line options (2015-08-17).
* apps/examples/usbserial: Can now be run as an NSH builtin-function. * apps/examples/usbserial: Can now be run as an NSH builtin-function.
Now uses a configurable IO buffer size (2015-08-20). Now uses a configurable IO buffer size (2015-08-20).
* Various Kconfig files in netutils: Fix some changes from from
NETUTILS_DNSCLIENT to NETDB_DNSCLIENT. From Pavel Pisa (2015-08-20).
* system/netdb: Failed to build if CONFIG_NET_HOSTFILE was not defined
because gethostbyaddr() was not available. Noted by OrbitalFox
(2015-08-21).

13
system/netdb/netdb_main.c
View File

@ -65,6 +65,15 @@
# define CONFIG_SYSTEM_NETDB_PRIORITY 50 # define CONFIG_SYSTEM_NETDB_PRIORITY 50
#endif #endif
/* REVIST: Currently the availability of gethostbyaddr() depends on
* CONFIG_NETDB_HOSTFILE. That might not always be true, however.
*/
#undef HAVE_GETHOSTBYADDR
#ifdef CONFIG_NETDB_HOSTFILE
# define HAVE_GETHOSTBYADDR 1
#endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -73,8 +82,10 @@ static void show_usage(FAR const char *progname, int exitcode) noreturn_function
static void show_usage(FAR const char *progname, int exitcode) static void show_usage(FAR const char *progname, int exitcode)
{ {
fprintf(stderr, "USAGE: %s --ipv4 <ipv4-addr>\n", progname); fprintf(stderr, "USAGE: %s --ipv4 <ipv4-addr>\n", progname);
#ifdef HAVE_GETHOSTBYADDR
fprintf(stderr, " %s --ipv6 <ipv6-addr>\n", progname); fprintf(stderr, " %s --ipv6 <ipv6-addr>\n", progname);
fprintf(stderr, " %s --host <host-name>\n", progname); fprintf(stderr, " %s --host <host-name>\n", progname);
#endif
fprintf(stderr, " %s --help\n", progname); fprintf(stderr, " %s --help\n", progname);
exit(exitcode); exit(exitcode);
} }
@ -110,6 +121,7 @@ int netdb_main(int argc, char **argv)
show_usage(argv[0], EXIT_FAILURE); show_usage(argv[0], EXIT_FAILURE);
} }
#ifdef HAVE_GETHOSTBYADDR
/* Handle: netdb --ipv4 <ipv4-addr> */ /* Handle: netdb --ipv4 <ipv4-addr> */
else if (strcmp(argv[1], "--ipv4") == 0) else if (strcmp(argv[1], "--ipv4") == 0)
@ -161,6 +173,7 @@ int netdb_main(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }
#endif /* HAVE_GETHOSTBYADDR */
/* Handle: netdb --host <host-name> */ /* Handle: netdb --host <host-name> */