diff options
Diffstat (limited to 'src/dht/gnunet-service-dht_neighbours.c')
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c index 889ef25ba..1d7eb560c 100644 --- a/src/dht/gnunet-service-dht_neighbours.c +++ b/src/dht/gnunet-service-dht_neighbours.c | |||
@@ -438,7 +438,7 @@ static struct GNUNET_HashCode my_identity_hash; | |||
438 | /** | 438 | /** |
439 | * Handle to CORE. | 439 | * Handle to CORE. |
440 | */ | 440 | */ |
441 | static struct GNUNET_CORE_Handle *coreAPI; | 441 | static struct GNUNET_CORE_Handle *core_api; |
442 | 442 | ||
443 | /** | 443 | /** |
444 | * Handle to ATS. | 444 | * Handle to ATS. |
@@ -801,7 +801,7 @@ core_transmit_notify (void *cls, size_t size, void *buf) | |||
801 | if (buf == NULL) | 801 | if (buf == NULL) |
802 | { | 802 | { |
803 | peer->th = | 803 | peer->th = |
804 | GNUNET_CORE_notify_transmit_ready (coreAPI, GNUNET_NO, | 804 | GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO, |
805 | pending->importance, | 805 | pending->importance, |
806 | GNUNET_TIME_absolute_get_remaining | 806 | GNUNET_TIME_absolute_get_remaining |
807 | (pending->timeout), &peer->id, | 807 | (pending->timeout), &peer->id, |
@@ -827,7 +827,7 @@ core_transmit_notify (void *cls, size_t size, void *buf) | |||
827 | if (peer->head != NULL) | 827 | if (peer->head != NULL) |
828 | { | 828 | { |
829 | peer->th = | 829 | peer->th = |
830 | GNUNET_CORE_notify_transmit_ready (coreAPI, GNUNET_NO, | 830 | GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO, |
831 | pending->importance, | 831 | pending->importance, |
832 | GNUNET_TIME_absolute_get_remaining | 832 | GNUNET_TIME_absolute_get_remaining |
833 | (pending->timeout), &peer->id, msize, | 833 | (pending->timeout), &peer->id, msize, |
@@ -857,7 +857,7 @@ process_peer_queue (struct PeerInfo *peer) | |||
857 | ("# Bytes of bandwidth requested from core"), | 857 | ("# Bytes of bandwidth requested from core"), |
858 | ntohs (pending->msg->size), GNUNET_NO); | 858 | ntohs (pending->msg->size), GNUNET_NO); |
859 | peer->th = | 859 | peer->th = |
860 | GNUNET_CORE_notify_transmit_ready (coreAPI, GNUNET_NO, | 860 | GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO, |
861 | pending->importance, | 861 | pending->importance, |
862 | GNUNET_TIME_absolute_get_remaining | 862 | GNUNET_TIME_absolute_get_remaining |
863 | (pending->timeout), &peer->id, | 863 | (pending->timeout), &peer->id, |
@@ -2179,11 +2179,11 @@ GDS_NEIGHBOURS_init () | |||
2179 | log_route_details_stderr = | 2179 | log_route_details_stderr = |
2180 | (NULL != getenv("GNUNET_DHT_ROUTE_DEBUG")) ? GNUNET_YES : GNUNET_NO; | 2180 | (NULL != getenv("GNUNET_DHT_ROUTE_DEBUG")) ? GNUNET_YES : GNUNET_NO; |
2181 | atsAPI = GNUNET_ATS_performance_init (GDS_cfg, NULL, NULL); | 2181 | atsAPI = GNUNET_ATS_performance_init (GDS_cfg, NULL, NULL); |
2182 | coreAPI = | 2182 | core_api = |
2183 | GNUNET_CORE_connect (GDS_cfg, NULL, &core_init, &handle_core_connect, | 2183 | GNUNET_CORE_connect (GDS_cfg, NULL, &core_init, &handle_core_connect, |
2184 | &handle_core_disconnect, NULL, GNUNET_NO, NULL, | 2184 | &handle_core_disconnect, NULL, GNUNET_NO, NULL, |
2185 | GNUNET_NO, core_handlers); | 2185 | GNUNET_NO, core_handlers); |
2186 | if (coreAPI == NULL) | 2186 | if (core_api == NULL) |
2187 | return GNUNET_SYSERR; | 2187 | return GNUNET_SYSERR; |
2188 | all_known_peers = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_NO); | 2188 | all_known_peers = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_NO); |
2189 | return GNUNET_OK; | 2189 | return GNUNET_OK; |
@@ -2196,10 +2196,10 @@ GDS_NEIGHBOURS_init () | |||
2196 | void | 2196 | void |
2197 | GDS_NEIGHBOURS_done () | 2197 | GDS_NEIGHBOURS_done () |
2198 | { | 2198 | { |
2199 | if (NULL == coreAPI) | 2199 | if (NULL == core_api) |
2200 | return; | 2200 | return; |
2201 | GNUNET_CORE_disconnect (coreAPI); | 2201 | GNUNET_CORE_disconnect (core_api); |
2202 | coreAPI = NULL; | 2202 | core_api = NULL; |
2203 | GNUNET_ATS_performance_done (atsAPI); | 2203 | GNUNET_ATS_performance_done (atsAPI); |
2204 | atsAPI = NULL; | 2204 | atsAPI = NULL; |
2205 | GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (all_known_peers)); | 2205 | GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (all_known_peers)); |