* topology:
* alice <----> bob <-----> dave
*
- * alice queries for www.buddy.bob.gnunet
+ * alice queries for www.buddy.bob.gads
*
*/
#include "platform.h"
/* 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
/* Timeout for entire testcase */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
/* Global return value (0 for success, anything else for failure) */
static int ok;
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Test failed \n");
- GNUNET_break (0);
GNUNET_SCHEDULER_shutdown ();
ok = 1;
}
static void
end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Finished\n");
int c;
if (GNUNET_SCHEDULER_NO_TASK != die_task)
{
"%s correctly resolved to %s!\n", TEST_DOMAIN, string_val);
ok = 0;
}
+ GNUNET_free (string_val);
}
}
end_now ();
{
static int started;
started ++;
-
if (3 == started)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started\n");
struct GNUNET_NAMESTORE_RecordData rd;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up dave\n");
- GNUNET_assert (NULL != cfg);
+ cfg_handles[0] = GNUNET_CONFIGURATION_dup (cfg);
+ GNUNET_assert (NULL != cfg_handles[0]);
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
&keyfile))
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
-
nh[0] = GNUNET_NAMESTORE_connect (cfg_handles[0]);
if (NULL == nh[0])
{
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_CRYPTO_rsa_key_free(key);
struct GNUNET_NAMESTORE_RecordData rd;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob\n");
- GNUNET_assert (NULL != cfg);
+ cfg_handles[1] = GNUNET_CONFIGURATION_dup (cfg);
+ GNUNET_assert (NULL != cfg_handles[1]);
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
&keyfile))
return GNUNET_SYSERR;
}
- nh[1] = GNUNET_NAMESTORE_connect (cfg);
+ nh[1] = GNUNET_NAMESTORE_connect (cfg_handles[1]);
if (NULL == nh[1])
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
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;
struct GNUNET_CRYPTO_RsaPrivateKey *key;
struct GNUNET_NAMESTORE_RecordData rd;
-
+ cfg_handles[2] = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_assert (NULL != cfg);
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
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_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
if (GNUNET_NO == dave_is_setup)
res = setup_dave (pinfo->result.cfg);
else
res = setup_alice (pinfo->result.cfg);
+ if (get_cfg_ops[0] == op)
+ get_cfg_ops[0] = NULL;
+ else if (get_cfg_ops[1] == op)
+ get_cfg_ops[1] = NULL;
+ else
+ get_cfg_ops[2] = NULL;
GNUNET_TESTBED_operation_done (op);
op = NULL;
-
if (GNUNET_SYSERR == res)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to setup peer \n");
}
else
connect_peers ();
-
/*if (get_cfg_ops[0] == op)
{
GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);