diff options
Diffstat (limited to 'src/util/gnunet-service-resolver.c')
-rw-r--r-- | src/util/gnunet-service-resolver.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c index ec56292a8..ebfdc7c4c 100644 --- a/src/util/gnunet-service-resolver.c +++ b/src/util/gnunet-service-resolver.c | |||
@@ -365,10 +365,11 @@ getaddrinfo_resolve (struct GNUNET_SERVER_TransmitContext *tc, | |||
365 | freeaddrinfo (result); | 365 | freeaddrinfo (result); |
366 | return GNUNET_OK; | 366 | return GNUNET_OK; |
367 | } | 367 | } |
368 | #endif | ||
369 | 368 | ||
370 | 369 | ||
371 | #if HAVE_GETHOSTBYNAME2 | 370 | #elif HAVE_GETHOSTBYNAME2 |
371 | |||
372 | |||
372 | static int | 373 | static int |
373 | gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc, | 374 | gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc, |
374 | const char *hostname, | 375 | const char *hostname, |
@@ -424,10 +425,10 @@ gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc, | |||
424 | } | 425 | } |
425 | return GNUNET_OK; | 426 | return GNUNET_OK; |
426 | } | 427 | } |
427 | #endif | 428 | |
429 | #elif HAVE_GETHOSTBYNAME | ||
428 | 430 | ||
429 | 431 | ||
430 | #if HAVE_GETHOSTBYNAME | ||
431 | static int | 432 | static int |
432 | gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc, | 433 | gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc, |
433 | const char *hostname) | 434 | const char *hostname) |
@@ -478,12 +479,10 @@ get_ip_from_hostname (struct GNUNET_SERVER_Client *client, | |||
478 | #if HAVE_GETADDRINFO | 479 | #if HAVE_GETADDRINFO |
479 | if (ret == GNUNET_NO) | 480 | if (ret == GNUNET_NO) |
480 | ret = getaddrinfo_resolve (tc, hostname, af); | 481 | ret = getaddrinfo_resolve (tc, hostname, af); |
481 | #endif | 482 | #elif HAVE_GETHOSTBYNAME2 |
482 | #if HAVE_GETHOSTBYNAME2 | ||
483 | if (ret == GNUNET_NO) | 483 | if (ret == GNUNET_NO) |
484 | ret = gethostbyname2_resolve (tc, hostname, af); | 484 | ret = gethostbyname2_resolve (tc, hostname, af); |
485 | #endif | 485 | #elif HAVE_GETHOSTBYNAME |
486 | #if HAVE_GETHOSTBYNAME | ||
487 | if ((ret == GNUNET_NO) && ((af == AF_UNSPEC) || (af == PF_INET))) | 486 | if ((ret == GNUNET_NO) && ((af == AF_UNSPEC) || (af == PF_INET))) |
488 | gethostbyname_resolve (tc, hostname); | 487 | gethostbyname_resolve (tc, hostname); |
489 | #endif | 488 | #endif |