From b20a0916d8711fd3fb448dc5d4febee9d7a6331c Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Wed, 25 Nov 2009 14:40:39 +0000 Subject: [PATCH] daemon/Win32: Use gnulib getaddrinfo module. --- daemon/.gitignore | 5 +++++ daemon/guestfsd.c | 5 +++++ daemon/m4/gnulib-cache.m4 | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/daemon/.gitignore b/daemon/.gitignore index 0cc1e13..ac1b47b 100644 --- a/daemon/.gitignore +++ b/daemon/.gitignore @@ -32,6 +32,7 @@ m4/float_h.m4 m4/fnmatch.m4 m4/fsusage.m4 m4/futimens.m4 +m4/getaddrinfo.m4 m4/getcwd-abort-bug.m4 m4/getcwd-path-max.m4 m4/getcwd.m4 @@ -49,7 +50,9 @@ m4/gnulib-common.m4 m4/gnulib-comp.m4 m4/gnulib-tool.m4 m4/hash.m4 +m4/hostent.m4 m4/include_next.m4 +m4/inet_ntop.m4 m4/inet_pton.m4 m4/inline.m4 m4/intmax_t.m4 @@ -96,11 +99,13 @@ m4/safe-read.m4 m4/safe-write.m4 m4/save-cwd.m4 m4/select.m4 +m4/servent.m4 m4/size_max.m4 m4/sleep.m4 m4/sockets.m4 m4/socklen.m4 m4/sockpfaf.m4 +m4/snprintf.m4 m4/ssize_t.m4 m4/stat-time.m4 m4/stat.m4 diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c index eab8529..e6384d2 100644 --- a/daemon/guestfsd.c +++ b/daemon/guestfsd.c @@ -51,6 +51,11 @@ static char *read_cmdline (void); #define GUESTFWD_ADDR "10.0.2.4" #define GUESTFWD_PORT "6666" +/* This is only a hint. If not defined, ignore it. */ +#ifndef AI_ADDRCONFIG +#define AI_ADDRCONFIG 0 +#endif + int verbose = 0; static int print_shell_quote (FILE *stream, const struct printf_info *info, const void *const *args); diff --git a/daemon/m4/gnulib-cache.m4 b/daemon/m4/gnulib-cache.m4 index a9b19e9..0518e85 100644 --- a/daemon/m4/gnulib-cache.m4 +++ b/daemon/m4/gnulib-cache.m4 @@ -15,7 +15,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --no-libtool --macro-prefix=gl c-ctype fsusage futimens getline glob hash ignore-value manywarnings mkdtemp netdb openat readlink select sleep strchrnul strndup sys_select sys_wait vasprintf warnings +# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --no-libtool --macro-prefix=gl c-ctype fsusage futimens getaddrinfo getline glob hash ignore-value manywarnings mkdtemp netdb openat readlink select sleep strchrnul strndup sys_select sys_wait vasprintf warnings # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) @@ -23,6 +23,7 @@ gl_MODULES([ c-ctype fsusage futimens + getaddrinfo getline glob hash -- 1.8.3.1