aboutsummaryrefslogtreecommitdiff
path: root/src/fs/gnunet-service-fs_cadet_server.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-02-17 14:31:38 +0100
committerChristian Grothoff <christian@grothoff.org>2017-02-17 14:31:38 +0100
commit181c039d12aa2aa99920d14070e7b64c018e8be7 (patch)
tree58725a1ff58892cbdf53983dc28b4c50c423e1ac /src/fs/gnunet-service-fs_cadet_server.c
parent69d9269f2c5887e73950ee3a7fc0fd5e050a8a86 (diff)
downloadgnunet-181c039d12aa2aa99920d14070e7b64c018e8be7.tar.gz
gnunet-181c039d12aa2aa99920d14070e7b64c018e8be7.zip
get FS test with CADET to finally pass again
Diffstat (limited to 'src/fs/gnunet-service-fs_cadet_server.c')
-rw-r--r--src/fs/gnunet-service-fs_cadet_server.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/fs/gnunet-service-fs_cadet_server.c b/src/fs/gnunet-service-fs_cadet_server.c
index 0a72a8279..adbce1154 100644
--- a/src/fs/gnunet-service-fs_cadet_server.c
+++ b/src/fs/gnunet-service-fs_cadet_server.c
@@ -1,6 +1,6 @@
1/* 1/*
2 This file is part of GNUnet. 2 This file is part of GNUnet.
3 Copyright (C) 2012, 2013 GNUnet e.V. 3 Copyright (C) 2012, 2013, 2017 GNUnet e.V.
4 4
5 GNUnet is free software; you can redistribute it and/or modify 5 GNUnet is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published 6 it under the terms of the GNU General Public License as published
@@ -86,11 +86,6 @@ struct CadetClient
86 struct GNUNET_CADET_Channel *channel; 86 struct GNUNET_CADET_Channel *channel;
87 87
88 /** 88 /**
89 * Handle for active write operation, or NULL.
90 */
91 struct GNUNET_CADET_TransmitHandle *wh;
92
93 /**
94 * Head of write queue. 89 * Head of write queue.
95 */ 90 */
96 struct WriteQueueItem *wqi_head; 91 struct WriteQueueItem *wqi_head;
@@ -439,8 +434,6 @@ disconnect_cb (void *cls,
439 GNUNET_SCHEDULER_cancel (sc->terminate_task); 434 GNUNET_SCHEDULER_cancel (sc->terminate_task);
440 if (NULL != sc->timeout_task) 435 if (NULL != sc->timeout_task)
441 GNUNET_SCHEDULER_cancel (sc->timeout_task); 436 GNUNET_SCHEDULER_cancel (sc->timeout_task);
442 if (NULL != sc->wh)
443 GNUNET_CADET_notify_transmit_ready_cancel (sc->wh);
444 if (NULL != sc->qe) 437 if (NULL != sc->qe)
445 GNUNET_DATASTORE_cancel (sc->qe); 438 GNUNET_DATASTORE_cancel (sc->qe);
446 while (NULL != (wqi = sc->wqi_head)) 439 while (NULL != (wqi = sc->wqi_head))
@@ -458,7 +451,6 @@ disconnect_cb (void *cls,
458} 451}
459 452
460 453
461
462/** 454/**
463 * Function called whenever an MQ-channel's transmission window size changes. 455 * Function called whenever an MQ-channel's transmission window size changes.
464 * 456 *