diff options
Diffstat (limited to 'src/dv/gnunet-service-dv.c')
-rw-r--r-- | src/dv/gnunet-service-dv.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index e0bb89ccf..d134d88f4 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -230,7 +230,7 @@ struct DirectNeighbor | |||
230 | * ID of the task we use to (periodically) update our consensus | 230 | * ID of the task we use to (periodically) update our consensus |
231 | * with this peer. Used if we are the initiating peer. | 231 | * with this peer. Used if we are the initiating peer. |
232 | */ | 232 | */ |
233 | GNUNET_SCHEDULER_TaskIdentifier initiate_task; | 233 | struct GNUNET_SCHEDULER_Task * initiate_task; |
234 | 234 | ||
235 | /** | 235 | /** |
236 | * At what offset are we, with respect to inserting our own routes | 236 | * At what offset are we, with respect to inserting our own routes |
@@ -386,7 +386,7 @@ static struct GNUNET_ATS_PerformanceHandle *ats; | |||
386 | /** | 386 | /** |
387 | * Task scheduled to refresh routes based on direct neighbours. | 387 | * Task scheduled to refresh routes based on direct neighbours. |
388 | */ | 388 | */ |
389 | static GNUNET_SCHEDULER_TaskIdentifier rr_task; | 389 | static struct GNUNET_SCHEDULER_Task * rr_task; |
390 | 390 | ||
391 | /** | 391 | /** |
392 | * #GNUNET_YES if we are shutting down. | 392 | * #GNUNET_YES if we are shutting down. |
@@ -1138,7 +1138,7 @@ static void | |||
1138 | refresh_routes_task (void *cls, | 1138 | refresh_routes_task (void *cls, |
1139 | const struct GNUNET_SCHEDULER_TaskContext *tc) | 1139 | const struct GNUNET_SCHEDULER_TaskContext *tc) |
1140 | { | 1140 | { |
1141 | rr_task = GNUNET_SCHEDULER_NO_TASK; | 1141 | rr_task = NULL; |
1142 | GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors, | 1142 | GNUNET_CONTAINER_multipeermap_iterate (direct_neighbors, |
1143 | &refresh_routes, | 1143 | &refresh_routes, |
1144 | NULL); | 1144 | NULL); |
@@ -1152,7 +1152,7 @@ refresh_routes_task (void *cls, | |||
1152 | static void | 1152 | static void |
1153 | schedule_refresh_routes () | 1153 | schedule_refresh_routes () |
1154 | { | 1154 | { |
1155 | if (GNUNET_SCHEDULER_NO_TASK == rr_task) | 1155 | if (NULL == rr_task) |
1156 | rr_task = GNUNET_SCHEDULER_add_now (&refresh_routes_task, | 1156 | rr_task = GNUNET_SCHEDULER_add_now (&refresh_routes_task, |
1157 | NULL); | 1157 | NULL); |
1158 | } | 1158 | } |
@@ -1288,10 +1288,10 @@ handle_direct_disconnect (struct DirectNeighbor *neighbor) | |||
1288 | GNUNET_SET_listen_cancel (neighbor->listen_handle); | 1288 | GNUNET_SET_listen_cancel (neighbor->listen_handle); |
1289 | neighbor->listen_handle = NULL; | 1289 | neighbor->listen_handle = NULL; |
1290 | } | 1290 | } |
1291 | if (GNUNET_SCHEDULER_NO_TASK != neighbor->initiate_task) | 1291 | if (NULL != neighbor->initiate_task) |
1292 | { | 1292 | { |
1293 | GNUNET_SCHEDULER_cancel (neighbor->initiate_task); | 1293 | GNUNET_SCHEDULER_cancel (neighbor->initiate_task); |
1294 | neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; | 1294 | neighbor->initiate_task = NULL; |
1295 | } | 1295 | } |
1296 | } | 1296 | } |
1297 | 1297 | ||
@@ -1745,7 +1745,7 @@ initiate_set_union (void *cls, | |||
1745 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1745 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1746 | "Initiating SET union with peer `%s'\n", | 1746 | "Initiating SET union with peer `%s'\n", |
1747 | GNUNET_i2s (&neighbor->peer)); | 1747 | GNUNET_i2s (&neighbor->peer)); |
1748 | neighbor->initiate_task = GNUNET_SCHEDULER_NO_TASK; | 1748 | neighbor->initiate_task = NULL; |
1749 | neighbor->my_set = GNUNET_SET_create (cfg, | 1749 | neighbor->my_set = GNUNET_SET_create (cfg, |
1750 | GNUNET_SET_OPERATION_UNION); | 1750 | GNUNET_SET_OPERATION_UNION); |
1751 | neighbor->set_op = GNUNET_SET_prepare (&neighbor->peer, | 1751 | neighbor->set_op = GNUNET_SET_prepare (&neighbor->peer, |
@@ -2154,10 +2154,10 @@ shutdown_task (void *cls, | |||
2154 | consensi[i].array_length, | 2154 | consensi[i].array_length, |
2155 | 0); | 2155 | 0); |
2156 | } | 2156 | } |
2157 | if (GNUNET_SCHEDULER_NO_TASK != rr_task) | 2157 | if (NULL != rr_task) |
2158 | { | 2158 | { |
2159 | GNUNET_SCHEDULER_cancel (rr_task); | 2159 | GNUNET_SCHEDULER_cancel (rr_task); |
2160 | rr_task = GNUNET_SCHEDULER_NO_TASK; | 2160 | rr_task = NULL; |
2161 | } | 2161 | } |
2162 | } | 2162 | } |
2163 | 2163 | ||