diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/arm_api.c | 28 | ||||
-rw-r--r-- | src/arm/gnunet-arm.c | 11 | ||||
-rw-r--r-- | src/chat/gnunet-service-chat.c | 2 | ||||
-rw-r--r-- | src/consensus/ibf.c | 2 | ||||
-rw-r--r-- | src/consensus/ibf.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_arm_service.h | 4 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 6 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.h | 2 | ||||
-rw-r--r-- | src/transport/gnunet-transport.c | 2 |
9 files changed, 25 insertions, 36 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 49cc55315..9b235f023 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
@@ -444,29 +444,29 @@ GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
444 | * @param h the handle that was being used | 444 | * @param h the handle that was being used |
445 | */ | 445 | */ |
446 | void | 446 | void |
447 | GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *handle) | 447 | GNUNET_ARM_disconnect_and_free (struct GNUNET_ARM_Handle *h) |
448 | { | 448 | { |
449 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n"); | 449 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting from ARM service\n"); |
450 | if (NULL != handle->cth) | 450 | if (NULL != h->cth) |
451 | { | 451 | { |
452 | GNUNET_CLIENT_notify_transmit_ready_cancel (handle->cth); | 452 | GNUNET_CLIENT_notify_transmit_ready_cancel (h->cth); |
453 | handle->cth = NULL; | 453 | h->cth = NULL; |
454 | } | 454 | } |
455 | clear_pending_messages (handle, GNUNET_ARM_REQUEST_DISCONNECTED); | 455 | clear_pending_messages (h, GNUNET_ARM_REQUEST_DISCONNECTED); |
456 | if (NULL != handle->client) | 456 | if (NULL != h->client) |
457 | { | 457 | { |
458 | GNUNET_CLIENT_disconnect (handle->client); | 458 | GNUNET_CLIENT_disconnect (h->client); |
459 | handle->client = NULL; | 459 | h->client = NULL; |
460 | } | 460 | } |
461 | if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task) | 461 | if (GNUNET_SCHEDULER_NO_TASK != h->reconnect_task) |
462 | { | 462 | { |
463 | GNUNET_SCHEDULER_cancel (handle->reconnect_task); | 463 | GNUNET_SCHEDULER_cancel (h->reconnect_task); |
464 | handle->reconnect_task = GNUNET_SCHEDULER_NO_TASK; | 464 | h->reconnect_task = GNUNET_SCHEDULER_NO_TASK; |
465 | } | 465 | } |
466 | if (GNUNET_NO == handle->service_test_is_active) | 466 | if (GNUNET_NO == h->service_test_is_active) |
467 | { | 467 | { |
468 | GNUNET_CONFIGURATION_destroy (handle->cfg); | 468 | GNUNET_CONFIGURATION_destroy (h->cfg); |
469 | GNUNET_free (handle); | 469 | GNUNET_free (h); |
470 | } | 470 | } |
471 | } | 471 | } |
472 | 472 | ||
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index 3d94fed80..aae8b9eda 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c | |||
@@ -248,11 +248,10 @@ static void action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t | |||
248 | * @param arm handle to the ARM connection | 248 | * @param arm handle to the ARM connection |
249 | * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, | 249 | * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, |
250 | * GNUNET_SYSERR on error. | 250 | * GNUNET_SYSERR on error. |
251 | * @param error GNUNET_YES if we encountered a permanent error, and there | ||
252 | * will be no re-connection. | ||
253 | */ | 251 | */ |
254 | static void | 252 | static void |
255 | conn_status (void *cls, struct GNUNET_ARM_Handle *arm, char connected) | 253 | conn_status (void *cls, struct GNUNET_ARM_Handle *arm, |
254 | int connected) | ||
256 | { | 255 | { |
257 | if (GNUNET_SYSERR == connected) | 256 | if (GNUNET_SYSERR == connected) |
258 | { | 257 | { |
@@ -576,13 +575,13 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
576 | else | 575 | else |
577 | GNUNET_free (armconfig); | 576 | GNUNET_free (armconfig); |
578 | } | 577 | } |
579 | h = GNUNET_ARM_connect (cfg, conn_status, NULL); | 578 | h = GNUNET_ARM_connect (cfg, &conn_status, NULL); |
580 | if (NULL != h) | 579 | if (NULL != h) |
581 | { | 580 | { |
582 | m = GNUNET_ARM_monitor (cfg, srv_status, NULL); | 581 | m = GNUNET_ARM_monitor (cfg, &srv_status, NULL); |
583 | if (NULL != m) | 582 | if (NULL != m) |
584 | { | 583 | { |
585 | GNUNET_SCHEDULER_add_now (action_loop, NULL); | 584 | GNUNET_SCHEDULER_add_now (&action_loop, NULL); |
586 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 585 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
587 | shutdown_task, NULL); | 586 | shutdown_task, NULL); |
588 | } | 587 | } |
diff --git a/src/chat/gnunet-service-chat.c b/src/chat/gnunet-service-chat.c index e01143cf7..9c3fcfb39 100644 --- a/src/chat/gnunet-service-chat.c +++ b/src/chat/gnunet-service-chat.c | |||
@@ -1358,8 +1358,6 @@ handle_p2p_sync_request (void *cls, const struct GNUNET_PeerIdentity *other, | |||
1358 | * @param cls closure, always NULL | 1358 | * @param cls closure, always NULL |
1359 | * @param other the other peer involved | 1359 | * @param other the other peer involved |
1360 | * @param message the actual message | 1360 | * @param message the actual message |
1361 | * @param atsi performance information | ||
1362 | * @param atsi_count number of entries in atsi | ||
1363 | * @return GNUNET_OK to keep the connection open, | 1361 | * @return GNUNET_OK to keep the connection open, |
1364 | * GNUNET_SYSERR to close it (signal serious error) | 1362 | * GNUNET_SYSERR to close it (signal serious error) |
1365 | */ | 1363 | */ |
diff --git a/src/consensus/ibf.c b/src/consensus/ibf.c index 2d2949334..87dbdd696 100644 --- a/src/consensus/ibf.c +++ b/src/consensus/ibf.c | |||
@@ -174,7 +174,7 @@ ibf_is_empty (struct InvertibleBloomFilter *ibf) | |||
174 | * @param ret_side sign of the cell's count where the decoded element came from. | 174 | * @param ret_side sign of the cell's count where the decoded element came from. |
175 | * A negative sign indicates that the element was recovered | 175 | * A negative sign indicates that the element was recovered |
176 | * resides in an IBF that was previously subtracted from. | 176 | * resides in an IBF that was previously subtracted from. |
177 | * @param ret_key receives the hash code of the decoded element, if successful | 177 | * @param ret_id receives the hash code of the decoded element, if successful |
178 | * @return GNUNET_YES if decoding an element was successful, | 178 | * @return GNUNET_YES if decoding an element was successful, |
179 | * GNUNET_NO if the IBF is empty, | 179 | * GNUNET_NO if the IBF is empty, |
180 | * GNUNET_SYSERR if the decoding has failed | 180 | * GNUNET_SYSERR if the decoding has failed |
diff --git a/src/consensus/ibf.h b/src/consensus/ibf.h index d6c3874aa..609653889 100644 --- a/src/consensus/ibf.h +++ b/src/consensus/ibf.h | |||
@@ -223,13 +223,13 @@ ibf_subtract (struct InvertibleBloomFilter *ibf1, const struct InvertibleBloomFi | |||
223 | * @param ret_side sign of the cell's count where the decoded element came from. | 223 | * @param ret_side sign of the cell's count where the decoded element came from. |
224 | * A negative sign indicates that the element was recovered | 224 | * A negative sign indicates that the element was recovered |
225 | * resides in an IBF that was previously subtracted from. | 225 | * resides in an IBF that was previously subtracted from. |
226 | * @param ret_key receives the hash code of the decoded element, if successful | 226 | * @param ret_id receives the hash code of the decoded element, if successful |
227 | * @return GNUNET_YES if decoding an element was successful, | 227 | * @return GNUNET_YES if decoding an element was successful, |
228 | * GNUNET_NO if the IBF is empty, | 228 | * GNUNET_NO if the IBF is empty, |
229 | * GNUNET_SYSERR if the decoding has failed | 229 | * GNUNET_SYSERR if the decoding has failed |
230 | */ | 230 | */ |
231 | int | 231 | int |
232 | ibf_decode (struct InvertibleBloomFilter *ibf, int *ret_side, struct IBF_Key *ret_key); | 232 | ibf_decode (struct InvertibleBloomFilter *ibf, int *ret_side, struct IBF_Key *ret_id); |
233 | 233 | ||
234 | 234 | ||
235 | /** | 235 | /** |
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h index 4cc247d19..9f2c9ea50 100644 --- a/src/include/gnunet_arm_service.h +++ b/src/include/gnunet_arm_service.h | |||
@@ -184,7 +184,9 @@ struct GNUNET_ARM_Handle; | |||
184 | * @param error GNUNET_YES if we encountered a permanent error, and there | 184 | * @param error GNUNET_YES if we encountered a permanent error, and there |
185 | * will be no re-connection. | 185 | * will be no re-connection. |
186 | */ | 186 | */ |
187 | typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, struct GNUNET_ARM_Handle *arm, char connected); | 187 | typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, |
188 | struct GNUNET_ARM_Handle *arm, | ||
189 | int connected); | ||
188 | 190 | ||
189 | 191 | ||
190 | /** | 192 | /** |
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 6c51dacca..8886a344c 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -2142,8 +2142,6 @@ handle_test_blacklist_cont (void *cls, | |||
2142 | * @param address address of the other peer, NULL if other peer | 2142 | * @param address address of the other peer, NULL if other peer |
2143 | * connected to us | 2143 | * connected to us |
2144 | * @param session session to use (or NULL) | 2144 | * @param session session to use (or NULL) |
2145 | * @param ats performance data | ||
2146 | * @param ats_count number of entries in ats (excluding 0-termination) | ||
2147 | */ | 2145 | */ |
2148 | static void | 2146 | static void |
2149 | check_blacklist (const struct GNUNET_PeerIdentity *peer, | 2147 | check_blacklist (const struct GNUNET_PeerIdentity *peer, |
@@ -2181,8 +2179,6 @@ check_blacklist (const struct GNUNET_PeerIdentity *peer, | |||
2181 | * @param address address of the other peer, NULL if other peer | 2179 | * @param address address of the other peer, NULL if other peer |
2182 | * connected to us | 2180 | * connected to us |
2183 | * @param session session to use (or NULL) | 2181 | * @param session session to use (or NULL) |
2184 | * @param ats performance data | ||
2185 | * @param ats_count number of entries in ats (excluding 0-termination) | ||
2186 | */ | 2182 | */ |
2187 | void | 2183 | void |
2188 | GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, | 2184 | GST_neighbours_handle_connect (const struct GNUNET_MessageHeader *message, |
@@ -2745,8 +2741,6 @@ send_session_ack_message (struct NeighbourMapEntry *n) | |||
2745 | * @param address address of the other peer, NULL if other peer | 2741 | * @param address address of the other peer, NULL if other peer |
2746 | * connected to us | 2742 | * connected to us |
2747 | * @param session session to use (or NULL) | 2743 | * @param session session to use (or NULL) |
2748 | * @param ats performance data | ||
2749 | * @param ats_count number of entries in ats | ||
2750 | */ | 2744 | */ |
2751 | void | 2745 | void |
2752 | GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, | 2746 | GST_neighbours_handle_connect_ack (const struct GNUNET_MessageHeader *message, |
diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h index fbf7d7819..aae0a82b8 100644 --- a/src/transport/gnunet-service-transport_neighbours.h +++ b/src/transport/gnunet-service-transport_neighbours.h | |||
@@ -168,8 +168,6 @@ GST_neighbours_force_disconnect (const struct GNUNET_PeerIdentity *target); | |||
168 | * | 168 | * |
169 | * @param cls closure | 169 | * @param cls closure |
170 | * @param neighbour identity of the neighbour | 170 | * @param neighbour identity of the neighbour |
171 | * @param ats performance data | ||
172 | * @param ats_count number of entries in ats (including 0-termination) | ||
173 | * @param address the address (or NULL) | 171 | * @param address the address (or NULL) |
174 | * @param bandwidth_in inbound quota in NBO | 172 | * @param bandwidth_in inbound quota in NBO |
175 | * @param bandwidth_out outbound quota in NBO | 173 | * @param bandwidth_out outbound quota in NBO |
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index 929963127..1c3b5e59c 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c | |||
@@ -515,8 +515,6 @@ transmit_data (void *cls, size_t size, void *buf) | |||
515 | * | 515 | * |
516 | * @param cls closure | 516 | * @param cls closure |
517 | * @param peer the peer that connected | 517 | * @param peer the peer that connected |
518 | * @param ats performance data | ||
519 | * @param ats_count number of entries in ats (excluding 0-termination) | ||
520 | */ | 518 | */ |
521 | static void | 519 | static void |
522 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) | 520 | notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) |