projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-fix no-dot-in-path issue on FreeBSD bot
[oweals/gnunet.git]
/
src
/
gns
/
test_gns_dht_delegated_lookup.c
diff --git
a/src/gns/test_gns_dht_delegated_lookup.c
b/src/gns/test_gns_dht_delegated_lookup.c
index 9c9a43cf5841d6113a83725433ff5e35b0399105..f9531751ad4e3638e0f4fae675d4350391244bb4 100644
(file)
--- a/
src/gns/test_gns_dht_delegated_lookup.c
+++ b/
src/gns/test_gns_dht_delegated_lookup.c
@@
-33,20
+33,14
@@
#include "gnunet_dht_service.h"
#include "gnunet_gns_service.h"
#include "gnunet_dht_service.h"
#include "gnunet_gns_service.h"
-/* DEFINES */
-#define VERBOSE GNUNET_YES
-
/* Timeout for entire testcase */
#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
/* Timeout for entire testcase */
#define DHT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
/* Timeout for entire testcase */
#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
/* Timeout for entire testcase */
#define DHT_DELAY 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
-
/* test records to resolve */
/* test records to resolve */
-#define TEST_DOMAIN "www.bob.g
nunet
"
+#define TEST_DOMAIN "www.bob.g
ads
"
#define TEST_IP "127.0.0.1"
#define TEST_RECORD_NAME "www"
#define TEST_IP "127.0.0.1"
#define TEST_RECORD_NAME "www"
@@
-56,11
+50,9
@@
#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
#define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
-/* Globals */
-
/* Task handle to use to schedule test failure */
/* 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;
/* Global return value (0 for success, anything else for failure) */
static int ok;
/* Global return value (0 for success, anything else for failure) */
static int ok;
@@
-71,12
+63,12
@@
static struct GNUNET_GNS_Handle *gns_handle;
static struct GNUNET_DHT_Handle *dht_handle;
static struct GNUNET_DHT_Handle *dht_handle;
-const struct GNUNET_CONFIGURATION_Handle *cfg;
+
static
const struct GNUNET_CONFIGURATION_Handle *cfg;
-struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
-struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
-struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
-struct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
+st
atic st
ruct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
+st
atic st
ruct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
+st
atic st
ruct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
+st
atic st
ruct GNUNET_CRYPTO_RsaPrivateKey *bob_key;
/**
/**
@@
-110,6
+102,7
@@
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
ok = 1;
}
ok = 1;
}
+
static void
end_badly_now ()
{
static void
end_badly_now ()
{
@@
-124,6
+117,16
@@
end_badly_now ()
}
}
+static void
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_GNS_disconnect(gns_handle);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
+ GNUNET_SCHEDULER_shutdown ();
+}
+
+
static void
on_lookup_result(void *cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
static void
on_lookup_result(void *cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
@@
-171,12
+174,10
@@
on_lookup_result(void *cls, uint32_t rd_count,
}
}
}
}
}
}
- GNUNET_GNS_disconnect(gns_handle);
- gns_handle = NULL;
GNUNET_DHT_disconnect (dht_handle);
dht_handle = NULL;
GNUNET_DHT_disconnect (dht_handle);
dht_handle = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
- GNUNET_SCHEDULER_
shutdown (
);
+
+ GNUNET_SCHEDULER_
add_now (&shutdown_task, NULL
);
}
}
@@
-271,7
+272,7
@@
put_dht(void *cls, int32_t success, const char *emsg)
strlen(TEST_RECORD_NAME) + 1;
GNUNET_DHT_put (dht_handle, &xor_hash,
0,
strlen(TEST_RECORD_NAME) + 1;
GNUNET_DHT_put (dht_handle, &xor_hash,
0,
- GNUNET_DHT_RO_
NON
E,
+ GNUNET_DHT_RO_
DEMULTIPLEX_EVERYWHER
E,
GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
rd_payload_length,
(char*)nrb,
GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
rd_payload_length,
(char*)nrb,
@@
-290,6
+291,7
@@
put_dht(void *cls, int32_t success, const char *emsg)
wait_task = GNUNET_SCHEDULER_add_delayed(DHT_DELAY, &commence_testing, NULL);
}
wait_task = GNUNET_SCHEDULER_add_delayed(DHT_DELAY, &commence_testing, NULL);
}
+
static void
do_check (void *cls,
const struct GNUNET_CONFIGURATION_Handle *ccfg,
static void
do_check (void *cls,
const struct GNUNET_CONFIGURATION_Handle *ccfg,
@@
-359,11
+361,7
@@
main (int argc, char *argv[])
ok = 1;
GNUNET_log_setup ("test-gns-dht-delegated-lookup",
ok = 1;
GNUNET_log_setup ("test-gns-dht-delegated-lookup",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
"WARNING",
-#endif
NULL);
GNUNET_TESTING_peer_run ("test-gns-dht-delegated-lookup", "test_gns_simple_lookup.conf", &do_check, NULL);
return ok;
NULL);
GNUNET_TESTING_peer_run ("test-gns-dht-delegated-lookup", "test_gns_simple_lookup.conf", &do_check, NULL);
return ok;