* topology:
* alice <----> bob <-----> dave
*
- * alice queries for www.buddy.bob.gads
+ * alice queries for www.buddy.bob.gnu
*
*/
#include "platform.h"
#define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
-#define TEST_DOMAIN "www.buddy.bob.gads"
+#define TEST_DOMAIN "www.buddy.bob.gnu"
#define TEST_IP "1.1.1.1"
#define TEST_DAVE_PSEU "hagbard"
end_now ();
}
+
static void
commence_testing(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static int wait = 0;
+
wait++;
- if ((ZONE_PUT_WAIT_TIME.rel_value / 1000) == wait)
+ if ((ZONE_PUT_WAIT_TIME.rel_value_us / 1000LL / 1000LL) == wait)
{
fprintf (stderr, "\n");
wait_task = GNUNET_SCHEDULER_NO_TASK;
- lookup_handle = GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
+ lookup_handle = GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_DNSPARSER_TYPE_A,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
}
}
+
void
all_connected ()
{
{
char* keyfile;
struct GNUNET_CRYPTO_EccPrivateKey *key;
- struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
struct in_addr *web;
struct GNUNET_NAMESTORE_RecordData rd;
if (NULL == nh[0])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
- GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey);
GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &dave_hash);
rd.expiration_time = UINT64_MAX;
GNUNET_assert(1 == inet_pton (AF_INET, TEST_IP, web));
rd.data_size = sizeof(struct in_addr);
rd.data = web;
- rd.record_type = GNUNET_GNS_RECORD_A;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.record_type = GNUNET_DNSPARSER_TYPE_A;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (nh[0], key, "www",
1, &rd,
rd.data_size = strlen(TEST_DAVE_PSEU);
rd.data = TEST_DAVE_PSEU;
- rd.record_type = GNUNET_GNS_RECORD_PSEU;
+ rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU;
GNUNET_NAMESTORE_record_put_by_authority (nh[0], key,
1, &rd,
&cont_ns, nh[0]);
- GNUNET_CRYPTO_ecc_key_free(key);
+ GNUNET_free(key);
GNUNET_free(keyfile);
GNUNET_free(web);
dave_is_setup = GNUNET_YES;
{
char* keyfile;
struct GNUNET_CRYPTO_EccPrivateKey *key;
- struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
struct GNUNET_NAMESTORE_RecordData rd;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob\n");
if (NULL == nh[1])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
- GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (key, &pkey);
GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &bob_hash);
rd.expiration_time = UINT64_MAX;
rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode);
rd.data = &dave_hash;
- rd.record_type = GNUNET_GNS_RECORD_PKEY;
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
+ rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (nh[1], key, "buddy",
1, &rd,
&cont_ns, nh[1]);
- GNUNET_CRYPTO_ecc_key_free(key);
+ GNUNET_free(key);
GNUNET_free(keyfile);
bob_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob done\n");
if (NULL == nh[2])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
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;
+ rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.flags = GNUNET_NAMESTORE_RF_NONE;
GNUNET_NAMESTORE_record_put_by_authority (nh[2], key, "bob",
1, &rd,
if (NULL == gh)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to gns\n");
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
- GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (key);
GNUNET_free (keyfile);
alice_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up alice done\n");
void testbed_master (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
unsigned int num_peers,
struct GNUNET_TESTBED_Peer **peers,
unsigned int links_succeeded,