diff options
Diffstat (limited to 'src/ats/gnunet-service-ats_addresses.c')
-rw-r--r-- | src/ats/gnunet-service-ats_addresses.c | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 89158936d..7c9c921cc 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c | |||
@@ -249,26 +249,26 @@ struct GAS_Addresses_Suggestion_Requests | |||
249 | struct GNUNET_PeerIdentity id; | 249 | struct GNUNET_PeerIdentity id; |
250 | }; | 250 | }; |
251 | 251 | ||
252 | /** | 252 | /** |
253 | * Pending Address suggestion requests | 253 | * Pending Address suggestion requests |
254 | */ | 254 | */ |
255 | struct GAS_Addresses_Preference_Clients | 255 | struct GAS_Addresses_Preference_Clients |
256 | { | 256 | { |
257 | /** | 257 | /** |
258 | * Next in DLL | 258 | * Next in DLL |
259 | */ | 259 | */ |
260 | struct GAS_Addresses_Preference_Clients *next; | 260 | struct GAS_Addresses_Preference_Clients *next; |
261 | 261 | ||
262 | /** | 262 | /** |
263 | * Previous in DLL | 263 | * Previous in DLL |
264 | */ | 264 | */ |
265 | struct GAS_Addresses_Preference_Clients *prev; | 265 | struct GAS_Addresses_Preference_Clients *prev; |
266 | 266 | ||
267 | /** | 267 | /** |
268 | * Peer ID | 268 | * Peer ID |
269 | */ | 269 | */ |
270 | void *client; | 270 | void *client; |
271 | }; | 271 | }; |
272 | 272 | ||
273 | /** | 273 | /** |
274 | * Handle for ATS address component | 274 | * Handle for ATS address component |
@@ -301,7 +301,7 @@ struct GAS_Addresses_Handle | |||
301 | int ats_mode; | 301 | int ats_mode; |
302 | 302 | ||
303 | /** | 303 | /** |
304 | * Solver handle | 304 | * Solver handle |
305 | */ | 305 | */ |
306 | void *solver; | 306 | void *solver; |
307 | 307 | ||
@@ -316,12 +316,12 @@ struct GAS_Addresses_Handle | |||
316 | struct GAS_Addresses_Suggestion_Requests *pending_requests_tail; | 316 | struct GAS_Addresses_Suggestion_Requests *pending_requests_tail; |
317 | 317 | ||
318 | /** | 318 | /** |
319 | * Address suggestion requests DLL head | 319 | * Preference requests DLL head |
320 | */ | 320 | */ |
321 | struct GAS_Addresses_Preference_Clients *preference_clients_head; | 321 | struct GAS_Addresses_Preference_Clients *preference_clients_head; |
322 | 322 | ||
323 | /** | 323 | /** |
324 | * Address suggestion requests DLL head | 324 | * Preference requests DLL head |
325 | */ | 325 | */ |
326 | struct GAS_Addresses_Preference_Clients *preference_clients_tail; | 326 | struct GAS_Addresses_Preference_Clients *preference_clients_tail; |
327 | 327 | ||
@@ -1068,10 +1068,10 @@ destroy_by_session_id (void *cls, | |||
1068 | const struct ATS_Address *des = dc->aa; | 1068 | const struct ATS_Address *des = dc->aa; |
1069 | struct ATS_Address *aa = value; | 1069 | struct ATS_Address *aa = value; |
1070 | 1070 | ||
1071 | GNUNET_assert(0 == | 1071 | GNUNET_assert (0 == |
1072 | memcmp (&aa->peer, | 1072 | memcmp (&aa->peer, |
1073 | &des->peer, | 1073 | &des->peer, |
1074 | sizeof (struct GNUNET_PeerIdentity))); | 1074 | sizeof (struct GNUNET_PeerIdentity))); |
1075 | if (0 == des->session_id) | 1075 | if (0 == des->session_id) |
1076 | { | 1076 | { |
1077 | /* Session == 0, remove full address */ | 1077 | /* Session == 0, remove full address */ |
@@ -1207,16 +1207,17 @@ GAS_addresses_destroy (struct GAS_Addresses_Handle *handle, | |||
1207 | session_id); | 1207 | session_id); |
1208 | if (NULL == ea) | 1208 | if (NULL == ea) |
1209 | { | 1209 | { |
1210 | GNUNET_log(GNUNET_ERROR_TYPE_INFO, | 1210 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
1211 | "Tried to destroy unknown address for peer `%s' `%s' session id %u\n", | 1211 | "Tried to destroy unknown address for peer `%s' `%s' session id %u\n", |
1212 | GNUNET_i2s (peer), | 1212 | GNUNET_i2s (peer), |
1213 | plugin_name, | 1213 | plugin_name, |
1214 | session_id); | 1214 | session_id); |
1215 | return; | 1215 | return; |
1216 | } | 1216 | } |
1217 | 1217 | ||
1218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1219 | "Received `%s' for peer `%s' address %p session %u\n", "ADDRESS DESTROY", | 1219 | "Received `%s' for peer `%s' address %p session %u\n", |
1220 | "ADDRESS DESTROYED", | ||
1220 | GNUNET_i2s (peer), | 1221 | GNUNET_i2s (peer), |
1221 | ea, | 1222 | ea, |
1222 | session_id); | 1223 | session_id); |
@@ -1226,7 +1227,8 @@ GAS_addresses_destroy (struct GAS_Addresses_Handle *handle, | |||
1226 | plugin_name, | 1227 | plugin_name, |
1227 | plugin_addr, | 1228 | plugin_addr, |
1228 | plugin_addr_len, | 1229 | plugin_addr_len, |
1229 | local_address_info, session_id); | 1230 | local_address_info, |
1231 | session_id); | ||
1230 | GNUNET_CONTAINER_multipeermap_get_multiple (handle->addresses, | 1232 | GNUNET_CONTAINER_multipeermap_get_multiple (handle->addresses, |
1231 | peer, | 1233 | peer, |
1232 | &destroy_by_session_id, &dc); | 1234 | &destroy_by_session_id, &dc); |