cancel pending write if we are just dead anyway

6 files changed, 15 insertions, 15 deletions

diff --git a/src/fs/fs.c b/src/fs/fs.c
index 8396fc18f..2d080bfa6 100644
--- a/src/fs/fs.c
+++ b/src/fs/fs.c
@@ -97,7 +97,7 @@ GNUNET_FS_stop (struct GNUNET_FS_Handle *h)
 {
   // FIXME: serialize state!? (or is it always serialized???)
   // FIXME: terminate receive-loop with client  
-  GNUNET_CLIENT_disconnect (h->client);
+  GNUNET_CLIENT_disconnect (h->client, GNUNET_NO);
   GNUNET_free (h->client_name);
   GNUNET_free (h);
 }
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 7e5081f6e..12d6ff0b6 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -394,7 +394,7 @@ process_result_with_request (void *cls,
           GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th);
           dc->th = NULL;
         }
-      GNUNET_CLIENT_disconnect (dc->client);
+      GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
       dc->client = NULL;
       return GNUNET_NO;
     }
@@ -460,7 +460,7 @@ process_result_with_request (void *cls,
               GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th);
               dc->th = NULL;
             }
-          GNUNET_CLIENT_disconnect (dc->client);
+          GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
           dc->client = NULL;
           GNUNET_free (sm);
           return GNUNET_NO;
@@ -776,7 +776,7 @@ try_reconnect (struct GNUNET_FS_DownloadContext *dc)
       GNUNET_CONTAINER_multihashmap_iterate (dc->active,
                                              &retry_entry,
                                              dc);
-      GNUNET_CLIENT_disconnect (dc->client);
+      GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
       dc->client = NULL;
     }
   dc->task
@@ -879,7 +879,7 @@ GNUNET_FS_download_start (struct GNUNET_FS_Handle *h,
           GNUNET_CONTAINER_meta_data_destroy (dc->meta);
           GNUNET_FS_uri_destroy (dc->uri);
           GNUNET_free (dc->filename);
-          GNUNET_CLIENT_disconnect (dc->client);
+          GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
           GNUNET_free (dc);
           return NULL;
         }
@@ -960,7 +960,7 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc,
       dc->th = NULL;
     }
   if (NULL != dc->client)
-    GNUNET_CLIENT_disconnect (dc->client);
+    GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO);
   GNUNET_CONTAINER_multihashmap_iterate (dc->active,
                                          &free_entry,
                                          NULL);
diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index d182f9aa4..775affbc3 100644
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -94,7 +94,7 @@ handle_index_info (void *cls,
                                          gic->cont,
                                          gic->cont_cls,
                                          GNUNET_SCHEDULER_REASON_TIMEOUT);
-      GNUNET_CLIENT_disconnect (gic->client);
+      GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
       GNUNET_free (gic);
       return;
     }
@@ -105,7 +105,7 @@ handle_index_info (void *cls,
                                          gic->cont,
                                          gic->cont_cls,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-      GNUNET_CLIENT_disconnect (gic->client);
+      GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
       GNUNET_free (gic);
       return;
     }
@@ -125,7 +125,7 @@ handle_index_info (void *cls,
                                          gic->cont,
                                          gic->cont_cls,
                                          GNUNET_SCHEDULER_REASON_TIMEOUT);
-      GNUNET_CLIENT_disconnect (gic->client);
+      GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
       GNUNET_free (gic);
       return;
     }
@@ -138,7 +138,7 @@ handle_index_info (void *cls,
                                          gic->cont,
                                          gic->cont_cls,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-      GNUNET_CLIENT_disconnect (gic->client);
+      GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
       GNUNET_free (gic);
       return;
     }
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index df566b917..db95a6100 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -664,7 +664,7 @@ process_index_start_response (void *cls,
   const char *emsg;
   uint16_t msize;
 
-  GNUNET_CLIENT_disconnect (sc->client);
+  GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
   sc->client = NULL;
   p = sc->fi_pos;
   if (msg == NULL)
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 90a28052f..8d9050051 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -715,7 +715,7 @@ try_reconnect (struct GNUNET_FS_SearchContext *sc)
 {
   if (NULL != sc->client)
     {
-      GNUNET_CLIENT_disconnect (sc->client);
+      GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
       sc->client = NULL;
     }
   sc->task
@@ -858,7 +858,7 @@ GNUNET_FS_search_pause (struct GNUNET_FS_SearchContext *sc)
                              sc->task);
   sc->task = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != sc->client)
-    GNUNET_CLIENT_disconnect (sc->client);
+    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
   sc->client = NULL;
   // FIXME: make persistent!
   // FIXME: should this freeze all active probes?
@@ -967,7 +967,7 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc)
     GNUNET_SCHEDULER_cancel (sc->h->sched,
                              sc->task);
   if (NULL != sc->client)
-    GNUNET_CLIENT_disconnect (sc->client);
+    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
   GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
   for (i=0;i<sc->uri->data.ksk.keywordCount;i++)
     GNUNET_CONTAINER_multihashmap_destroy (sc->requests[i].results);
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index fc4012464..5d1e7c8f0 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -284,7 +284,7 @@ process_fs_response (void *cls,
 {
   struct GNUNET_FS_UnindexContext *uc = cls;
 
-  GNUNET_CLIENT_disconnect (uc->client);
+  GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
   uc->client = NULL;
   if (uc->state != UNINDEX_STATE_FS_NOTIFY) 
     {