GNUNET_a2s(sa, salen));
}
+
static void
check_localhost_num(void *cls, const char *hostname)
{
}
}
+
static void
check_localhost(void *cls, const char *hostname)
{
}
else
{
-#if DEBUG_RESOLVER
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received invalid hostname `%s'.\n", hostname);
-#endif
- GNUNET_break(0);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Received unexpected hostname `%s', expected `localhost' (this could be OK).\n",
+ hostname);
}
}
}
static void
-run(void *cls, struct GNUNET_SCHEDULER_Handle *sched, char * const *args,
+run(void *cls, char * const *args,
const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
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(sched, cfg, "localhost", AF_INET, timeout, &check_127,
- cls);
- GNUNET_RESOLVER_hostname_get(sched, cfg, (const struct sockaddr *) &sa,
- sizeof(struct sockaddr), GNUNET_YES, timeout, &check_localhost, cls);
- GNUNET_RESOLVER_hostname_get(sched, cfg, (const struct sockaddr *) &sa,
- sizeof(struct sockaddr), GNUNET_NO, timeout, &check_localhost_num, cls);
- GNUNET_RESOLVER_hostname_resolve(sched, 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
*/
-
- char const * rootserver_name = ROOTSERVER_NAME;
+ const char * rootserver_name = ROOTSERVER_NAME;
struct hostent *rootserver;
rootserver = gethostbyname(rootserver_name);
#endif
/* Resolve the same using GNUNET */
- GNUNET_RESOLVER_ip_get(sched, 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(sched, 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
int ok = 1 + 2 + 4 + 8;
char *fn;
char *pfx;
- pid_t pid;
+ struct GNUNET_OS_Process *proc;
char * const argv[] =
{ "test-resolver-api", "-c", "test_resolver_api_data.conf",
#if VERBOSE
pfx = GNUNET_OS_installation_get_path(GNUNET_OS_IPK_BINDIR);
GNUNET_asprintf(&fn, "%s%cgnunet-service-resolver", pfx, DIR_SEPARATOR);
GNUNET_free(pfx);
- pid = GNUNET_OS_start_process(NULL, NULL, fn, "gnunet-service-resolver",
+ proc = GNUNET_OS_start_process(NULL, NULL, fn, "gnunet-service-resolver",
#if VERBOSE
"-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));
- if (0 != PLIBC_KILL(pid, SIGTERM))
+ if (0 != GNUNET_OS_process_kill (proc, SIGTERM))
{
GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, "kill");
ok = 1;
}
- GNUNET_OS_process_wait(pid);
+ GNUNET_OS_process_wait (proc);
+ GNUNET_OS_process_close (proc);
+ proc = NULL;
if (ok != 0)
fprintf(stderr, "Missed some resolutions: %u\n", ok);
return ok;