projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactoring datastore API to use MQ API, also fixing misc. bugs in new mysql backend
[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 85e12db326360495650125313d204accb3e129cd..e10260d7b22a6739757f77a1c92a4ddf42b9fb0c 100644
(file)
--- a/
src/fs/fs_list_indexed.c
+++ b/
src/fs/fs_list_indexed.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2003, 2004, 2006, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2003, 2004, 2006, 2009 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-28,13
+28,13
@@
#include "gnunet_constants.h"
#include "gnunet_fs_service.h"
#include "gnunet_protocols.h"
#include "gnunet_constants.h"
#include "gnunet_fs_service.h"
#include "gnunet_protocols.h"
-#include "fs.h"
+#include "fs
_api
.h"
/**
* Context for "GNUNET_FS_get_indexed_files".
*/
/**
* Context for "GNUNET_FS_get_indexed_files".
*/
-struct GetIndexedContext
+struct G
NUNET_FS_G
etIndexedContext
{
/**
* Handle to global FS context.
{
/**
* Handle to global FS context.
@@
-59,7
+59,7
@@
struct GetIndexedContext
/**
* Continuation to trigger at the end.
*/
/**
* Continuation to trigger at the end.
*/
- GNUNET_SCHEDULER_Task cont;
+ GNUNET_SCHEDULER_Task
Callback
cont;
/**
* Closure for cont.
/**
* Closure for cont.
@@
-72,13
+72,13
@@
struct GetIndexedContext
* Function called on each response from the FS
* service with information about indexed files.
*
* Function called on each response from the FS
* service with information about indexed files.
*
- * @param cls closure (of type "struct GetIndexedContext*")
+ * @param cls closure (of type "struct G
NUNET_FS_G
etIndexedContext*")
* @param msg message with indexing information
*/
static void
handle_index_info (void *cls, const struct GNUNET_MessageHeader *msg)
{
* @param msg message with indexing information
*/
static void
handle_index_info (void *cls, const struct GNUNET_MessageHeader *msg)
{
- struct GetIndexedContext *gic = cls;
+ struct G
NUNET_FS_G
etIndexedContext *gic = cls;
const struct IndexInfoMessage *iim;
uint16_t msize;
const char *filename;
const struct IndexInfoMessage *iim;
uint16_t msize;
const char *filename;
@@
-89,19
+89,15
@@
handle_index_info (void *cls, const struct GNUNET_MessageHeader *msg)
_
("Failed to receive response for `%s' request from `%s' service.\n"),
"GET_INDEXED", "fs");
_
("Failed to receive response for `%s' request from `%s' service.\n"),
"GET_INDEXED", "fs");
- GNUNET_SCHEDULER_add_continuation (gic->cont, gic->cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
- GNUNET_free (gic);
+ (void) gic->iterator (gic->iterator_cls, NULL, NULL);
+ GNUNET_FS_get_indexed_files_cancel (gic);
return;
}
if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END)
{
/* normal end-of-list */
return;
}
if (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_END)
{
/* normal end-of-list */
- GNUNET_SCHEDULER_add_continuation (gic->cont, gic->cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
- GNUNET_free (gic);
+ (void) gic->iterator (gic->iterator_cls, NULL, NULL);
+ GNUNET_FS_get_indexed_files_cancel (gic);
return;
}
msize = ntohs (msg->size);
return;
}
msize = ntohs (msg->size);
@@
-116,18
+112,13
@@
handle_index_info (void *cls, const struct GNUNET_MessageHeader *msg)
_
("Failed to receive valid response for `%s' request from `%s' service.\n"),
"GET_INDEXED", "fs");
_
("Failed to receive valid response for `%s' request from `%s' service.\n"),
"GET_INDEXED", "fs");
- GNUNET_SCHEDULER_add_continuation (gic->cont, gic->cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
- GNUNET_free (gic);
+ (void) gic->iterator (gic->iterator_cls, NULL, NULL);
+ GNUNET_FS_get_indexed_files_cancel (gic);
return;
}
if (GNUNET_OK != gic->iterator (gic->iterator_cls, filename, &iim->file_id))
{
return;
}
if (GNUNET_OK != gic->iterator (gic->iterator_cls, filename, &iim->file_id))
{
- GNUNET_SCHEDULER_add_continuation (gic->cont, gic->cont_cls,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- GNUNET_CLIENT_disconnect (gic->client, GNUNET_NO);
- GNUNET_free (gic);
+ GNUNET_FS_get_indexed_files_cancel (gic);
return;
}
/* get more */
return;
}
/* get more */
@@
-142,19
+133,15
@@
handle_index_info (void *cls, const struct GNUNET_MessageHeader *msg)
* @param h handle to the file sharing subsystem
* @param iterator function to call on each indexed file
* @param iterator_cls closure for iterator
* @param h handle to the file sharing subsystem
* @param iterator function to call on each indexed file
* @param iterator_cls closure for iterator
- * @param cont continuation to call when done;
- * reason should be "TIMEOUT" (on
- * error) or "PREREQ_DONE" (on success)
- * @param cont_cls closure for cont
+ * @return NULL on error ('iter' is not called)
*/
*/
-void
+struct GNUNET_FS_GetIndexedContext *
GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
GNUNET_FS_IndexedFileProcessor iterator,
GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
GNUNET_FS_IndexedFileProcessor iterator,
- void *iterator_cls, GNUNET_SCHEDULER_Task cont,
- void *cont_cls)
+ void *iterator_cls)
{
struct GNUNET_CLIENT_Connection *client;
{
struct GNUNET_CLIENT_Connection *client;
- struct GetIndexedContext *gic;
+ struct G
NUNET_FS_G
etIndexedContext *gic;
struct GNUNET_MessageHeader msg;
client = GNUNET_CLIENT_connect ("fs", h->cfg);
struct GNUNET_MessageHeader msg;
client = GNUNET_CLIENT_connect ("fs", h->cfg);
@@
-162,18
+149,13
@@
GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Failed to not connect to `%s' service.\n"), "fs");
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Failed to not connect to `%s' service.\n"), "fs");
- GNUNET_SCHEDULER_add_continuation (cont, cont_cls,
- GNUNET_SCHEDULER_REASON_TIMEOUT);
- return;
+ return NULL;
}
}
-
- gic = GNUNET_malloc (sizeof (struct GetIndexedContext));
+ gic = GNUNET_new (struct GNUNET_FS_GetIndexedContext);
gic->h = h;
gic->client = client;
gic->iterator = iterator;
gic->iterator_cls = iterator_cls;
gic->h = h;
gic->client = client;
gic->iterator = iterator;
gic->iterator_cls = iterator_cls;
- gic->cont = cont;
- gic->cont_cls = cont_cls;
msg.size = htons (sizeof (struct GNUNET_MessageHeader));
msg.type = htons (GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET);
GNUNET_assert (GNUNET_OK ==
msg.size = htons (sizeof (struct GNUNET_MessageHeader));
msg.type = htons (GNUNET_MESSAGE_TYPE_FS_INDEX_LIST_GET);
GNUNET_assert (GNUNET_OK ==
@@
-182,6
+164,21
@@
GNUNET_FS_get_indexed_files (struct GNUNET_FS_Handle *h,
GNUNET_YES,
&handle_index_info,
gic));
GNUNET_YES,
&handle_index_info,
gic));
+ return gic;
+}
+
+
+/**
+ * Cancel iteration over all indexed files.
+ *
+ * @param gic operation to cancel
+ */
+void
+GNUNET_FS_get_indexed_files_cancel (struct GNUNET_FS_GetIndexedContext *gic)
+{
+ GNUNET_CLIENT_disconnect (gic->client);
+ GNUNET_free (gic);
}
}
+
/* end of fs_list_indexed.c */
/* end of fs_list_indexed.c */