From f513c42604b7539368faab72993459fda9d9e711 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 1 Apr 2010 09:17:55 +0000 Subject: [PATCH] --- src/util/test_resolver_api.c | 310 ++++++++++++++++------------------- 1 file changed, 144 insertions(+), 166 deletions(-) diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c index 30b455aed..5802370e3 100644 --- a/src/util/test_resolver_api.c +++ b/src/util/test_resolver_api.c @@ -1,22 +1,22 @@ /* - This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) - - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 2, or (at your - option) any later version. - - GNUnet is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ + This file is part of GNUnet. + (C) 2009 Christian Grothoff (and other contributing authors) + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 2, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ /** * @file resolver/test_resolver_api.c * @brief testcase for resolver_api.c @@ -41,7 +41,7 @@ #define ROOTSERVER_IP "198.41.0.4" static void -check_hostname (void *cls, const struct sockaddr *sa, socklen_t salen) +check_hostname(void *cls, const struct sockaddr *sa, socklen_t salen) { int *ok = cls; @@ -50,23 +50,21 @@ check_hostname (void *cls, const struct sockaddr *sa, socklen_t salen) (*ok) &= ~8; return; } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Got IP address `%s' for our host.\n"), - GNUNET_a2s (sa, salen)); + GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Got IP address `%s' for our host.\n"), + GNUNET_a2s(sa, salen)); } - static void -check_localhost_num (void *cls, const char *hostname) +check_localhost_num(void *cls, const char *hostname) { int *ok = cls; if (hostname == NULL) return; - if (0 == strcmp (hostname, "127.0.0.1")) + if (0 == strcmp(hostname, "127.0.0.1")) { #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received correct hostname `%s'.\n", hostname); + "Received correct hostname `%s'.\n", hostname); #endif (*ok) &= ~4; } @@ -74,23 +72,23 @@ check_localhost_num (void *cls, const char *hostname) { #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received invalid hostname `%s'.\n", hostname); + "Received invalid hostname `%s'.\n", hostname); #endif - GNUNET_break (0); + GNUNET_break(0); } } static void -check_localhost (void *cls, const char *hostname) +check_localhost(void *cls, const char *hostname) { int *ok = cls; if (hostname == NULL) return; - if (0 == strcmp (hostname, "localhost")) + if (0 == strcmp(hostname, "localhost")) { #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received correct hostname `%s'.\n", hostname); + "Received correct hostname `%s'.\n", hostname); #endif (*ok) &= ~2; } @@ -98,22 +96,22 @@ check_localhost (void *cls, const char *hostname) { #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received invalid hostname `%s'.\n", hostname); + "Received invalid hostname `%s'.\n", hostname); #endif - GNUNET_break (0); + GNUNET_break(0); } } static void -check_127 (void *cls, const struct sockaddr *sa, socklen_t salen) +check_127(void *cls, const struct sockaddr *sa, socklen_t salen) { int *ok = cls; const struct sockaddr_in *sai = (const struct sockaddr_in *) sa; if (sa == NULL) return; - GNUNET_assert (sizeof (struct sockaddr_in) == salen); - if (sai->sin_addr.s_addr == htonl (INADDR_LOOPBACK)) + GNUNET_assert(sizeof(struct sockaddr_in) == salen); + if (sai->sin_addr.s_addr == htonl(INADDR_LOOPBACK)) { #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct address.\n"); @@ -125,21 +123,21 @@ check_127 (void *cls, const struct sockaddr *sa, socklen_t salen) #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received incorrect address.\n"); #endif - GNUNET_break (0); + GNUNET_break(0); } } static void -check_rootserver_ip (void *cls, const struct sockaddr *sa, socklen_t salen) +check_rootserver_ip(void *cls, const struct sockaddr *sa, socklen_t salen) { int *ok = cls; const struct sockaddr_in *sai = (const struct sockaddr_in *) sa; if (sa == NULL) return; - GNUNET_assert (sizeof (struct sockaddr_in) == salen); - - if ( 0 == strcmp(inet_ntoa(sai->sin_addr),ROOTSERVER_IP)) + GNUNET_assert(sizeof(struct sockaddr_in) == salen); + + if (0 == strcmp(inet_ntoa(sai->sin_addr), ROOTSERVER_IP)) { #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received correct rootserver ip address.\n"); @@ -151,22 +149,22 @@ check_rootserver_ip (void *cls, const struct sockaddr *sa, socklen_t salen) #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received incorrect rootserver ip address.\n"); #endif - GNUNET_break (0); + GNUNET_break(0); } } static void -check_rootserver_name (void *cls, const char *hostname) +check_rootserver_name(void *cls, const char *hostname) { int *ok = cls; if (hostname == NULL) - return; - - if (0 == strcmp (hostname, ROOTSERVER_NAME)) + return; + + if (0 == strcmp(hostname, ROOTSERVER_NAME)) { #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received correct rootserver hostname `%s'.\n", hostname); + "Received correct rootserver hostname `%s'.\n", hostname); #endif (*ok) &= ~2; } @@ -174,200 +172,180 @@ check_rootserver_name (void *cls, const char *hostname) { #if DEBUG_RESOLVER GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received invalid rootserver hostname `%s'.\n", hostname); + "Received invalid rootserver hostname `%s'.\n", hostname); #endif - GNUNET_break (0); + GNUNET_break(0); } } static void -run (void *cls, - struct GNUNET_SCHEDULER_Handle *sched, - char *const *args, - const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) +run(void *cls, struct GNUNET_SCHEDULER_Handle *sched, char * const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { struct sockaddr_in sa; - struct GNUNET_TIME_Relative timeout = - GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, - 2500); - int count_ips =0 ; + struct GNUNET_TIME_Relative timeout = GNUNET_TIME_relative_multiply( + GNUNET_TIME_UNIT_MILLISECONDS, 2500); + int count_ips = 0; - memset (&sa, 0, sizeof (sa)); + memset(&sa, 0, sizeof(sa)); sa.sin_family = AF_INET; - 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); + 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); /* * Testing non-local DNS resolution * DNS rootserver to test: a.root-servers.net - 198.41.0.4 */ - + char const * rootserver_name = ROOTSERVER_NAME; struct hostent *rootserver; - + rootserver = gethostbyname(rootserver_name); if (rootserver == NULL) { - /* Error: resolving ip addresses does not work */ + /* Error: resolving ip addresses does not work */ #if DEBUG_RESOLVER - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("gethostbyname() could not lookup IP address: %s\n"), - hstrerror (h_errno)); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("gethostbyname() could not lookup IP address: %s\n"), + hstrerror (h_errno)); #endif - GNUNET_break (0); + GNUNET_break(0); return; } - /* Counting returned IP addresses */ - while (rootserver->h_addr_list[count_ips]!=NULL) - count_ips++; - if ( count_ips > 1) + /* Counting returned IP addresses */ + while (rootserver->h_addr_list[count_ips] != NULL) + count_ips++; + if (count_ips > 1) { #if DEBUG_RESOLVER - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "IP received range for root name server, but a root name server has only 1 IP\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "IP received range for root name server, but a root name server has only 1 IP\n"); #endif - GNUNET_break (0); + GNUNET_break(0); } - - /* Comparing to resolved address to the address the root name server should have */ - if ( strcmp(inet_ntoa( *(struct in_addr *) rootserver->h_addr_list[0]),ROOTSERVER_IP) !=0) + + /* Comparing to resolved address to the address the root name server should have */ + if (strcmp(inet_ntoa(*(struct in_addr *) rootserver->h_addr_list[0]), + ROOTSERVER_IP) != 0) { #if DEBUG_RESOLVER - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "IP received and IP for root name server differ\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "IP received and IP for root name server differ\n"); #endif - GNUNET_break (0); + GNUNET_break(0); } #if DEBUG_RESOLVER - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "System's own forward name resolution is working\n"); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "System's own forward name resolution is working\n"); #endif - - /* Resolve the same using GNUNET */ - GNUNET_RESOLVER_ip_get (sched, cfg, ROOTSERVER_NAME, AF_INET, timeout, &check_rootserver_ip, cls); - - /* - * Success: forward lookups work as expected - * Next step: reverse lookups - */ - - struct in_addr rootserver_addr; - rootserver->h_name=""; - if ( 1 != inet_pton(AF_INET, ROOTSERVER_IP, &rootserver_addr)) + + /* Resolve the same using GNUNET */ + GNUNET_RESOLVER_ip_get(sched, cfg, ROOTSERVER_NAME, AF_INET, timeout, + &check_rootserver_ip, cls); + + /* + * Success: forward lookups work as expected + * Next step: reverse lookups + */ + + struct in_addr rootserver_addr; + rootserver->h_name = ""; + if (1 != inet_pton(AF_INET, ROOTSERVER_IP, &rootserver_addr)) { #if DEBUG_RESOLVER - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not transform root name server IP address\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not transform root name server IP address\n"); #endif - GNUNET_break (0); + GNUNET_break(0); } - - rootserver = gethostbyaddr(&rootserver_addr, sizeof(rootserver_addr), AF_INET); - if (rootserver == NULL) + + rootserver + = gethostbyaddr(&rootserver_addr, sizeof(rootserver_addr), AF_INET); + if (rootserver == NULL) { - /* Error: resolving ip addresses does not work */ + /* Error: resolving ip addresses does not work */ #if DEBUG_RESOLVER - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("gethostbyaddr() could not lookup hostname: %s\n"), - hstrerror (h_errno)); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("gethostbyaddr() could not lookup hostname: %s\n"), + hstrerror (h_errno)); #endif - GNUNET_break (0); + GNUNET_break(0); } - if ( 0 != strcmp( rootserver->h_name,ROOTSERVER_NAME)) + if (0 != strcmp(rootserver->h_name, ROOTSERVER_NAME)) { #if DEBUG_RESOLVER - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received hostname and hostname for root name server differ\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received hostname and hostname for root name server differ\n"); #endif - GNUNET_break (0); + GNUNET_break(0); } - + #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 */ - - memset (&sa, 0, sizeof (sa)); - sa.sin_family = AF_INET; - inet_aton(ROOTSERVER_IP, &sa.sin_addr); - - GNUNET_RESOLVER_hostname_get (sched, - cfg, - (const struct sockaddr *) &sa, - sizeof (struct sockaddr), - GNUNET_YES, - timeout, &check_rootserver_name, cls); + /* Resolve the same using GNUNET */ + + memset(&sa, 0, sizeof(sa)); + sa.sin_family = AF_INET; + inet_aton(ROOTSERVER_IP, &sa.sin_addr); + + GNUNET_RESOLVER_hostname_get(sched, cfg, (const struct sockaddr *) &sa, + sizeof(struct sockaddr), GNUNET_YES, timeout, &check_rootserver_name, cls); } static int -check () +check() { int ok = 1 + 2 + 4 + 8; char *fn; char *pfx; pid_t pid; - char *const argv[] = { "test-resolver-api", - "-c", - "test_resolver_api_data.conf", + char * const argv[] = + { "test-resolver-api", "-c", "test_resolver_api_data.conf", #if VERBOSE - "-L", "DEBUG", + "-L", "DEBUG", #endif - NULL - }; - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; + NULL }; + struct GNUNET_GETOPT_CommandLineOption options[] = + { GNUNET_GETOPT_OPTION_END }; 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", + GNUNET_asprintf(&fn, "%s%cgnunet-service-resolver", pfx, DIR_SEPARATOR); + GNUNET_free(pfx); + pid = GNUNET_OS_start_process(NULL, NULL, fn, "gnunet-service-resolver", #if VERBOSE - "-L", "DEBUG", + "-L", "DEBUG", #endif - "-c", "test_resolver_api_data.conf", NULL); - 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)) + "-c", "test_resolver_api_data.conf", NULL); + 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)) { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); + GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, "kill"); ok = 1; } - GNUNET_OS_process_wait (pid); + GNUNET_OS_process_wait(pid); if (ok != 0) - fprintf (stderr, "Missed some resolutions: %u\n", ok); + fprintf(stderr, "Missed some resolutions: %u\n", ok); return ok; } int -main (int argc, char *argv[]) +main(int argc, char *argv[]) { int ret; - GNUNET_log_setup ("test-resolver-api", + GNUNET_log_setup("test-resolver-api", #if VERBOSE - "DEBUG", + "DEBUG", #else - "WARNING", + "WARNING", #endif - NULL); - ret = check (); + NULL); + ret = check(); return ret; } -- 2.25.1