* topology:
* alice <----> bob <-----> dave
*
- * alice queries for www.buddy.bob.gnunet
+ * alice queries for www.buddy.bob.gads
*
*/
#include "platform.h"
#define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
-/* If number of peers not in config file, use this number */
-#define DEFAULT_NUM_PEERS 2
-
-#define TEST_DOMAIN "www.buddy.bob.gnunet"
+#define TEST_DOMAIN "www.buddy.bob.gads"
#define TEST_IP "1.1.1.1"
#define TEST_DAVE_PSEU "hagbard"
-#define TEST_NUM_PEERS 3
-#define TEST_NUM_CON 3
/* Timeout for entire testcase */
static int ok;
/* Task handle to use to schedule test failure */
-GNUNET_SCHEDULER_TaskIdentifier die_task;
-GNUNET_SCHEDULER_TaskIdentifier wait_task;
+static GNUNET_SCHEDULER_TaskIdentifier die_task;
+
+static GNUNET_SCHEDULER_TaskIdentifier wait_task;
-struct GNUNET_CRYPTO_ShortHashCode dave_hash;
+static struct GNUNET_CRYPTO_ShortHashCode dave_hash;
-struct GNUNET_CRYPTO_ShortHashCode bob_hash;
+static struct GNUNET_CRYPTO_ShortHashCode bob_hash;
-struct GNUNET_TESTBED_Peer **cpeers;
+static struct GNUNET_TESTBED_Peer **cpeers;
-struct GNUNET_GNS_Handle *gh;
-struct GNUNET_GNS_LookupRequest *lookup_handle;
+static struct GNUNET_GNS_Handle *gh;
+static struct GNUNET_GNS_LookupRequest *lookup_handle;
-struct GNUNET_TESTBED_Operation *get_cfg_ops[3];
-struct GNUNET_TESTBED_Operation *connect_ops[3];
-struct GNUNET_CONFIGURATION_Handle *cfg_handles[3];
-struct GNUNET_NAMESTORE_Handle *nh[3];
+static struct GNUNET_TESTBED_Operation *get_cfg_ops[3];
+static struct GNUNET_TESTBED_Operation *connect_ops[3];
+static struct GNUNET_CONFIGURATION_Handle *cfg_handles[3];
+static struct GNUNET_NAMESTORE_Handle *nh[3];
static int dave_is_setup;
static int bob_is_setup;
if (NULL != get_cfg_ops[c])
{
- GNUNET_TESTBED_operation_cancel(get_cfg_ops[c]);
+ GNUNET_TESTBED_operation_done(get_cfg_ops[c]);
get_cfg_ops[c] = NULL;
}
if (NULL != connect_ops[c])
{
- GNUNET_TESTBED_operation_cancel(connect_ops[c]);
+ GNUNET_TESTBED_operation_done(connect_ops[c]);
connect_ops[c] = NULL;
}
if (NULL != cfg_handles[c])
{
static int started;
started ++;
-GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "C \n");
if (3 == started)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started\n");
GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
GNUNET_CRYPTO_short_hash(&pkey, sizeof(pkey), &dave_hash);
+ rd.expiration_time = UINT64_MAX;
+
web = GNUNET_malloc(sizeof(struct in_addr));
GNUNET_assert(1 == inet_pton (AF_INET, TEST_IP, web));
rd.data_size = sizeof(struct in_addr);
rd.data = TEST_DAVE_PSEU;
rd.record_type = GNUNET_GNS_RECORD_PSEU;
- GNUNET_NAMESTORE_record_create (nh[0], key, "+", &rd, &cont_ns, nh[0]);
+
+ GNUNET_NAMESTORE_record_create (nh[0], key, GNUNET_GNS_MASTERZONE_STR, &rd, &cont_ns, nh[0]);
GNUNET_CRYPTO_rsa_key_free(key);
GNUNET_free(keyfile);
GNUNET_CRYPTO_rsa_key_get_public (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;
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;
const char *emsg)
{
int res;
-GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "X \n");
GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
if (GNUNET_NO == dave_is_setup)
res = setup_dave (pinfo->result.cfg);
get_cfg_ops[2] = NULL;
GNUNET_TESTBED_operation_done (op);
op = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "A \n");
if (GNUNET_SYSERR == res)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup peer \n");
}
else
connect_peers ();
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "B \n");
/*if (get_cfg_ops[0] == op)
{
GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);