* topology:
* alice <----> bob <-----> dave
*
- * alice queries for www.buddy.bob.gnunet
+ * alice queries for www.buddy.bob.gads
*
*/
#include "platform.h"
#include "gnunet_dnsparser_lib.h"
#include "gnunet_gns_service.h"
-#define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+#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 */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
/* Global return value (0 for success, anything else for failure) */
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;
+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;
+static int alice_is_setup;
/**
* Check if the get_handle is being used, if so stop the request. Either
GNUNET_NAMESTORE_disconnect(nh[c]);
nh[c] = NULL;
}
+
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])
cfg_handles[c] = NULL;
}
}
-
+
+ if (NULL != lookup_handle)
+ {
+ GNUNET_GNS_cancel_lookup_request (lookup_handle);
+ lookup_handle = NULL;
+ }
if (NULL != gh)
{
- GNUNET_GNS_disconnect (gh);
- gh = NULL;
+ GNUNET_GNS_disconnect(gh);
+ gh = NULL;
}
-
+
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)
{
}
}
+ if (NULL != gh)
+ {
+ GNUNET_GNS_disconnect(gh);
+ gh = NULL;
+ }
+
if (0 == ok)
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Test ended successful\n");
else
"%s correctly resolved to %s!\n", TEST_DOMAIN, string_val);
ok = 0;
}
+ GNUNET_free (string_val);
}
}
- GNUNET_GNS_disconnect(gh);
- gh = NULL;
end_now ();
}
{
fprintf (stderr, "\n");
wait_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
+ lookup_handle = GNUNET_GNS_lookup(gh, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_NO,
NULL,
&on_lookup_result, TEST_DOMAIN);
{
static int started;
started ++;
-
if (3 == started)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started\n");
setup_dave (const struct GNUNET_CONFIGURATION_Handle * cfg)
{
char* keyfile;
- char* source;
struct GNUNET_CRYPTO_RsaPrivateKey *key;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
struct in_addr *web;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up dave\n");
cfg_handles[0] = GNUNET_CONFIGURATION_dup (cfg);
GNUNET_assert (NULL != cfg_handles[0]);
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg_handles[0], "gns",
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
&keyfile))
{
return GNUNET_SYSERR;
}
- GNUNET_asprintf (&source, "zonefiles%s%s", DIR_SEPARATOR_STR, "test_zonekey");
- if (GNUNET_OK == GNUNET_DISK_file_test (source))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Copy `%s' to `%s'\n", source, keyfile);
- GNUNET_DISK_file_copy (source, keyfile);
- }
- else
- GNUNET_break (0);
- GNUNET_free (source);
-
key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
if (NULL == key)
{
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_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_free(web);
+ dave_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up dave done\n");
return GNUNET_OK;
}
setup_bob (const struct GNUNET_CONFIGURATION_Handle * cfg)
{
char* keyfile;
- char* source;
struct GNUNET_CRYPTO_RsaPrivateKey *key;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
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);
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg_handles[1], "gns",
+ GNUNET_assert (NULL != cfg_handles[1]);
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
&keyfile))
{
return GNUNET_SYSERR;
}
- GNUNET_asprintf (&source, "zonefiles%s%s", DIR_SEPARATOR_STR, "OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey");
- if (GNUNET_OK == GNUNET_DISK_file_test (source))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Copy `%s' to `%s'\n", source, keyfile);
- GNUNET_DISK_file_copy (source, keyfile);
- }
- else
- GNUNET_break (0);
- GNUNET_free (source);
-
-
key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
if (NULL == key)
{
GNUNET_free (keyfile);
return GNUNET_SYSERR;
}
-
+
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;
GNUNET_CRYPTO_rsa_key_free(key);
GNUNET_free(keyfile);
+ bob_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up bob done\n");
return GNUNET_OK;
}
setup_alice (const struct GNUNET_CONFIGURATION_Handle * cfg)
{
char* keyfile;
- char* source;
struct GNUNET_CRYPTO_RsaPrivateKey *key;
struct GNUNET_NAMESTORE_RecordData rd;
-
- GNUNET_assert (NULL != cfg);
cfg_handles[2] = GNUNET_CONFIGURATION_dup (cfg);
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg_handles[2], "gns",
+ GNUNET_assert (NULL != cfg);
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY",
&keyfile))
{
return GNUNET_SYSERR;
}
- GNUNET_asprintf (&source, "zonefiles%s%s", DIR_SEPARATOR_STR, "188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey");
- if (GNUNET_OK == GNUNET_DISK_file_test (source))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Copy `%s' to `%s'\n", source, keyfile);
- GNUNET_DISK_file_copy (source, keyfile);
- }
- else
- GNUNET_break (0);
- GNUNET_free (source);
-
key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
if (NULL == key)
{
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;
GNUNET_NAMESTORE_record_create (nh[2], key, "bob", &rd, &cont_ns, nh[2]);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up alice gns\n");
gh = GNUNET_GNS_connect (cfg_handles[2]);
if (NULL == gh)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n");
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to gns\n");
GNUNET_CRYPTO_rsa_key_free (key);
GNUNET_free (keyfile);
return GNUNET_SYSERR;
GNUNET_CRYPTO_rsa_key_free (key);
GNUNET_free (keyfile);
+ alice_is_setup = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up alice done\n");
return GNUNET_OK;
}
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 if (GNUNET_NO == bob_is_setup)
+ res = setup_bob (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");
+ end_badly_now();
+ }
+ else
+ connect_peers ();
+ /*if (get_cfg_ops[0] == op)
{
GNUNET_assert (GNUNET_TESTBED_PIT_CONFIGURATION == pinfo->pit);
res = setup_dave (pinfo->result.cfg);
{
connect_peers ();
}
- }
+ }*/
}
projects / oweals / gnunet.git / blobdiff