diff options
Diffstat (limited to 'src/gns/test_gns_pseu_shorten.c')
| -rw-r--r-- | src/gns/test_gns_pseu_shorten.c | 462 |
1 files changed, 240 insertions, 222 deletions
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c index 3c2d204..5e2f1fc 100644 --- a/src/gns/test_gns_pseu_shorten.c +++ b/src/gns/test_gns_pseu_shorten.c @@ -33,44 +33,33 @@ #include "gnunet_dht_service.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, 5) - -/* If number of peers not in config file, use this number */ -#define DEFAULT_NUM_PEERS 2 +#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30) /* test records to resolve */ -#define TEST_DOMAIN "www.alice.bob.gnunet" +#define TEST_DOMAIN "www.alicewonderland.bobbuilder.gads" #define TEST_IP "127.0.0.1" #define TEST_RECORD_NAME "www" -#define TEST_AUTHORITY_BOB "bob" -#define TEST_AUTHORITY_ALICE "alice" +#define TEST_PRIVATE_ZONE "private" +#define TEST_SHORTEN_ZONE "short" +#define TEST_AUTHORITY_BOB "bobbuilder" +#define TEST_AUTHORITY_ALICE "alicewonderland" #define TEST_PSEU_ALICE "carol" -#define TEST_EXPECTED_RESULT "www.carol.gnunet" +#define TEST_EXPECTED_RESULT "www.carol.short.private.gads" #define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) +#define KEYFILE_SHORTEN = "zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey" +#define KEYFILE_PRIVATE = "zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey" #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" #define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.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 */ static GNUNET_SCHEDULER_TaskIdentifier die_task; -static GNUNET_SCHEDULER_TaskIdentifier disco_task; - /* Global return value (0 for success, anything else for failure) */ static int ok; @@ -80,47 +69,73 @@ static struct GNUNET_GNS_Handle *gns_handle; static struct GNUNET_DHT_Handle *dht_handle; -const struct GNUNET_CONFIGURATION_Handle *cfg; +static const struct GNUNET_CONFIGURATION_Handle *cfg; + +static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey; +static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey; +static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded our_pkey; +static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded priv_pkey; +static struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded short_pkey; +static struct GNUNET_CRYPTO_RsaPrivateKey *alice_key; +static struct GNUNET_CRYPTO_RsaPrivateKey *bob_key; +static struct GNUNET_CRYPTO_RsaPrivateKey *our_key; +static struct GNUNET_CRYPTO_RsaPrivateKey *priv_key; +static struct GNUNET_CRYPTO_RsaPrivateKey *short_key; +static struct GNUNET_CRYPTO_ShortHashCode alice_hash; +static struct GNUNET_CRYPTO_ShortHashCode bob_hash; +static struct GNUNET_CRYPTO_ShortHashCode our_zone; +static struct GNUNET_CRYPTO_ShortHashCode priv_zone; +static struct GNUNET_CRYPTO_ShortHashCode short_zone; -struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey; -struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey; -struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded our_pkey; -struct GNUNET_CRYPTO_RsaPrivateKey *alice_key; -struct GNUNET_CRYPTO_RsaPrivateKey *bob_key; -struct GNUNET_CRYPTO_RsaPrivateKey *our_key; -struct GNUNET_CRYPTO_ShortHashCode alice_hash; -struct GNUNET_CRYPTO_ShortHashCode bob_hash; /** - * 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 (disco_task != GNUNET_SCHEDULER_NO_TASK) + die_task = GNUNET_SCHEDULER_NO_TASK; + if (NULL != gns_handle) { - disco_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_SCHEDULER_cancel(disco_task); - GNUNET_DHT_disconnect(dht_handle); - dht_handle = NULL; + GNUNET_GNS_disconnect(gns_handle); + gns_handle = NULL; + } + + if (NULL != namestore_handle) + { + GNUNET_NAMESTORE_disconnect (namestore_handle); + namestore_handle = NULL; } - if (emsg != NULL) + if (NULL != dht_handle) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok); - if (ok == 0) - ok = 2; + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok); + GNUNET_break (0); + GNUNET_SCHEDULER_shutdown (); + ok = 1; } + static void -disco_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +end_badly_now () +{ + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); +} + + +static void +shutdown_task (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { - disco_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_DHT_disconnect(dht_handle); - dht_handle = NULL; + GNUNET_GNS_disconnect(gns_handle); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n"); + GNUNET_SCHEDULER_shutdown (); } /** @@ -129,9 +144,18 @@ disco_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void process_shorten_result(void* cls, const char* sname) { - GNUNET_GNS_disconnect(gns_handle); - //GNUNET_SCHEDULER_add_now(disco_dht, NULL); - ok = 0; + + if (GNUNET_SCHEDULER_NO_TASK != die_task) + { + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_NO_TASK; + } + + if (NULL != dht_handle) + { + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; + } if (sname == NULL) { @@ -147,23 +171,15 @@ process_shorten_result(void* cls, const char* sname) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "shorten test failed! (wanted: %s got: %s\n", - (char*)cls, sname); + TEST_EXPECTED_RESULT, sname); ok = 1; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shorten test succeeded!\n"); } - - 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); } -static void -do_shorten(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - GNUNET_GNS_shorten(gns_handle, TEST_DOMAIN, &process_shorten_result, -TEST_DOMAIN); -} static void on_lookup_result(void *cls, uint32_t rd_count, @@ -186,7 +202,7 @@ on_lookup_result(void *cls, uint32_t rd_count, 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); @@ -204,8 +220,12 @@ on_lookup_result(void *cls, uint32_t rd_count, } } } - - GNUNET_SCHEDULER_add_delayed (TIMEOUT, &do_shorten, NULL); + GNUNET_GNS_shorten_zone (gns_handle, TEST_DOMAIN, + &priv_zone, + &short_zone, + &our_zone, + &process_shorten_result, + TEST_DOMAIN); } @@ -216,81 +236,70 @@ on_lookup_result(void *cls, uint32_t rd_count, static void commence_testing (void *cls, int success) { - GNUNET_SCHEDULER_add_now(disco_dht, NULL); - //GNUNET_DHT_disconnect(dht_handle); - GNUNET_CRYPTO_rsa_key_free(our_key); GNUNET_CRYPTO_rsa_key_free(bob_key); GNUNET_CRYPTO_rsa_key_free(alice_key); - + 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"); } - - GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_TYPE_A, - &on_lookup_result, TEST_DOMAIN); + GNUNET_GNS_lookup_zone (gns_handle, TEST_DOMAIN, + &our_zone, + GNUNET_GNS_RECORD_A, + GNUNET_NO, + short_key, + &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 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n", - (char *) cls); - ok = 1; - - if (disco_task != GNUNET_SCHEDULER_NO_TASK) - { - disco_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_SCHEDULER_cancel(disco_task); - GNUNET_DHT_disconnect(dht_handle); - dht_handle = NULL; - } - if (pg != NULL) - GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); - GNUNET_SCHEDULER_cancel (die_task); -} static void -put_pseu_dht(void *cls, int success) +put_pseu_dht (void *cls, int success) { struct GNSNameRecordBlock *nrb; struct GNUNET_CRYPTO_ShortHashCode name_hash; struct GNUNET_CRYPTO_ShortHashCode zone_hash; - GNUNET_HashCode xor_hash; - GNUNET_HashCode name_hash_double; - GNUNET_HashCode zone_hash_double; + struct GNUNET_HashCode xor_hash; + struct GNUNET_HashCode name_hash_double; + struct GNUNET_HashCode zone_hash_double; uint32_t rd_payload_length; char* nrb_data = NULL; struct GNUNET_CRYPTO_RsaSignature *sig; struct GNUNET_NAMESTORE_RecordData rd; - rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS; + memset (&rd, 0, sizeof (struct GNUNET_NAMESTORE_RecordData)); + rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value; rd.data_size = strlen(TEST_PSEU_ALICE)+1; rd.data = TEST_PSEU_ALICE; rd.record_type = GNUNET_GNS_RECORD_PSEU; + rd.flags = 0; sig = GNUNET_NAMESTORE_create_signature(alice_key, - GNUNET_TIME_UNIT_FOREVER_ABS, - "+", - &rd, 1); + GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_GNS_MASTERZONE_STR, + &rd, 1); + + GNUNET_assert (NULL != sig); + + GNUNET_break (GNUNET_OK == GNUNET_NAMESTORE_verify_signature (&alice_pkey, + GNUNET_TIME_UNIT_FOREVER_ABS, + GNUNET_GNS_MASTERZONE_STR, + 1, + &rd, + sig)); rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd); - nrb = GNUNET_malloc(rd_payload_length + strlen("+") + 1 + nrb = GNUNET_malloc(rd_payload_length + strlen(GNUNET_GNS_MASTERZONE_STR) + 1 + sizeof(struct GNSNameRecordBlock)); nrb->signature = *sig; nrb->public_key = alice_pkey; nrb->rd_count = htonl(1); - memset(&nrb[1], 0, strlen("+") + 1); - strcpy((char*)&nrb[1], "+"); + memset(&nrb[1], 0, strlen(GNUNET_GNS_MASTERZONE_STR) + 1); + strcpy((char*)&nrb[1], GNUNET_GNS_MASTERZONE_STR); nrb_data = (char*)&nrb[1]; - nrb_data += strlen("+") + 1; + nrb_data += strlen(GNUNET_GNS_MASTERZONE_STR) + 1; if (-1 == GNUNET_NAMESTORE_records_serialize (1, &rd, @@ -299,17 +308,15 @@ put_pseu_dht(void *cls, int success) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n"); ok = 3; - GNUNET_DHT_disconnect(dht_handle); - - GNUNET_CRYPTO_rsa_key_free(our_key); GNUNET_CRYPTO_rsa_key_free(bob_key); GNUNET_CRYPTO_rsa_key_free(alice_key); GNUNET_free(sig); GNUNET_free (nrb); + end_badly_now (); return; } - GNUNET_CRYPTO_short_hash("+", strlen("+"), &name_hash); + GNUNET_CRYPTO_short_hash(GNUNET_GNS_MASTERZONE_STR, strlen(GNUNET_GNS_MASTERZONE_STR), &name_hash); GNUNET_CRYPTO_short_hash(&alice_pkey, sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded), &zone_hash); @@ -319,15 +326,15 @@ put_pseu_dht(void *cls, int success) GNUNET_CRYPTO_hash_xor(&zone_hash_double, &name_hash_double, &xor_hash); rd_payload_length += sizeof(struct GNSNameRecordBlock) + - strlen("+") + 1; + strlen(GNUNET_GNS_MASTERZONE_STR) + 1; GNUNET_DHT_put (dht_handle, &xor_hash, 0, - GNUNET_DHT_RO_NONE, + GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, GNUNET_BLOCK_TYPE_GNS_NAMERECORD, rd_payload_length, (char*)nrb, - rd.expiration, + GNUNET_TIME_UNIT_FOREVER_ABS, DHT_OPERATION_TIMEOUT, &commence_testing, NULL); @@ -336,15 +343,16 @@ put_pseu_dht(void *cls, int success) GNUNET_free (nrb); } + static void put_www_dht(void *cls, int success) { struct GNSNameRecordBlock *nrb; struct GNUNET_CRYPTO_ShortHashCode name_hash; struct GNUNET_CRYPTO_ShortHashCode zone_hash; - GNUNET_HashCode xor_hash; - GNUNET_HashCode name_hash_double; - GNUNET_HashCode zone_hash_double; + struct GNUNET_HashCode xor_hash; + struct GNUNET_HashCode name_hash_double; + struct GNUNET_HashCode zone_hash_double; uint32_t rd_payload_length; char* nrb_data = NULL; struct GNUNET_CRYPTO_RsaSignature *sig; @@ -352,16 +360,24 @@ put_www_dht(void *cls, int success) char* ip = TEST_IP; struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr)); - rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS; + rd.expiration_time = UINT64_MAX; GNUNET_assert(1 == inet_pton (AF_INET, ip, web)); rd.data_size = sizeof(struct in_addr); rd.data = web; rd.record_type = GNUNET_DNSPARSER_TYPE_A; - + rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; + sig = GNUNET_NAMESTORE_create_signature(alice_key, GNUNET_TIME_UNIT_FOREVER_ABS, TEST_RECORD_NAME, &rd, 1); + + GNUNET_break (GNUNET_OK == GNUNET_NAMESTORE_verify_signature (&alice_pkey, + GNUNET_TIME_UNIT_FOREVER_ABS, + TEST_RECORD_NAME, + 1, + &rd, + sig)); rd_payload_length = GNUNET_NAMESTORE_records_get_size (1, &rd); nrb = GNUNET_malloc(rd_payload_length + strlen(TEST_RECORD_NAME) + 1 + sizeof(struct GNSNameRecordBlock)); @@ -380,13 +396,13 @@ put_www_dht(void *cls, int success) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n"); ok = 3; - GNUNET_DHT_disconnect(dht_handle); - GNUNET_CRYPTO_rsa_key_free(our_key); GNUNET_CRYPTO_rsa_key_free(bob_key); GNUNET_CRYPTO_rsa_key_free(alice_key); + GNUNET_free (sig); GNUNET_free(web); GNUNET_free (nrb); + end_badly_now(); return; } GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash); @@ -402,16 +418,16 @@ put_www_dht(void *cls, int success) GNUNET_DHT_put (dht_handle, &xor_hash, 0, - GNUNET_DHT_RO_NONE, + GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, GNUNET_BLOCK_TYPE_GNS_NAMERECORD, rd_payload_length, (char*)nrb, - rd.expiration, + GNUNET_TIME_UNIT_FOREVER_ABS, DHT_OPERATION_TIMEOUT, &put_pseu_dht, NULL); - - GNUNET_free(web); + GNUNET_free (sig); + GNUNET_free (web); GNUNET_free (nrb); } @@ -422,19 +438,20 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg) struct GNSNameRecordBlock *nrb; struct GNUNET_CRYPTO_ShortHashCode name_hash; struct GNUNET_CRYPTO_ShortHashCode zone_hash; - GNUNET_HashCode xor_hash; - GNUNET_HashCode name_hash_double; - GNUNET_HashCode zone_hash_double; + struct GNUNET_HashCode xor_hash; + struct GNUNET_HashCode name_hash_double; + struct GNUNET_HashCode zone_hash_double; uint32_t rd_payload_length; char* nrb_data = NULL; struct GNUNET_CRYPTO_RsaSignature *sig; struct GNUNET_NAMESTORE_RecordData rd; - rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS; + rd.expiration_time = UINT64_MAX; rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); rd.data = &alice_hash; rd.record_type = GNUNET_GNS_RECORD_PKEY; - + rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; + sig = GNUNET_NAMESTORE_create_signature(bob_key, GNUNET_TIME_UNIT_FOREVER_ABS, TEST_AUTHORITY_ALICE, @@ -460,11 +477,12 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg) GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n"); ok = 3; - GNUNET_CRYPTO_rsa_key_free(our_key); - GNUNET_CRYPTO_rsa_key_free(bob_key); - GNUNET_CRYPTO_rsa_key_free(alice_key); - GNUNET_free(sig); + GNUNET_CRYPTO_rsa_key_free (our_key); + GNUNET_CRYPTO_rsa_key_free (bob_key); + GNUNET_CRYPTO_rsa_key_free (alice_key); + GNUNET_free (sig); GNUNET_free (nrb); + end_badly_now (); return; } @@ -482,37 +500,76 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg) strlen(TEST_AUTHORITY_ALICE) + 1; GNUNET_DHT_put (dht_handle, &xor_hash, 0, - GNUNET_DHT_RO_NONE, + GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, GNUNET_BLOCK_TYPE_GNS_NAMERECORD, rd_payload_length, (char*)nrb, - rd.expiration, + GNUNET_TIME_UNIT_FOREVER_ABS, DHT_OPERATION_TIMEOUT, &put_www_dht, NULL); - GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_NO); + GNUNET_free (sig); GNUNET_free (nrb); } + 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) +fin_init_zone (void *cls, int32_t success, const char *emsg) { + struct GNUNET_NAMESTORE_RecordData rd; + rd.expiration_time = UINT64_MAX; + 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, + our_key, + TEST_AUTHORITY_BOB, + &rd, + &put_pkey_dht, + NULL); + +} + +static void +cont_init_zone (void *cls, int32_t success, const char *emsg) +{ + + struct GNUNET_NAMESTORE_RecordData rd; + rd.expiration_time = UINT64_MAX; + rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); + rd.data = &short_zone; + rd.record_type = GNUNET_GNS_RECORD_PKEY; + rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; + + GNUNET_NAMESTORE_record_create (namestore_handle, + priv_key, + TEST_SHORTEN_ZONE, + &rd, + &fin_init_zone, + NULL); +} + + +static void +do_check (void *cls, + const struct GNUNET_CONFIGURATION_Handle *ccfg, + struct GNUNET_TESTING_Peer *peer) +{ + char* private_keyfile; + char* shorten_keyfile; char* our_keyfile; - 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; + end_badly_now(); return; } @@ -521,7 +578,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, if (NULL == dht_handle) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to dht\n"); - ok = -1; + end_badly_now(); return; } @@ -530,114 +587,75 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, &our_keyfile)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n"); - ok = -1; + end_badly_now(); + return; + } + + if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", + "SHORTEN_ZONEKEY", + &shorten_keyfile)) + { + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + "Failed to get shorten zone key from cfg\n"); + end_badly_now(); + return; + } + + if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns", + "PRIVATE_ZONEKEY", + &private_keyfile)) + { + GNUNET_log(GNUNET_ERROR_TYPE_ERROR, + "Failed to get private zone key from cfg\n"); + end_badly_now(); return; } - our_key = GNUNET_CRYPTO_rsa_key_create_from_file (our_keyfile); + priv_key = GNUNET_CRYPTO_rsa_key_create_from_file (private_keyfile); + short_key = GNUNET_CRYPTO_rsa_key_create_from_file (shorten_keyfile); bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB); alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_ALICE); GNUNET_free(our_keyfile); + GNUNET_free(shorten_keyfile); + GNUNET_free(private_keyfile); GNUNET_CRYPTO_rsa_key_get_public (our_key, &our_pkey); + GNUNET_CRYPTO_rsa_key_get_public (priv_key, &priv_pkey); + GNUNET_CRYPTO_rsa_key_get_public (short_key, &short_pkey); GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey); GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey); GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash); GNUNET_CRYPTO_short_hash(&alice_pkey, sizeof(alice_pkey), &alice_hash); - + GNUNET_CRYPTO_short_hash(&our_pkey, sizeof(our_pkey), &our_zone); + GNUNET_CRYPTO_short_hash(&priv_pkey, sizeof(priv_pkey), &priv_zone); + GNUNET_CRYPTO_short_hash(&short_pkey, sizeof(short_pkey), &short_zone); + struct GNUNET_NAMESTORE_RecordData rd; - rd.expiration = GNUNET_TIME_UNIT_FOREVER_ABS; + rd.expiration_time = UINT64_MAX; rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); - rd.data = &bob_hash; + rd.data = &priv_zone; rd.record_type = GNUNET_GNS_RECORD_PKEY; + rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; GNUNET_NAMESTORE_record_create (namestore_handle, our_key, - TEST_AUTHORITY_BOB, + TEST_PRIVATE_ZONE, &rd, - &put_pkey_dht, + &cont_init_zone, NULL); - - } -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 */ - //d1 = GNUNET_TESTING_daemon_start(cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0, - // NULL, NULL, NULL, &do_lookup, NULL); - 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-pseu-shorten", /* 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-pseu-shorten", "nohelp", options, &run, - &ok); - if (ret != GNUNET_OK) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "`test-gns-pseu-shorten': Failed with error code %d\n", ret); - } - return ok; -} int main (int argc, char *argv[]) { - int ret; - + ok = 1; GNUNET_log_setup ("test-gns-pseu-shorten", -#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-pseu-shorten", "test_gns_simple_lookup.conf", &do_check, NULL); + return ok; } -/* end of test_gns_twopeer.c */ +/* end of test_gns_pseu_shorten.c */ |