arg

[oweals/gnunet.git] / src / fs / fs_list_indexed.c

diff --git a/src/fs/fs_list_indexed.c b/src/fs/fs_list_indexed.c
index 1a404a078051e25012304084cea09f547fed47d0..fec12776305254ffdfb1ce57fdb2b5095e437be0 100644 (file)
--- a/src/fs/fs_list_indexed.c
+++ b/src/fs/fs_list_indexed.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -90,24 +90,20 @@ handle_index_info (void *cls,
                  _("Failed to receive response for `%s' request from `%s' service.\n"),
                  "GET_INDEXED",
                  "fs");
-      GNUNET_SCHEDULER_add_continuation (gic->h->sched,
-                                        GNUNET_NO,
-                                        gic->cont,
+      GNUNET_SCHEDULER_add_continuation (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;
     }
   if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END)
     {
       /* normal end-of-list */
-      GNUNET_SCHEDULER_add_continuation (gic->h->sched,
-                                        GNUNET_NO,
-                                        gic->cont,
+      GNUNET_SCHEDULER_add_continuation (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;
     }
@@ -123,12 +119,10 @@ handle_index_info (void *cls,
                  _("Failed to receive valid response for `%s' request from `%s' service.\n"),
                  "GET_INDEXED",
                  "fs");
-      GNUNET_SCHEDULER_add_continuation (gic->h->sched,
-                                        GNUNET_NO,
-                                        gic->cont,
+      GNUNET_SCHEDULER_add_continuation (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;
     }
@@ -137,12 +131,10 @@ handle_index_info (void *cls,
                     filename,
                     &iim->file_id))
     {
-      GNUNET_SCHEDULER_add_continuation (gic->h->sched,
-                                        GNUNET_NO,
-                                        gic->cont,
+      GNUNET_SCHEDULER_add_continuation (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;
     }
@@ -154,50 +146,6 @@ handle_index_info (void *cls,
 }
 
 
-/**
- * Transmit the request to get a list of all 
- * indexed files to the "FS" service.
- *
- * @param cls closure (of type "struct GetIndexedContext*")
- * @param size number of bytes availabe in buf
- * @param buf where to write the message, NULL on error
- * @return number of bytes written to buf
- */
-static size_t
-transmit_get_indexed (void *cls,
-                     size_t size,
-                     void *buf)
-{
-  struct GetIndexedContext *gic = cls;
-  struct GNUNET_MessageHeader *hdr;
-
-  if (NULL == buf)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                 _("Failed to transmit `%s' request to `%s' service.\n"),
-                 "GET_INDEXED",
-                 "fs");
-      GNUNET_SCHEDULER_add_continuation (gic->h->sched,
-                                        GNUNET_NO,
-                                        gic->cont,
-                                        gic->cont_cls,
-                                        GNUNET_SCHEDULER_REASON_TIMEOUT);
-      GNUNET_CLIENT_disconnect (gic->client);
-      GNUNET_free (gic);
-      return 0;
-    }
-  GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
-  hdr = buf;
-  hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
-  hdr->type = htons (GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET);
-  GNUNET_CLIENT_receive (gic->client,
-                        &handle_index_info,
-                        gic,
-                        GNUNET_CONSTANTS_SERVICE_TIMEOUT);
-  return sizeof (struct GNUNET_MessageHeader);
-}
-
-
 /**
  * Iterate over all indexed files.
  *
@@ -218,18 +166,16 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
 {
   struct GNUNET_CLIENT_Connection *client;
   struct GetIndexedContext *gic;
+  struct GNUNET_MessageHeader msg;
 
-  client = GNUNET_CLIENT_connect (h->sched,
-                                 "fs",
+  client = GNUNET_CLIENT_connect ("fs",
                                  h->cfg);
   if (NULL == client)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                  _("Failed to not connect to `%s' service.\n"),
                  "fs");
-      GNUNET_SCHEDULER_add_continuation (h->sched,
-                                        GNUNET_NO,
-                                        cont,
+      GNUNET_SCHEDULER_add_continuation (cont,
                                         cont_cls,
                                         GNUNET_SCHEDULER_REASON_TIMEOUT);
       return;
@@ -242,11 +188,15 @@ GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
   gic->iterator_cls = iterator_cls;
   gic->cont = cont;
   gic->cont_cls = cont_cls;
-  GNUNET_CLIENT_notify_transmit_ready (client,
-                                      sizeof (struct GNUNET_MessageHeader),
-                                      GNUNET_CONSTANTS_SERVICE_TIMEOUT,
-                                      &transmit_get_indexed,
-                                      gic);
+  msg.size = htons (sizeof (struct GNUNET_MessageHeader));
+  msg.type = htons (GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET);
+  GNUNET_assert (GNUNET_OK ==
+                GNUNET_CLIENT_transmit_and_get_response (client,
+                                                         &msg,
+                                                         GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+                                                         GNUNET_YES,
+                                                         &handle_index_info,
+                                                         gic));
 }
 
 /* end of fs_list_indexed.c */