diff options
Diffstat (limited to 'src/gns/test_gns_dht_three_peers.c')
-rw-r--r-- | src/gns/test_gns_dht_three_peers.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c index a7bad9bba..2a109559f 100644 --- a/src/gns/test_gns_dht_three_peers.c +++ b/src/gns/test_gns_dht_three_peers.c | |||
@@ -42,14 +42,9 @@ | |||
42 | 42 | ||
43 | #define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10) | 43 | #define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10) |
44 | 44 | ||
45 | /* If number of peers not in config file, use this number */ | ||
46 | #define DEFAULT_NUM_PEERS 2 | ||
47 | |||
48 | #define TEST_DOMAIN "www.buddy.bob.gads" | 45 | #define TEST_DOMAIN "www.buddy.bob.gads" |
49 | #define TEST_IP "1.1.1.1" | 46 | #define TEST_IP "1.1.1.1" |
50 | #define TEST_DAVE_PSEU "hagbard" | 47 | #define TEST_DAVE_PSEU "hagbard" |
51 | #define TEST_NUM_PEERS 3 | ||
52 | #define TEST_NUM_CON 3 | ||
53 | 48 | ||
54 | 49 | ||
55 | /* Timeout for entire testcase */ | 50 | /* Timeout for entire testcase */ |
@@ -59,22 +54,23 @@ | |||
59 | static int ok; | 54 | static int ok; |
60 | 55 | ||
61 | /* Task handle to use to schedule test failure */ | 56 | /* Task handle to use to schedule test failure */ |
62 | GNUNET_SCHEDULER_TaskIdentifier die_task; | 57 | static GNUNET_SCHEDULER_TaskIdentifier die_task; |
63 | GNUNET_SCHEDULER_TaskIdentifier wait_task; | 58 | |
59 | static GNUNET_SCHEDULER_TaskIdentifier wait_task; | ||
64 | 60 | ||
65 | struct GNUNET_CRYPTO_ShortHashCode dave_hash; | 61 | static struct GNUNET_CRYPTO_ShortHashCode dave_hash; |
66 | 62 | ||
67 | struct GNUNET_CRYPTO_ShortHashCode bob_hash; | 63 | static struct GNUNET_CRYPTO_ShortHashCode bob_hash; |
68 | 64 | ||
69 | struct GNUNET_TESTBED_Peer **cpeers; | 65 | static struct GNUNET_TESTBED_Peer **cpeers; |
70 | 66 | ||
71 | struct GNUNET_GNS_Handle *gh; | 67 | static struct GNUNET_GNS_Handle *gh; |
72 | struct GNUNET_GNS_LookupRequest *lookup_handle; | 68 | static struct GNUNET_GNS_LookupRequest *lookup_handle; |
73 | 69 | ||
74 | struct GNUNET_TESTBED_Operation *get_cfg_ops[3]; | 70 | static struct GNUNET_TESTBED_Operation *get_cfg_ops[3]; |
75 | struct GNUNET_TESTBED_Operation *connect_ops[3]; | 71 | static struct GNUNET_TESTBED_Operation *connect_ops[3]; |
76 | struct GNUNET_CONFIGURATION_Handle *cfg_handles[3]; | 72 | static struct GNUNET_CONFIGURATION_Handle *cfg_handles[3]; |
77 | struct GNUNET_NAMESTORE_Handle *nh[3]; | 73 | static struct GNUNET_NAMESTORE_Handle *nh[3]; |
78 | 74 | ||
79 | static int dave_is_setup; | 75 | static int dave_is_setup; |
80 | static int bob_is_setup; | 76 | static int bob_is_setup; |