diff options
-rw-r--r-- | src/datacache/datacache.c | 4 | ||||
-rw-r--r-- | src/datacache/perf_datacache.c | 2 | ||||
-rw-r--r-- | src/datacache/plugin_datacache.h | 14 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_mysql.c | 4 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_postgres.c | 4 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_sqlite.c | 4 | ||||
-rw-r--r-- | src/datacache/plugin_datacache_template.c | 4 | ||||
-rw-r--r-- | src/datacache/test_datacache.c | 2 | ||||
-rw-r--r-- | src/datastore/datastore_api.c | 6 | ||||
-rw-r--r-- | src/datastore/perf_datastore_api.c | 4 | ||||
-rw-r--r-- | src/datastore/test_datastore_api.c | 10 | ||||
-rw-r--r-- | src/datastore/test_datastore_api_management.c | 4 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht.c | 38 | ||||
-rw-r--r-- | src/include/gnunet_datacache_lib.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_datastore_service.h | 7 |
15 files changed, 69 insertions, 42 deletions
diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c index 9c1a90bca..d2aa2616a 100644 --- a/src/datacache/datacache.c +++ b/src/datacache/datacache.c | |||
@@ -100,7 +100,7 @@ struct GNUNET_DATACACHE_Handle | |||
100 | static void | 100 | static void |
101 | env_delete_notify (void *cls, | 101 | env_delete_notify (void *cls, |
102 | const GNUNET_HashCode *key, | 102 | const GNUNET_HashCode *key, |
103 | uint32_t size) | 103 | size_t size) |
104 | { | 104 | { |
105 | struct GNUNET_DATACACHE_Handle * h = cls; | 105 | struct GNUNET_DATACACHE_Handle * h = cls; |
106 | GNUNET_assert (h->utilization >= size); | 106 | GNUNET_assert (h->utilization >= size); |
@@ -237,7 +237,7 @@ void GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h) | |||
237 | int | 237 | int |
238 | GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, | 238 | GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, |
239 | const GNUNET_HashCode * key, | 239 | const GNUNET_HashCode * key, |
240 | uint32_t size, | 240 | size_t size, |
241 | const char *data, | 241 | const char *data, |
242 | enum GNUNET_BLOCK_Type type, | 242 | enum GNUNET_BLOCK_Type type, |
243 | struct GNUNET_TIME_Absolute discard_time) | 243 | struct GNUNET_TIME_Absolute discard_time) |
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c index 10efa5eee..023199231 100644 --- a/src/datacache/perf_datacache.c +++ b/src/datacache/perf_datacache.c | |||
@@ -46,7 +46,7 @@ static int | |||
46 | checkIt (void *cls, | 46 | checkIt (void *cls, |
47 | struct GNUNET_TIME_Absolute exp, | 47 | struct GNUNET_TIME_Absolute exp, |
48 | const GNUNET_HashCode * key, | 48 | const GNUNET_HashCode * key, |
49 | uint32_t size, | 49 | size_t size, |
50 | const char *data, | 50 | const char *data, |
51 | enum GNUNET_BLOCK_Type type) | 51 | enum GNUNET_BLOCK_Type type) |
52 | { | 52 | { |
diff --git a/src/datacache/plugin_datacache.h b/src/datacache/plugin_datacache.h index c7360834b..bf35b2619 100644 --- a/src/datacache/plugin_datacache.h +++ b/src/datacache/plugin_datacache.h | |||
@@ -47,7 +47,7 @@ extern "C" | |||
47 | */ | 47 | */ |
48 | typedef void (*GNUNET_DATACACHE_DeleteNotifyCallback)(void *cls, | 48 | typedef void (*GNUNET_DATACACHE_DeleteNotifyCallback)(void *cls, |
49 | const GNUNET_HashCode *key, | 49 | const GNUNET_HashCode *key, |
50 | uint32_t size); | 50 | size_t size); |
51 | 51 | ||
52 | 52 | ||
53 | /** | 53 | /** |
@@ -112,12 +112,12 @@ struct GNUNET_DATACACHE_PluginFunctions { | |||
112 | * @param discard_time when to discard the value in any case | 112 | * @param discard_time when to discard the value in any case |
113 | * @return 0 on error, number of bytes used otherwise | 113 | * @return 0 on error, number of bytes used otherwise |
114 | */ | 114 | */ |
115 | uint32_t (*put) (void *cls, | 115 | size_t (*put) (void *cls, |
116 | const GNUNET_HashCode * key, | 116 | const GNUNET_HashCode * key, |
117 | uint32_t size, | 117 | size_t size, |
118 | const char *data, | 118 | const char *data, |
119 | enum GNUNET_BLOCK_Type type, | 119 | enum GNUNET_BLOCK_Type type, |
120 | struct GNUNET_TIME_Absolute discard_time); | 120 | struct GNUNET_TIME_Absolute discard_time); |
121 | 121 | ||
122 | 122 | ||
123 | /** | 123 | /** |
diff --git a/src/datacache/plugin_datacache_mysql.c b/src/datacache/plugin_datacache_mysql.c index a85e9f480..8241fb5f8 100644 --- a/src/datacache/plugin_datacache_mysql.c +++ b/src/datacache/plugin_datacache_mysql.c | |||
@@ -721,10 +721,10 @@ itable (struct Plugin *plugin) | |||
721 | * @param discard_time when to discard the value in any case | 721 | * @param discard_time when to discard the value in any case |
722 | * @return 0 on error, number of bytes used otherwise | 722 | * @return 0 on error, number of bytes used otherwise |
723 | */ | 723 | */ |
724 | static uint32_t | 724 | static size_t |
725 | mysql_plugin_put (void *cls, | 725 | mysql_plugin_put (void *cls, |
726 | const GNUNET_HashCode * key, | 726 | const GNUNET_HashCode * key, |
727 | uint32_t size, | 727 | size_t size, |
728 | const char *data, | 728 | const char *data, |
729 | enum GNUNET_BLOCK_Type type, | 729 | enum GNUNET_BLOCK_Type type, |
730 | struct GNUNET_TIME_Absolute discard_time) | 730 | struct GNUNET_TIME_Absolute discard_time) |
diff --git a/src/datacache/plugin_datacache_postgres.c b/src/datacache/plugin_datacache_postgres.c index fcd9e5161..c9d6deaaa 100644 --- a/src/datacache/plugin_datacache_postgres.c +++ b/src/datacache/plugin_datacache_postgres.c | |||
@@ -301,10 +301,10 @@ delete_by_rowid (struct Plugin *plugin, | |||
301 | * @param discard_time when to discard the value in any case | 301 | * @param discard_time when to discard the value in any case |
302 | * @return 0 on error, number of bytes used otherwise | 302 | * @return 0 on error, number of bytes used otherwise |
303 | */ | 303 | */ |
304 | static uint32_t | 304 | static size_t |
305 | postgres_plugin_put (void *cls, | 305 | postgres_plugin_put (void *cls, |
306 | const GNUNET_HashCode * key, | 306 | const GNUNET_HashCode * key, |
307 | uint32_t size, | 307 | size_t size, |
308 | const char *data, | 308 | const char *data, |
309 | enum GNUNET_BLOCK_Type type, | 309 | enum GNUNET_BLOCK_Type type, |
310 | struct GNUNET_TIME_Absolute discard_time) | 310 | struct GNUNET_TIME_Absolute discard_time) |
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c index 8c144baa2..5c304bd8a 100644 --- a/src/datacache/plugin_datacache_sqlite.c +++ b/src/datacache/plugin_datacache_sqlite.c | |||
@@ -94,10 +94,10 @@ sq_prepare (sqlite3 * dbh, const char *zSql, /* SQL statement, UTF-8 encoded | |||
94 | * @param discard_time when to discard the value in any case | 94 | * @param discard_time when to discard the value in any case |
95 | * @return 0 on error, number of bytes used otherwise | 95 | * @return 0 on error, number of bytes used otherwise |
96 | */ | 96 | */ |
97 | static uint32_t | 97 | static size_t |
98 | sqlite_plugin_put (void *cls, | 98 | sqlite_plugin_put (void *cls, |
99 | const GNUNET_HashCode * key, | 99 | const GNUNET_HashCode * key, |
100 | uint32_t size, | 100 | size_t size, |
101 | const char *data, | 101 | const char *data, |
102 | enum GNUNET_BLOCK_Type type, | 102 | enum GNUNET_BLOCK_Type type, |
103 | struct GNUNET_TIME_Absolute discard_time) | 103 | struct GNUNET_TIME_Absolute discard_time) |
diff --git a/src/datacache/plugin_datacache_template.c b/src/datacache/plugin_datacache_template.c index 4ebf72661..25e4c9a42 100644 --- a/src/datacache/plugin_datacache_template.c +++ b/src/datacache/plugin_datacache_template.c | |||
@@ -51,10 +51,10 @@ struct Plugin | |||
51 | * @param discard_time when to discard the value in any case | 51 | * @param discard_time when to discard the value in any case |
52 | * @return 0 on error, number of bytes used otherwise | 52 | * @return 0 on error, number of bytes used otherwise |
53 | */ | 53 | */ |
54 | static uint32_t | 54 | static size_t |
55 | template_plugin_put (void *cls, | 55 | template_plugin_put (void *cls, |
56 | const GNUNET_HashCode * key, | 56 | const GNUNET_HashCode * key, |
57 | uint32_t size, | 57 | size_t size, |
58 | const char *data, | 58 | const char *data, |
59 | enum GNUNET_BLOCK_Type type, | 59 | enum GNUNET_BLOCK_Type type, |
60 | struct GNUNET_TIME_Absolute discard_time) | 60 | struct GNUNET_TIME_Absolute discard_time) |
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c index 0c9399aff..da7894d6b 100644 --- a/src/datacache/test_datacache.c +++ b/src/datacache/test_datacache.c | |||
@@ -42,7 +42,7 @@ static int | |||
42 | checkIt (void *cls, | 42 | checkIt (void *cls, |
43 | struct GNUNET_TIME_Absolute exp, | 43 | struct GNUNET_TIME_Absolute exp, |
44 | const GNUNET_HashCode * key, | 44 | const GNUNET_HashCode * key, |
45 | uint32_t size, | 45 | size_t size, |
46 | const char *data, | 46 | const char *data, |
47 | enum GNUNET_BLOCK_Type type) | 47 | enum GNUNET_BLOCK_Type type) |
48 | { | 48 | { |
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c index 5bb4160c2..18aa0bcdc 100644 --- a/src/datastore/datastore_api.c +++ b/src/datastore/datastore_api.c | |||
@@ -765,7 +765,7 @@ struct GNUNET_DATASTORE_QueueEntry * | |||
765 | GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, | 765 | GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, |
766 | int rid, | 766 | int rid, |
767 | const GNUNET_HashCode * key, | 767 | const GNUNET_HashCode * key, |
768 | uint32_t size, | 768 | size_t size, |
769 | const void *data, | 769 | const void *data, |
770 | enum GNUNET_BLOCK_Type type, | 770 | enum GNUNET_BLOCK_Type type, |
771 | uint32_t priority, | 771 | uint32_t priority, |
@@ -801,7 +801,7 @@ GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, | |||
801 | dm->header.type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_PUT); | 801 | dm->header.type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_PUT); |
802 | dm->header.size = htons(msize); | 802 | dm->header.size = htons(msize); |
803 | dm->rid = htonl(rid); | 803 | dm->rid = htonl(rid); |
804 | dm->size = htonl(size); | 804 | dm->size = htonl( (uint32_t) size); |
805 | dm->type = htonl(type); | 805 | dm->type = htonl(type); |
806 | dm->priority = htonl(priority); | 806 | dm->priority = htonl(priority); |
807 | dm->anonymity = htonl(anonymity); | 807 | dm->anonymity = htonl(anonymity); |
@@ -1012,7 +1012,7 @@ GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h, | |||
1012 | struct GNUNET_DATASTORE_QueueEntry * | 1012 | struct GNUNET_DATASTORE_QueueEntry * |
1013 | GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, | 1013 | GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, |
1014 | const GNUNET_HashCode *key, | 1014 | const GNUNET_HashCode *key, |
1015 | uint32_t size, | 1015 | size_t size, |
1016 | const void *data, | 1016 | const void *data, |
1017 | unsigned int queue_priority, | 1017 | unsigned int queue_priority, |
1018 | unsigned int max_queue_size, | 1018 | unsigned int max_queue_size, |
diff --git a/src/datastore/perf_datastore_api.c b/src/datastore/perf_datastore_api.c index 741878309..3cb730bcb 100644 --- a/src/datastore/perf_datastore_api.c +++ b/src/datastore/perf_datastore_api.c | |||
@@ -101,7 +101,7 @@ struct CpsRunContext | |||
101 | int i; | 101 | int i; |
102 | 102 | ||
103 | GNUNET_HashCode key; | 103 | GNUNET_HashCode key; |
104 | uint32_t esize; | 104 | size_t esize; |
105 | char data[65536]; | 105 | char data[65536]; |
106 | }; | 106 | }; |
107 | 107 | ||
@@ -197,7 +197,7 @@ do_delete (void *cls, | |||
197 | static void | 197 | static void |
198 | delete_value (void *cls, | 198 | delete_value (void *cls, |
199 | const GNUNET_HashCode * key, | 199 | const GNUNET_HashCode * key, |
200 | uint32_t size, | 200 | size_t size, |
201 | const void *data, | 201 | const void *data, |
202 | enum GNUNET_BLOCK_Type type, | 202 | enum GNUNET_BLOCK_Type type, |
203 | uint32_t priority, | 203 | uint32_t priority, |
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c index 0ea3c4c86..10a195cfb 100644 --- a/src/datastore/test_datastore_api.c +++ b/src/datastore/test_datastore_api.c | |||
@@ -183,7 +183,7 @@ get_reserved (void *cls, | |||
183 | static void | 183 | static void |
184 | check_value (void *cls, | 184 | check_value (void *cls, |
185 | const GNUNET_HashCode * key, | 185 | const GNUNET_HashCode * key, |
186 | uint32_t size, | 186 | size_t size, |
187 | const void *data, | 187 | const void *data, |
188 | enum GNUNET_BLOCK_Type type, | 188 | enum GNUNET_BLOCK_Type type, |
189 | uint32_t priority, | 189 | uint32_t priority, |
@@ -221,7 +221,7 @@ check_value (void *cls, | |||
221 | static void | 221 | static void |
222 | delete_value (void *cls, | 222 | delete_value (void *cls, |
223 | const GNUNET_HashCode * key, | 223 | const GNUNET_HashCode * key, |
224 | uint32_t size, | 224 | size_t size, |
225 | const void *data, | 225 | const void *data, |
226 | enum GNUNET_BLOCK_Type type, | 226 | enum GNUNET_BLOCK_Type type, |
227 | uint32_t priority, | 227 | uint32_t priority, |
@@ -261,7 +261,7 @@ delete_value (void *cls, | |||
261 | static void | 261 | static void |
262 | check_nothing (void *cls, | 262 | check_nothing (void *cls, |
263 | const GNUNET_HashCode * key, | 263 | const GNUNET_HashCode * key, |
264 | uint32_t size, | 264 | size_t size, |
265 | const void *data, | 265 | const void *data, |
266 | enum GNUNET_BLOCK_Type type, | 266 | enum GNUNET_BLOCK_Type type, |
267 | uint32_t priority, | 267 | uint32_t priority, |
@@ -285,7 +285,7 @@ check_nothing (void *cls, | |||
285 | static void | 285 | static void |
286 | check_multiple (void *cls, | 286 | check_multiple (void *cls, |
287 | const GNUNET_HashCode * key, | 287 | const GNUNET_HashCode * key, |
288 | uint32_t size, | 288 | size_t size, |
289 | const void *data, | 289 | const void *data, |
290 | enum GNUNET_BLOCK_Type type, | 290 | enum GNUNET_BLOCK_Type type, |
291 | uint32_t priority, | 291 | uint32_t priority, |
@@ -343,7 +343,7 @@ check_multiple (void *cls, | |||
343 | static void | 343 | static void |
344 | check_update (void *cls, | 344 | check_update (void *cls, |
345 | const GNUNET_HashCode * key, | 345 | const GNUNET_HashCode * key, |
346 | uint32_t size, | 346 | size_t size, |
347 | const void *data, | 347 | const void *data, |
348 | enum GNUNET_BLOCK_Type type, | 348 | enum GNUNET_BLOCK_Type type, |
349 | uint32_t priority, | 349 | uint32_t priority, |
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c index 3de1544f3..8e49409b6 100644 --- a/src/datastore/test_datastore_api_management.c +++ b/src/datastore/test_datastore_api_management.c | |||
@@ -143,7 +143,7 @@ check_success (void *cls, | |||
143 | static void | 143 | static void |
144 | check_value (void *cls, | 144 | check_value (void *cls, |
145 | const GNUNET_HashCode * key, | 145 | const GNUNET_HashCode * key, |
146 | uint32_t size, | 146 | size_t size, |
147 | const void *data, | 147 | const void *data, |
148 | enum GNUNET_BLOCK_Type type, | 148 | enum GNUNET_BLOCK_Type type, |
149 | uint32_t priority, | 149 | uint32_t priority, |
@@ -191,7 +191,7 @@ check_value (void *cls, | |||
191 | static void | 191 | static void |
192 | check_nothing (void *cls, | 192 | check_nothing (void *cls, |
193 | const GNUNET_HashCode * key, | 193 | const GNUNET_HashCode * key, |
194 | uint32_t size, | 194 | size_t size, |
195 | const void *data, | 195 | const void *data, |
196 | enum GNUNET_BLOCK_Type type, | 196 | enum GNUNET_BLOCK_Type type, |
197 | uint32_t priority, | 197 | uint32_t priority, |
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index 5cc3bcfbf..5c49114ae 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c | |||
@@ -2140,7 +2140,7 @@ static int | |||
2140 | datacache_get_iterator (void *cls, | 2140 | datacache_get_iterator (void *cls, |
2141 | struct GNUNET_TIME_Absolute exp, | 2141 | struct GNUNET_TIME_Absolute exp, |
2142 | const GNUNET_HashCode * key, | 2142 | const GNUNET_HashCode * key, |
2143 | uint32_t size, const char *data, | 2143 | size_t size, const char *data, |
2144 | enum GNUNET_BLOCK_Type type) | 2144 | enum GNUNET_BLOCK_Type type) |
2145 | { | 2145 | { |
2146 | struct DHT_MessageContext *msg_ctx = cls; | 2146 | struct DHT_MessageContext *msg_ctx = cls; |
@@ -2584,24 +2584,50 @@ handle_dht_put (void *cls, | |||
2584 | const struct GNUNET_MessageHeader *msg, | 2584 | const struct GNUNET_MessageHeader *msg, |
2585 | struct DHT_MessageContext *message_context) | 2585 | struct DHT_MessageContext *message_context) |
2586 | { | 2586 | { |
2587 | struct GNUNET_DHT_PutMessage *put_msg; | 2587 | const struct GNUNET_DHT_PutMessage *put_msg; |
2588 | enum GNUNET_BLOCK_Type put_type; | 2588 | enum GNUNET_BLOCK_Type put_type; |
2589 | size_t data_size; | 2589 | size_t data_size; |
2590 | int ret; | 2590 | int ret; |
2591 | struct RepublishContext *put_context; | 2591 | struct RepublishContext *put_context; |
2592 | GNUNET_HashCode key; | ||
2592 | 2593 | ||
2593 | GNUNET_assert (ntohs (msg->size) >= | 2594 | GNUNET_assert (ntohs (msg->size) >= |
2594 | sizeof (struct GNUNET_DHT_PutMessage)); | 2595 | sizeof (struct GNUNET_DHT_PutMessage)); |
2595 | 2596 | ||
2596 | 2597 | ||
2597 | put_msg = (struct GNUNET_DHT_PutMessage *)msg; | 2598 | put_msg = (const struct GNUNET_DHT_PutMessage *)msg; |
2598 | put_type = (enum GNUNET_BLOCK_Type) ntohl (put_msg->type); | 2599 | put_type = (enum GNUNET_BLOCK_Type) ntohl (put_msg->type); |
2599 | 2600 | ||
2600 | if (put_type == GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE) | 2601 | if (put_type == GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE) |
2601 | return; | 2602 | return; |
2602 | |||
2603 | data_size = ntohs (put_msg->header.size) - sizeof (struct GNUNET_DHT_PutMessage); | 2603 | data_size = ntohs (put_msg->header.size) - sizeof (struct GNUNET_DHT_PutMessage); |
2604 | 2604 | ret = GNUNET_BLOCK_get_key (block_context, | |
2605 | put_type, | ||
2606 | &put_msg[1], | ||
2607 | data_size, | ||
2608 | &key); | ||
2609 | if (GNUNET_NO == ret) | ||
2610 | { | ||
2611 | /* invalid reply */ | ||
2612 | GNUNET_break_op (0); | ||
2613 | return; | ||
2614 | } | ||
2615 | if ( (GNUNET_YES == ret) && | ||
2616 | (0 != memcmp (&key, | ||
2617 | &message_context->key, | ||
2618 | sizeof (GNUNET_HashCode))) ) | ||
2619 | { | ||
2620 | /* invalid wrapper: key mismatch! */ | ||
2621 | GNUNET_break_op (0); | ||
2622 | return; | ||
2623 | } | ||
2624 | /* ret == GNUNET_SYSERR means that there is no known relationship between | ||
2625 | data and the key, so we cannot check it */ | ||
2626 | #if DEBUG_DHT | ||
2627 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2628 | "`%s:%s': Received `%s' request (inserting data!), message type %d, key %s, uid %llu\n", | ||
2629 | my_short_id, "DHT", "PUT", put_type, GNUNET_h2s (&message_context->key), message_context->unique_id); | ||
2630 | #endif | ||
2605 | #if DEBUG_DHT_ROUTING | 2631 | #if DEBUG_DHT_ROUTING |
2606 | if (message_context->hop_count == 0) /* Locally initiated request */ | 2632 | if (message_context->hop_count == 0) /* Locally initiated request */ |
2607 | { | 2633 | { |
@@ -3655,7 +3681,7 @@ static int | |||
3655 | republish_content_iterator (void *cls, | 3681 | republish_content_iterator (void *cls, |
3656 | struct GNUNET_TIME_Absolute exp, | 3682 | struct GNUNET_TIME_Absolute exp, |
3657 | const GNUNET_HashCode * key, | 3683 | const GNUNET_HashCode * key, |
3658 | uint32_t size, const char *data, uint32_t type) | 3684 | size_t size, const char *data, uint32_t type) |
3659 | { | 3685 | { |
3660 | 3686 | ||
3661 | struct DHT_MessageContext *new_msg_ctx; | 3687 | struct DHT_MessageContext *new_msg_ctx; |
diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h index efce55af4..74878f08b 100644 --- a/src/include/gnunet_datacache_lib.h +++ b/src/include/gnunet_datacache_lib.h | |||
@@ -85,7 +85,7 @@ void GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h); | |||
85 | typedef int (*GNUNET_DATACACHE_Iterator) (void *cls, | 85 | typedef int (*GNUNET_DATACACHE_Iterator) (void *cls, |
86 | struct GNUNET_TIME_Absolute exp, | 86 | struct GNUNET_TIME_Absolute exp, |
87 | const GNUNET_HashCode * key, | 87 | const GNUNET_HashCode * key, |
88 | uint32_t size, /* FIXME: use size_t? */ | 88 | size_t size, |
89 | const char *data, | 89 | const char *data, |
90 | enum GNUNET_BLOCK_Type type); | 90 | enum GNUNET_BLOCK_Type type); |
91 | 91 | ||
@@ -104,7 +104,7 @@ typedef int (*GNUNET_DATACACHE_Iterator) (void *cls, | |||
104 | int | 104 | int |
105 | GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, | 105 | GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, |
106 | const GNUNET_HashCode * key, | 106 | const GNUNET_HashCode * key, |
107 | uint32_t size, | 107 | size_t size, |
108 | const char *data, | 108 | const char *data, |
109 | enum GNUNET_BLOCK_Type type, | 109 | enum GNUNET_BLOCK_Type type, |
110 | struct GNUNET_TIME_Absolute discard_time); | 110 | struct GNUNET_TIME_Absolute discard_time); |
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h index 55ee111a9..c41d21058 100644 --- a/src/include/gnunet_datastore_service.h +++ b/src/include/gnunet_datastore_service.h | |||
@@ -153,7 +153,7 @@ struct GNUNET_DATASTORE_QueueEntry * | |||
153 | GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, | 153 | GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, |
154 | int rid, | 154 | int rid, |
155 | const GNUNET_HashCode * key, | 155 | const GNUNET_HashCode * key, |
156 | uint32_t size, | 156 | size_t size, |
157 | const void *data, | 157 | const void *data, |
158 | enum GNUNET_BLOCK_Type type, | 158 | enum GNUNET_BLOCK_Type type, |
159 | uint32_t priority, | 159 | uint32_t priority, |
@@ -250,7 +250,7 @@ GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h, | |||
250 | struct GNUNET_DATASTORE_QueueEntry * | 250 | struct GNUNET_DATASTORE_QueueEntry * |
251 | GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, | 251 | GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, |
252 | const GNUNET_HashCode *key, | 252 | const GNUNET_HashCode *key, |
253 | uint32_t size, | 253 | size_t size, |
254 | const void *data, | 254 | const void *data, |
255 | unsigned int queue_priority, | 255 | unsigned int queue_priority, |
256 | unsigned int max_queue_size, | 256 | unsigned int max_queue_size, |
@@ -275,7 +275,7 @@ GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, | |||
275 | */ | 275 | */ |
276 | typedef void (*GNUNET_DATASTORE_Iterator) (void *cls, | 276 | typedef void (*GNUNET_DATASTORE_Iterator) (void *cls, |
277 | const GNUNET_HashCode * key, | 277 | const GNUNET_HashCode * key, |
278 | uint32_t size, | 278 | size_t size, |
279 | const void *data, | 279 | const void *data, |
280 | enum GNUNET_BLOCK_Type type, | 280 | enum GNUNET_BLOCK_Type type, |
281 | uint32_t priority, | 281 | uint32_t priority, |
@@ -353,6 +353,7 @@ GNUNET_DATASTORE_get_random (struct GNUNET_DATASTORE_Handle *h, | |||
353 | GNUNET_DATASTORE_Iterator iter, | 353 | GNUNET_DATASTORE_Iterator iter, |
354 | void *iter_cls); | 354 | void *iter_cls); |
355 | 355 | ||
356 | |||
356 | /** | 357 | /** |
357 | * Cancel a datastore operation. The final callback from the | 358 | * Cancel a datastore operation. The final callback from the |
358 | * operation must not have been done yet. | 359 | * operation must not have been done yet. |