diff options
Diffstat (limited to 'src/gns/test_gns_simple_delegated_lookup.c')
| -rw-r--r-- | src/gns/test_gns_simple_delegated_lookup.c | 319 |
1 files changed, 122 insertions, 197 deletions
diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c index 36fb969..393ddfb 100644 --- a/src/gns/test_gns_simple_delegated_lookup.c +++ b/src/gns/test_gns_simple_delegated_lookup.c @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ /** - * @file gns/test_gns_twopeer.c + * @file gns/test_gns_simple_delegated_lookup.c * @brief base testcase for testing DHT service with * two running peers. * @@ -46,17 +46,11 @@ #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) -/* If number of peers not in config file, use this number */ -#define DEFAULT_NUM_PEERS 2 - /* test records to resolve */ -#define TEST_DOMAIN "www.bob.gnunet" +#define TEST_DOMAIN "www.bob.gads" #define TEST_IP "127.0.0.1" #define TEST_RECORD_NAME "www" @@ -64,17 +58,8 @@ #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" -/* 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; +static GNUNET_SCHEDULER_TaskIdentifier die_task; /* Global return value (0 for success, anything else for failure) */ static int ok; @@ -83,66 +68,89 @@ static struct GNUNET_NAMESTORE_Handle *namestore_handle; static struct GNUNET_GNS_Handle *gns_handle; -const struct GNUNET_CONFIGURATION_Handle *cfg; +static 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) { - if (emsg != NULL) + die_task = GNUNET_SCHEDULER_NO_TASK; + if (NULL != gns_handle) + { + GNUNET_GNS_disconnect(gns_handle); + gns_handle = NULL; + } + if (NULL != namestore_handle) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok); - if (ok == 0) - ok = 2; + GNUNET_NAMESTORE_disconnect (namestore_handle); + namestore_handle = NULL; } + GNUNET_break (0); + GNUNET_SCHEDULER_shutdown (); + ok = 1; +} + - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok); +static void +shutdown_task (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) +{ + GNUNET_GNS_disconnect (gns_handle); + gns_handle = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n"); + GNUNET_SCHEDULER_shutdown (); } + static void -on_lookup_result(void *cls, uint32_t rd_count, - const struct GNUNET_NAMESTORE_RecordData *rd) +on_lookup_result (void *cls, uint32_t rd_count, + const struct GNUNET_NAMESTORE_RecordData *rd) { + const char *name = cls; + uint32_t i; + const char* addr; struct in_addr a; - int i; - char* addr; - - if (rd_count == 0) + + GNUNET_NAMESTORE_disconnect (namestore_handle); + namestore_handle = NULL; + if (0 == rd_count) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Lookup failed, rp_filtering?\n"); + "Lookup failed!\n"); ok = 2; + GNUNET_SCHEDULER_shutdown (); + return; } - else + if (GNUNET_SCHEDULER_NO_TASK != die_task) + { + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_NO_TASK; + } + ok = 1; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "name: %s\n", + name); + for (i=0; i<rd_count; i++) { - ok = 1; - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls); - 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) - { - memcpy(&a, rd[i].data, sizeof(a)); - addr = inet_ntoa(a); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr); - if (0 == strcmp(addr, TEST_IP)) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "%s correctly resolved to %s!\n", TEST_DOMAIN, addr); - ok = 0; - } - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n"); - } - } + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type); + if (rd[i].record_type != GNUNET_GNS_RECORD_A) + continue; + memcpy (&a, rd[i].data, sizeof (a)); + addr = inet_ntoa (a); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "address: %s\n", addr); + if (0 != strcmp (addr, TEST_IP)) + continue; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%s correctly resolved to %s!\n", TEST_DOMAIN, addr); + ok = 0; } - 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 (&shutdown_task, NULL); } @@ -153,51 +161,33 @@ on_lookup_result(void *cls, uint32_t rd_count, static void commence_testing (void *cls, int32_t success, const char *emsg) { - GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES); - + if (NULL != emsg) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to store record in namestore: %s\n", + emsg); + GNUNET_SCHEDULER_shutdown (); + return; + } gns_handle = GNUNET_GNS_connect(cfg); - if (NULL == gns_handle) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to connect to GNS!\n"); + GNUNET_SCHEDULER_shutdown (); + return; } - - GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A, - &on_lookup_result, TEST_DOMAIN); + GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A, + GNUNET_NO, + 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) -{ - - if (pg != NULL) - GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); - GNUNET_SCHEDULER_cancel (die_task); -} -/** - * 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. - */ static void -end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n", - (char *) cls); - GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL); - ok = 1; -} - -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_RsaPublicKeyBinaryEncoded bob_pkey; @@ -206,150 +196,85 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, struct GNUNET_CRYPTO_ShortHashCode bob_hash; struct GNUNET_CRYPTO_RsaSignature *sig; char* alice_keyfile; + struct GNUNET_TIME_Absolute et; + struct GNUNET_NAMESTORE_RecordData rd; + const char* ip = TEST_IP; + struct in_addr web; - cfg = _cfg; - - GNUNET_SCHEDULER_cancel (die_task); + cfg = ccfg; + die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); /* put records into namestore */ namestore_handle = GNUNET_NAMESTORE_connect(cfg); if (NULL == namestore_handle) { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n"); - ok = -1; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to connect to namestore\n"); + GNUNET_SCHEDULER_shutdown (); return; } - if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", - "ZONEKEY", - &alice_keyfile)) + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", + "ZONEKEY", + &alice_keyfile)) { - GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n"); - ok = -1; + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n"); + GNUNET_SCHEDULER_shutdown (); return; } - alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile); bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB); - GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); - - struct GNUNET_NAMESTORE_RecordData rd; - char* ip = TEST_IP; - struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr)); - rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS; - GNUNET_assert(1 == inet_pton (AF_INET, ip, web)); - - GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash); - + rd.expiration_time = UINT64_MAX; + GNUNET_assert (1 == inet_pton (AF_INET, ip, &web)); + GNUNET_CRYPTO_short_hash (&bob_pkey, sizeof(bob_pkey), &bob_hash); rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); rd.data = &bob_hash; rd.record_type = GNUNET_GNS_RECORD_PKEY; - + rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; GNUNET_NAMESTORE_record_create (namestore_handle, alice_key, TEST_AUTHORITY_NAME, &rd, NULL, NULL); - rd.data_size = sizeof(struct in_addr); - rd.data = web; + rd.data = &web; rd.record_type = GNUNET_DNSPARSER_TYPE_A; - sig = GNUNET_NAMESTORE_create_signature(bob_key, - GNUNET_TIME_UNIT_FOREVER_ABS, - TEST_RECORD_NAME, - &rd, 1); - + sig = GNUNET_NAMESTORE_create_signature (bob_key, + GNUNET_TIME_UNIT_FOREVER_ABS, + TEST_RECORD_NAME, + &rd, 1); + et.abs_value = rd.expiration_time; GNUNET_NAMESTORE_record_put (namestore_handle, &bob_pkey, TEST_RECORD_NAME, - rd.expiration, + et, 1, &rd, sig, &commence_testing, NULL); - GNUNET_free(sig); - GNUNET_CRYPTO_rsa_key_free(bob_key); - GNUNET_CRYPTO_rsa_key_free(alice_key); + GNUNET_free (sig); + GNUNET_free (alice_keyfile); + GNUNET_CRYPTO_rsa_key_free (bob_key); + GNUNET_CRYPTO_rsa_key_free (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-simple-delegated-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-simple-delegated-lookup", "nohelp", options, &run, - &ok); - if (ret != GNUNET_OK) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "`test-gns-simple-delegated-lookup': Failed with error code %d\n", ret); - } - return ok; -} int main (int argc, char *argv[]) { - int ret; - - GNUNET_log_setup ("test-gns-simple-lookup", -#if VERBOSE - "DEBUG", -#else + ok = 1; + GNUNET_log_setup ("test-gns-simple-delegated-lookup", "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-delegated-lookup", + "test_gns_simple_lookup.conf", + &do_check, NULL); + return ok; } -/* end of test_gns_twopeer.c */ +/* end of test_gns_simple_delegated_lookup.c */ |