*
*/
#include "platform.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testing_lib-new.h"
#include "gnunet_core_service.h"
#include "block_dns.h"
#include "gnunet_signatures.h"
#include "gnunet_namestore_service.h"
+#include "gnunet_resolver_service.h"
#include "gnunet_dnsparser_lib.h"
#include "gnunet_gns_service.h"
-/* DEFINES */
-#define VERBOSE GNUNET_YES
-
/* Timeout for entire testcase */
#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
#define DEFAULT_NUM_PEERS 2
/* test records to resolve */
-#define TEST_DOMAIN "www.homepage.gnunet"
-#define TEST_DOMAIN_ALT "homepage.gnunet"
-#define TEST_DOMAIN_ALT2 "uk.homepage.gnunet"
+#define TEST_DOMAIN "www.homepage.gads"
+#define TEST_DOMAIN_ALT "homepage.gads"
+#define TEST_DOMAIN_ALT2 "uk.homepage.gads"
#define TEST_IP_ALT2 "81.187.252.184"
#define TEST_IP "131.159.74.67"
#define TEST_IP_NS "216.69.185.1" //ns01.domaincontrol.com
/* Globals */
-/**
- * Directory to store temp data in, defined in config file
- */
-static char *test_directory;
-
-static struct GNUNET_TESTING_PeerGroup *pg;
/* Task handle to use to schedule test failure */
GNUNET_SCHEDULER_TaskIdentifier die_task;
/* Global return value (0 for success, anything else for failure) */
static int ok;
+static int resolver_working;
+
static struct GNUNET_NAMESTORE_Handle *namestore_handle;
static struct GNUNET_GNS_Handle *gns_handle;
+static struct GNUNET_RESOLVER_RequestHandle *resolver_handle;
+
const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
- * Check whether peers successfully shut down.
+ * Check if the get_handle is being used, if so stop the request. Either
+ * way, schedule the end_badly_cont function which actually shuts down the
+ * test.
*/
-void
-shutdown_callback (void *cls, const char *emsg)
+static void
+end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Test failed, shutting down...\n");
+ if (NULL != resolver_handle)
+ {
+ GNUNET_RESOLVER_request_cancel (resolver_handle);
+ resolver_handle = NULL;
+ }
+
+ if (NULL != gns_handle)
+ {
+ GNUNET_GNS_disconnect(gns_handle);
+ gns_handle = NULL;
+ }
+
+ if (NULL != namestore_handle)
+ {
+ GNUNET_NAMESTORE_disconnect (namestore_handle);
+ namestore_handle = NULL;
+ }
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_shutdown ();
+ ok = 1;
+}
+
+static void
+end_badly_now ()
+{
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+}
+
+static void
+end_now (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (emsg != NULL)
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Test successful, shutting down...\n");
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok);
- if (ok == 0)
- ok = 2;
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (NULL != resolver_handle)
+ {
+ GNUNET_RESOLVER_request_cancel (resolver_handle);
+ resolver_handle = NULL;
}
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok);
+ if (NULL != gns_handle)
+ {
+ GNUNET_GNS_disconnect(gns_handle);
+ gns_handle = NULL;
+ }
+
+ if (NULL != namestore_handle)
+ {
+ GNUNET_NAMESTORE_disconnect (namestore_handle);
+ namestore_handle = NULL;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
+ GNUNET_SCHEDULER_shutdown ();
}
static void
struct in_addr a;
int i;
char* addr;
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received alternative results 2\n");
if (rd_count == 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Lookup failed, rp_filtering?\n");
+ "Lookup failed\n");
ok = 2;
}
else
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
}
}
}
- GNUNET_GNS_disconnect(gns_handle);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ GNUNET_SCHEDULER_add_now (&end_now, NULL);
}
static void
struct in_addr a;
int i;
char* addr;
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received alternative results\n");
if (rd_count == 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Lookup failed, rp_filtering?\n");
+ "Lookup failed\n");
ok = 2;
}
else
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
}
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result_alt2, TEST_DOMAIN_ALT2);
struct in_addr a;
int i;
char* addr;
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received results\n");
if (rd_count == 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Lookup failed, rp_filtering?\n");
+ "Lookup failed\n");
ok = 2;
}
else
for (i=0; i<rd_count; i++)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_TYPE_A)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
memcpy(&a, rd[i].data, sizeof(a));
addr = inet_ntoa(a);
}
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT, GNUNET_GNS_RECORD_TYPE_A,
+ GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN_ALT, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
&on_lookup_result_alt, TEST_DOMAIN_ALT);
}
-/**
- * Function scheduled to be run on the successful start of services
- * tries to look up the dns record for TEST_DOMAIN
- */
static void
-commence_testing (void *cls, int32_t success, const char *emsg)
+start_lookup (void)
{
-
-
- GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES);
-
- gns_handle = GNUNET_GNS_connect(cfg);
+ GNUNET_NAMESTORE_disconnect (namestore_handle);
+ namestore_handle = NULL;
+ gns_handle = GNUNET_GNS_connect(cfg);
if (NULL == gns_handle)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to connect to GNS!\n");
- ok = 2;
+ end_badly_now ();
+ return;
}
- GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A,
- GNUNET_YES,
- NULL,
- &on_lookup_result, TEST_DOMAIN);
+ GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
+ GNUNET_YES,
+ NULL,
+ &on_lookup_result, TEST_DOMAIN);
}
-/**
- * Continuation for the GNUNET_DHT_get_stop call, so that we don't shut
- * down the peers without freeing memory associated with GET request.
- */
static void
-end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+handle_dns_test (void *cls,
+ const struct sockaddr *addr,
+ socklen_t addrlen)
{
+ struct sockaddr_in* sai;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received DNS response\n");
+ resolver_handle = NULL;
+ if (NULL == addr)
+ {
+ /* end of results */
+ if (GNUNET_YES != resolver_working)
+ {
+ ok = 0;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "System resolver not working. Test inconclusive!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
+ GNUNET_SCHEDULER_add_now (&end_now, NULL);
+ return;
+ }
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Starting lookup \n");
+ start_lookup ();
+ return;
+ }
- if (pg != NULL)
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
- GNUNET_SCHEDULER_cancel (die_task);
+ if (addrlen == sizeof (struct sockaddr_in))
+ {
+ sai = (struct sockaddr_in*) addr;
+ if (0 == strcmp (TEST_IP, inet_ntoa (sai->sin_addr)))
+ {
+ resolver_working = GNUNET_YES;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Resolver is working\n");
+ }
+
+ }
}
+
+
+
/**
- * Check if the get_handle is being used, if so stop the request. Either
- * way, schedule the end_badly_cont function which actually shuts down the
- * test.
+ * Function scheduled to be run on the successful start of services
+ * tries to look up the dns record for TEST_DOMAIN
*/
static void
-end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+commence_testing (void *cls, int32_t success, const char *emsg)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n",
- (char *) cls);
- GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL);
- ok = 1;
+ resolver_working = GNUNET_NO;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Resolving NS record\n");
+ GNUNET_RESOLVER_connect (cfg);
+ resolver_handle = GNUNET_RESOLVER_ip_get (TEST_RECORD_NS,
+ AF_INET,
+ TIMEOUT,
+ &handle_dns_test,
+ NULL);
}
static void
-do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *_cfg,
- struct GNUNET_TESTING_Daemon *d, const char *emsg)
+do_check (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *ccfg,
+ struct GNUNET_TESTING_Peer *peer)
{
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
char* alice_keyfile;
- cfg = _cfg;
-
- GNUNET_SCHEDULER_cancel (die_task);
+ cfg = ccfg;
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
/* put records into namestore */
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connecting to namestore\n");
namestore_handle = GNUNET_NAMESTORE_connect(cfg);
if (NULL == namestore_handle)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- ok = -1;
+ end_badly_now ();
return;
}
&alice_keyfile))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
- ok = -1;
+ end_badly_now ();
return;
}
rd.data_size = sizeof(struct in_addr);
rd.data = ns;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
+ rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
-
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Creating records\n");
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
TEST_RECORD_NAME,
rd.data_size = strlen (TEST_RECORD_NS);
rd.data = TEST_RECORD_NS;
- rd.record_type = GNUNET_GNS_RECORD_TYPE_NS;
+ rd.record_type = GNUNET_GNS_RECORD_NS;
GNUNET_NAMESTORE_record_create (namestore_handle,
alice_key,
}
-static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *c)
-{
- cfg = c;
- /* Get path from configuration file */
- if (GNUNET_YES !=
- GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome",
- &test_directory))
- {
- ok = 404;
- return;
- }
-
-
- /* Set up a task to end testing if peer start fails */
- die_task =
- GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly,
- "didn't start all daemons in reasonable amount of time!!!");
-
- /* Start alice */
- pg = GNUNET_TESTING_daemons_start(cfg, 1, 1, 1, TIMEOUT,
- NULL, NULL, &do_lookup, NULL,
- NULL, NULL, NULL);
-}
-
-static int
-check ()
-{
- int ret;
-
- /* Arguments for GNUNET_PROGRAM_run */
- char *const argv[] = { "test-gns-ns-lookup", /* Name to give running binary */
- "-c",
- "test_gns_simple_lookup.conf", /* Config file to use */
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
- /* Run the run function as a new program */
- ret =
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-gns-ns-lookup", "nohelp", options, &run,
- &ok);
- if (ret != GNUNET_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "`test-gns-simple-lookup': Failed with error code %d\n", ret);
- }
- return ok;
-}
-
int
main (int argc, char *argv[])
{
- int ret;
+ ok = 1;
- GNUNET_log_setup ("test-gns-simple-lookup",
+ GNUNET_log_setup ("test-gns-simple-ns-lookup",
#if VERBOSE
"DEBUG",
#else
"WARNING",
#endif
NULL);
- ret = check ();
- /**
- * Need to remove base directory, subdirectories taken care
- * of by the testing framework.
- */
- return ret;
+ GNUNET_TESTING_peer_run ("test-gns-simple-ns-lookup", "test_gns_simple_lookup.conf", &do_check, NULL);
+ return ok;
}
-/* end of test_gns_twopeer.c */
+/* end of test_gns_simple_ns_lookup.c */
projects / oweals / gnunet.git / blobdiff