projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #3704
[oweals/gnunet.git]
/
src
/
fs
/
gnunet-service-fs_put.c
diff --git
a/src/fs/gnunet-service-fs_put.c
b/src/fs/gnunet-service-fs_put.c
index 463acc02d5d92a3efc478b4a5eaff43df1f7ec36..0a97bcb222121c49276812dba05a3f4336d3b3d9 100644
(file)
--- a/
src/fs/gnunet-service-fs_put.c
+++ b/
src/fs/gnunet-service-fs_put.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2011 Christian Grothoff (and other contributing authors)
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
@@
-63,7
+63,7
@@
struct PutOperator
/**
* ID of task that collects blocks for DHT PUTs.
*/
/**
* ID of task that collects blocks for DHT PUTs.
*/
-
GNUNET_SCHEDULER_TaskIdentifier
dht_task;
+
struct GNUNET_SCHEDULER_Task *
dht_task;
/**
* How many entires with zero anonymity of our type do we currently
/**
* How many entires with zero anonymity of our type do we currently
@@
-83,9
+83,7
@@
struct PutOperator
* of block that we're putting into the DHT).
*/
static struct PutOperator operators[] = {
* of block that we're putting into the DHT).
*/
static struct PutOperator operators[] = {
- {NULL, GNUNET_BLOCK_TYPE_FS_KBLOCK, 0, 0, 0},
- {NULL, GNUNET_BLOCK_TYPE_FS_SBLOCK, 0, 0, 0},
- {NULL, GNUNET_BLOCK_TYPE_FS_NBLOCK, 0, 0, 0},
+ {NULL, GNUNET_BLOCK_TYPE_FS_UBLOCK, 0, 0, 0},
{NULL, GNUNET_BLOCK_TYPE_ANY, 0, 0, 0}
};
{NULL, GNUNET_BLOCK_TYPE_ANY, 0, 0, 0}
};
@@
-160,7
+158,7
@@
delay_dht_put_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PutOperator *po = cls;
{
struct PutOperator *po = cls;
- po->dht_task =
GNUNET_SCHEDULER_NO_TASK
;
+ po->dht_task =
NULL
;
schedule_next_put (po);
}
schedule_next_put (po);
}
@@
-180,8
+178,11
@@
delay_dht_put_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
* maybe 0 if no unique identifier is available
*/
static void
* maybe 0 if no unique identifier is available
*/
static void
-process_dht_put_content (void *cls, const GNUNET_HashCode * key, size_t size,
- const void *data, enum GNUNET_BLOCK_Type type,
+process_dht_put_content (void *cls,
+ const struct GNUNET_HashCode * key,
+ size_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
uint32_t priority, uint32_t anonymity,
struct GNUNET_TIME_Absolute expiration, uint64_t uid)
{
uint32_t priority, uint32_t anonymity,
struct GNUNET_TIME_Absolute expiration, uint64_t uid)
{
@@
-218,7
+219,7
@@
gather_dht_put_blocks (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct PutOperator *po = cls;
{
struct PutOperator *po = cls;
- po->dht_task =
GNUNET_SCHEDULER_NO_TASK
;
+ po->dht_task =
NULL
;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
po->dht_qe =
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
po->dht_qe =
@@
-262,10
+263,10
@@
GSF_put_done_ ()
i = 0;
while ((po = &operators[i])->dht_put_type != GNUNET_BLOCK_TYPE_ANY)
{
i = 0;
while ((po = &operators[i])->dht_put_type != GNUNET_BLOCK_TYPE_ANY)
{
- if (
GNUNET_SCHEDULER_NO_TASK
!= po->dht_task)
+ if (
NULL
!= po->dht_task)
{
GNUNET_SCHEDULER_cancel (po->dht_task);
{
GNUNET_SCHEDULER_cancel (po->dht_task);
- po->dht_task =
GNUNET_SCHEDULER_NO_TASK
;
+ po->dht_task =
NULL
;
}
if (NULL != po->dht_put)
{
}
if (NULL != po->dht_put)
{