GNUNET_a2s(sa, salen));
}
+
static void
check_localhost_num(void *cls, const char *hostname)
{
}
}
+
static void
check_localhost(void *cls, const char *hostname)
{
int *ok = cls;
struct sockaddr_in sa;
struct GNUNET_TIME_Relative timeout = GNUNET_TIME_relative_multiply(
- GNUNET_TIME_UNIT_MILLISECONDS, 2500);
+ GNUNET_TIME_UNIT_SECONDS, 30);
int count_ips = 0;
char * own_fqdn;
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ sa.sin_len = (u_char) sizeof (sa);
+#endif
sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- GNUNET_RESOLVER_ip_get(cfg, "localhost", AF_INET, timeout, &check_127,
- cls);
- GNUNET_RESOLVER_hostname_get(cfg, (const struct sockaddr *) &sa,
- sizeof(struct sockaddr), GNUNET_YES, timeout, &check_localhost, cls);
- GNUNET_RESOLVER_hostname_get(cfg, (const struct sockaddr *) &sa,
- sizeof(struct sockaddr), GNUNET_NO, timeout, &check_localhost_num, cls);
- GNUNET_RESOLVER_hostname_resolve(cfg, AF_UNSPEC, timeout,
- &check_hostname, cls);
-
/*
* Looking up our own fqdn
* Testing non-local DNS resolution
* DNS rootserver to test: a.root-servers.net - 198.41.0.4
*/
-
const char * rootserver_name = ROOTSERVER_NAME;
struct hostent *rootserver;
#endif
/* Resolve the same using GNUNET */
- GNUNET_RESOLVER_ip_get(cfg, ROOTSERVER_NAME, AF_INET, timeout,
+ GNUNET_RESOLVER_ip_get(ROOTSERVER_NAME, AF_INET, timeout,
&check_rootserver_ip, cls);
/*
}
#if DEBUG_RESOLVER
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "System's own reverse name resolution is working\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "System's own reverse name resolution is working\n");
#endif
- /* Resolve the same using GNUNET */
+ /* Resolve the same using GNUNET */
memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ sa.sin_len = (u_char) sizeof (sa);
+#endif
#ifndef MINGW
inet_aton(ROOTSERVER_IP, &sa.sin_addr);
#else
sa.sin_addr.S_un.S_addr = inet_addr(ROOTSERVER_IP);
#endif
- GNUNET_RESOLVER_hostname_get(cfg, (const struct sockaddr *) &sa,
+ GNUNET_RESOLVER_hostname_get((const struct sockaddr *) &sa,
sizeof(struct sockaddr), GNUNET_YES, timeout, &check_rootserver_name, cls);
+
+ memset(&sa, 0, sizeof(sa));
+ sa.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+ sa.sin_len = (u_char) sizeof (sa);
+#endif
+ sa.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+ GNUNET_RESOLVER_ip_get("localhost", AF_INET, timeout, &check_127,
+ cls);
+ GNUNET_RESOLVER_hostname_get((const struct sockaddr *) &sa,
+ sizeof(struct sockaddr), GNUNET_YES, timeout, &check_localhost, cls);
+
+ GNUNET_RESOLVER_hostname_get((const struct sockaddr *) &sa,
+ sizeof(struct sockaddr), GNUNET_NO, timeout, &check_localhost_num, cls);
+ GNUNET_RESOLVER_hostname_resolve(AF_UNSPEC, timeout,
+ &check_hostname, cls);
+
}
static int
"-L", "DEBUG",
#endif
"-c", "test_resolver_api_data.conf", NULL);
+ GNUNET_assert (NULL != proc);
GNUNET_free(fn);
GNUNET_assert(GNUNET_OK == GNUNET_PROGRAM_run((sizeof(argv) / sizeof(char *))
- 1, argv, "test-resolver-api", "nohelp", options, &run, &ok));