diff options
-rw-r--r-- | src/ats/test_ats_solver_request_and_delete_address.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/ats/test_ats_solver_request_and_delete_address.c b/src/ats/test_ats_solver_request_and_delete_address.c index c30aaf833..38e7ffc8b 100644 --- a/src/ats/test_ats_solver_request_and_delete_address.c +++ b/src/ats/test_ats_solver_request_and_delete_address.c | |||
@@ -43,7 +43,7 @@ static struct GNUNET_SCHEDULER_Task * die_task; | |||
43 | /** | 43 | /** |
44 | * Statistics handle | 44 | * Statistics handle |
45 | */ | 45 | */ |
46 | struct GNUNET_STATISTICS_Handle *stats; | 46 | static struct GNUNET_STATISTICS_Handle *stats; |
47 | 47 | ||
48 | /** | 48 | /** |
49 | * Scheduling handle | 49 | * Scheduling handle |
@@ -68,7 +68,7 @@ static struct PeerContext p; | |||
68 | /** | 68 | /** |
69 | * HELLO address | 69 | * HELLO address |
70 | */ | 70 | */ |
71 | struct GNUNET_HELLO_Address test_hello_address; | 71 | static struct GNUNET_HELLO_Address test_hello_address; |
72 | 72 | ||
73 | /** | 73 | /** |
74 | * Session | 74 | * Session |
@@ -88,10 +88,12 @@ static uint32_t test_ats_count; | |||
88 | 88 | ||
89 | static int address_deleted = GNUNET_NO; | 89 | static int address_deleted = GNUNET_NO; |
90 | 90 | ||
91 | |||
91 | static int | 92 | static int |
92 | stat_cb(void *cls, const char *subsystem, const char *name, uint64_t value, | 93 | stat_cb(void *cls, const char *subsystem, const char *name, uint64_t value, |
93 | int is_persistent); | 94 | int is_persistent); |
94 | 95 | ||
96 | |||
95 | static void | 97 | static void |
96 | end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 98 | end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
97 | { | 99 | { |
@@ -125,11 +127,11 @@ static void | |||
125 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 127 | end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
126 | { | 128 | { |
127 | die_task = NULL; | 129 | die_task = NULL; |
128 | 130 | end (NULL, NULL); | |
129 | end ( NULL, NULL); | ||
130 | ret = GNUNET_SYSERR; | 131 | ret = GNUNET_SYSERR; |
131 | } | 132 | } |
132 | 133 | ||
134 | |||
133 | static void | 135 | static void |
134 | address_suggest_cb (void *cls, | 136 | address_suggest_cb (void *cls, |
135 | const struct GNUNET_PeerIdentity *peer, | 137 | const struct GNUNET_PeerIdentity *peer, |
@@ -140,7 +142,6 @@ address_suggest_cb (void *cls, | |||
140 | const struct GNUNET_ATS_Information *atsi, | 142 | const struct GNUNET_ATS_Information *atsi, |
141 | uint32_t ats_count) | 143 | uint32_t ats_count) |
142 | { | 144 | { |
143 | |||
144 | if (GNUNET_NO == address_deleted) | 145 | if (GNUNET_NO == address_deleted) |
145 | { | 146 | { |
146 | /* Expected address suggestion */ | 147 | /* Expected address suggestion */ |
@@ -154,7 +155,6 @@ address_suggest_cb (void *cls, | |||
154 | GNUNET_i2s (&address->peer)); | 155 | GNUNET_i2s (&address->peer)); |
155 | address_deleted = GNUNET_YES; | 156 | address_deleted = GNUNET_YES; |
156 | GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, NULL); | 157 | GNUNET_ATS_address_destroyed (sched_ats, &test_hello_address, NULL); |
157 | |||
158 | } | 158 | } |
159 | else | 159 | else |
160 | { | 160 | { |
@@ -173,7 +173,6 @@ address_suggest_cb (void *cls, | |||
173 | GNUNET_SCHEDULER_add_now (&end, NULL); | 173 | GNUNET_SCHEDULER_add_now (&end, NULL); |
174 | } | 174 | } |
175 | } | 175 | } |
176 | return; | ||
177 | } | 176 | } |
178 | 177 | ||
179 | 178 | ||
@@ -183,8 +182,11 @@ stat_cb(void *cls, const char *subsystem, | |||
183 | int is_persistent) | 182 | int is_persistent) |
184 | { | 183 | { |
185 | 184 | ||
186 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n", | 185 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
187 | subsystem,name, value); | 186 | "ATS statistics: `%s' `%s' %llu\n", |
187 | subsystem, | ||
188 | name, | ||
189 | value); | ||
188 | if (GNUNET_NO == address_deleted) | 190 | if (GNUNET_NO == address_deleted) |
189 | GNUNET_ATS_suggest_address (sched_ats, &p.id); | 191 | GNUNET_ATS_suggest_address (sched_ats, &p.id); |
190 | return GNUNET_OK; | 192 | return GNUNET_OK; |
@@ -192,8 +194,9 @@ stat_cb(void *cls, const char *subsystem, | |||
192 | 194 | ||
193 | 195 | ||
194 | static void | 196 | static void |
195 | run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg, | 197 | run (void *cls, |
196 | struct GNUNET_TESTING_Peer *peer) | 198 | const struct GNUNET_CONFIGURATION_Handle *mycfg, |
199 | struct GNUNET_TESTING_Peer *peer) | ||
197 | { | 200 | { |
198 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); | 201 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); |
199 | stats = GNUNET_STATISTICS_create ("ats", mycfg); | 202 | stats = GNUNET_STATISTICS_create ("ats", mycfg); |
@@ -231,8 +234,8 @@ run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg, | |||
231 | 234 | ||
232 | /* Adding address */ | 235 | /* Adding address */ |
233 | GNUNET_ATS_address_add (sched_ats, &test_hello_address, | 236 | GNUNET_ATS_address_add (sched_ats, &test_hello_address, |
234 | NULL, test_ats_info, test_ats_count); | 237 | NULL, |
235 | 238 | test_ats_info, test_ats_count); | |
236 | } | 239 | } |
237 | 240 | ||
238 | 241 | ||