#define VERBOSE GNUNET_YES
/* Timeout for entire testcase */
-#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
/* If number of peers not in config file, use this number */
#define DEFAULT_NUM_PEERS 2
#define TEST_AUTHORITY_NAME "bob"
+#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
+
/* Globals */
/**
*/
static char *test_directory;
-struct GNUNET_TESTING_Daemon *d1;
-
+static struct GNUNET_TESTING_PeerGroup *pg;
/* Task handle to use to schedule test failure */
GNUNET_SCHEDULER_TaskIdentifier die_task;
on_lookup_result(void *cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
- struct in_addr a;
int i;
- char* addr;
- int mx_found = 0;
- int ip_found = 0;
uint16_t mx_preference;
char* mx;
+ GNUNET_NAMESTORE_disconnect (namestore_handle);
if (rd_count == 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
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)
- {
- memcpy(&a, rd[i].data, sizeof(a));
- addr = inet_ntoa(a);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
- if (0 == strcmp(addr, TEST_IP))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "%s correctly resolved to %s!\n", TEST_DOMAIN, addr);
- ip_found = 1;
- }
- }
- else if (rd[i].record_type == GNUNET_GNS_RECORD_MX)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_MX)
{
mx = (char*)rd[i].data+sizeof(uint16_t);
mx_preference = *(uint16_t*)rd[i].data;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"%s correctly resolved to %s!\n", TEST_DOMAIN,
TEST_EXPECTED_MX);
- mx_found = 1;
+ ok = 0;
}
}
}
}
- if (ip_found && mx_found)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Test succeeded!\n");
- ok = 0;
- }
-
- if (!ip_found && mx_found)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Test partially succeeded: A record not passed along!(NOT IMPLEMENTED)\n");
- ok = 0;
- }
-
GNUNET_GNS_disconnect(gns_handle);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
- GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
- GNUNET_YES, GNUNET_NO);
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
}
static void
commence_testing (void *cls, int32_t success, const char *emsg)
{
- GNUNET_NAMESTORE_disconnect(namestore_handle, GNUNET_YES);
gns_handle = GNUNET_GNS_connect(cfg);
}
GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_MX,
+ GNUNET_NO,
+ NULL,
&on_lookup_result, TEST_DOMAIN);
}
end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (d1 != NULL)
- GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL,
- GNUNET_YES, GNUNET_NO);
+ if (pg != NULL)
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
GNUNET_SCHEDULER_cancel (die_task);
}
static void
do_lookup(void *cls, const struct GNUNET_PeerIdentity *id,
- const struct GNUNET_CONFIGURATION_Handle *cfg,
+ const struct GNUNET_CONFIGURATION_Handle *_cfg,
struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
struct GNUNET_CRYPTO_ShortHashCode bob_hash;
struct GNUNET_CRYPTO_RsaSignature *sig;
char* alice_keyfile;
+ struct GNUNET_TIME_Absolute et;
+
+ cfg = _cfg;
GNUNET_SCHEDULER_cancel (die_task);
}
alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
- bob_key = GNUNET_CRYPTO_rsa_key_create ();
+ bob_key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE_BOB);
GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
GNUNET_CRYPTO_rsa_key_get_public (bob_key, &bob_pkey);
struct in_addr *mail = GNUNET_malloc(sizeof(struct in_addr));
char *mx_record;
uint16_t mx_preference = 1;
- rd.expiration = GNUNET_TIME_absolute_get_forever ();
+ rd.expiration_time = UINT64_MAX;
GNUNET_assert(1 == inet_pton (AF_INET, ip, mail));
GNUNET_CRYPTO_short_hash(&bob_pkey, sizeof(bob_pkey), &bob_hash);
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,
alice_key,
rd.data = mail;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
sig = GNUNET_NAMESTORE_create_signature(bob_key,
- GNUNET_TIME_absolute_get_forever(),
+ GNUNET_TIME_UNIT_FOREVER_ABS,
TEST_RECORD_NAME,
&rd, 1);
-
+ et.abs_value = rd.expiration_time;
GNUNET_NAMESTORE_record_put (namestore_handle,
&bob_pkey,
TEST_RECORD_NAME,
- rd.expiration,
+ et,
1,
&rd,
sig,
rd.data = mx_record;
rd.record_type = GNUNET_GNS_RECORD_MX;
sig = GNUNET_NAMESTORE_create_signature(bob_key,
- GNUNET_TIME_absolute_get_forever(),
+ GNUNET_TIME_UNIT_FOREVER_ABS,
"+",
&rd, 1);
+ et.abs_value = rd.expiration_time;
GNUNET_NAMESTORE_record_put (namestore_handle,
&bob_pkey,
"+",
- rd.expiration,
+ et,
1,
&rd,
sig,
"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
int ret;
/* Arguments for GNUNET_PROGRAM_run */
- char *const argv[] = { "test-gns-simple-delegated-lookup", /* Name to give running binary */
+ char *const argv[] = { "test-gns-simple-mx-lookup", /* Name to give running binary */
"-c",
"test_gns_simple_lookup.conf", /* Config file to use */
#if VERBOSE
/* Run the run function as a new program */
ret =
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-gns-simple-delegated-lookup", "nohelp", options, &run,
+ "test-gns-simple-mx-lookup", "nohelp", options, &run,
&ok);
if (ret != GNUNET_OK)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "`test-gns-simple-delegated-lookup': Failed with error code %d\n", ret);
+ "`test-gns-simple-mx-lookup': Failed with error code %d\n", ret);
}
return ok;
}
{
int ret;
- GNUNET_log_setup ("test-gns-simple-lookup",
+ GNUNET_log_setup ("test-gns-simple-mx-lookup",
#if VERBOSE
"DEBUG",
#else
return ret;
}
-/* end of test_gns_twopeer.c */
+/* end of test_gns_simple_mx_lookup.c */
projects / oweals / gnunet.git / blobdiff