aboutsummaryrefslogtreecommitdiff
path: root/src/sensor/gnunet-service-sensor_reporting.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/sensor/gnunet-service-sensor_reporting.c')
-rw-r--r--src/sensor/gnunet-service-sensor_reporting.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/sensor/gnunet-service-sensor_reporting.c b/src/sensor/gnunet-service-sensor_reporting.c
index 8d69836a0..d08d67449 100644
--- a/src/sensor/gnunet-service-sensor_reporting.c
+++ b/src/sensor/gnunet-service-sensor_reporting.c
@@ -162,9 +162,9 @@ struct ValueInfo
162 struct GNUNET_PEERSTORE_WatchContext *wc; 162 struct GNUNET_PEERSTORE_WatchContext *wc;
163 163
164 /** 164 /**
165 * Collection point reporting task (or #GNUNET_SCHEDULER_NO_TASK) 165 * Collection point reporting task (or #NULL)
166 */ 166 */
167 GNUNET_SCHEDULER_TaskIdentifier reporting_task; 167 struct GNUNET_SCHEDULER_Task * reporting_task;
168 168
169}; 169};
170 170
@@ -237,7 +237,7 @@ struct CadetPeer
237 /** 237 /**
238 * Task used to try reconnection to collection point after failure 238 * Task used to try reconnection to collection point after failure
239 */ 239 */
240 GNUNET_SCHEDULER_TaskIdentifier reconnect_task; 240 struct GNUNET_SCHEDULER_Task * reconnect_task;
241 241
242 /** 242 /**
243 * Are we currently destroying the channel and its context? 243 * Are we currently destroying the channel and its context?
@@ -400,10 +400,10 @@ destroy_value_info (struct ValueInfo *vi)
400 GNUNET_PEERSTORE_watch_cancel (vi->wc); 400 GNUNET_PEERSTORE_watch_cancel (vi->wc);
401 vi->wc = NULL; 401 vi->wc = NULL;
402 } 402 }
403 if (GNUNET_SCHEDULER_NO_TASK != vi->reporting_task) 403 if (NULL != vi->reporting_task)
404 { 404 {
405 GNUNET_SCHEDULER_cancel (vi->reporting_task); 405 GNUNET_SCHEDULER_cancel (vi->reporting_task);
406 vi->reporting_task = GNUNET_SCHEDULER_NO_TASK; 406 vi->reporting_task = NULL;
407 } 407 }
408 if (NULL != vi->last_value) 408 if (NULL != vi->last_value)
409 { 409 {
@@ -463,10 +463,10 @@ static void
463destroy_cadet_peer (struct CadetPeer *cadetp) 463destroy_cadet_peer (struct CadetPeer *cadetp)
464{ 464{
465 cadetp->destroying = GNUNET_YES; 465 cadetp->destroying = GNUNET_YES;
466 if (GNUNET_SCHEDULER_NO_TASK != cadetp->reconnect_task) 466 if (NULL != cadetp->reconnect_task)
467 { 467 {
468 GNUNET_SCHEDULER_cancel (cadetp->reconnect_task); 468 GNUNET_SCHEDULER_cancel (cadetp->reconnect_task);
469 cadetp->reconnect_task = GNUNET_SCHEDULER_NO_TASK; 469 cadetp->reconnect_task = NULL;
470 } 470 }
471 if (NULL != cadetp->mq) 471 if (NULL != cadetp->mq)
472 { 472 {
@@ -625,7 +625,7 @@ cp_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
625 LOG (GNUNET_ERROR_TYPE_INFO, 625 LOG (GNUNET_ERROR_TYPE_INFO,
626 "Retrying connection to collection point `%s'.\n", 626 "Retrying connection to collection point `%s'.\n",
627 GNUNET_i2s (&cadetp->peer_id)); 627 GNUNET_i2s (&cadetp->peer_id));
628 cadetp->reconnect_task = GNUNET_SCHEDULER_NO_TASK; 628 cadetp->reconnect_task = NULL;
629 GNUNET_assert (NULL == cadetp->channel); 629 GNUNET_assert (NULL == cadetp->channel);
630 cadetp->channel = 630 cadetp->channel =
631 GNUNET_CADET_channel_create (cadet, cadetp, &cadetp->peer_id, 631 GNUNET_CADET_channel_create (cadet, cadetp, &cadetp->peer_id,
@@ -740,7 +740,7 @@ get_cadet_peer (struct GNUNET_PeerIdentity pid)
740 GNUNET_APPLICATION_TYPE_SENSORDASHBOARD, 740 GNUNET_APPLICATION_TYPE_SENSORDASHBOARD,
741 GNUNET_CADET_OPTION_RELIABLE); 741 GNUNET_CADET_OPTION_RELIABLE);
742 cadetp->mq = cp_mq_create (cadetp); 742 cadetp->mq = cp_mq_create (cadetp);
743 cadetp->reconnect_task = GNUNET_SCHEDULER_NO_TASK; 743 cadetp->reconnect_task = NULL;
744 GNUNET_CONTAINER_DLL_insert (cadetp_head, cadetp_tail, cadetp); 744 GNUNET_CONTAINER_DLL_insert (cadetp_head, cadetp_tail, cadetp);
745 return cadetp; 745 return cadetp;
746} 746}