projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-again trying to delete old vectorproduct dir
[oweals/gnunet.git]
/
src
/
dht
/
gnunet-service-dht_routing.c
diff --git
a/src/dht/gnunet-service-dht_routing.c
b/src/dht/gnunet-service-dht_routing.c
index 2d0d77876095b30768c8fd101818c951708c5d32..be3105c8eef71c71d5b355a3d176363a861ee8e5 100644
(file)
--- a/
src/dht/gnunet-service-dht_routing.c
+++ b/
src/dht/gnunet-service-dht_routing.c
@@
-264,7
+264,7
@@
process (void *cls, const struct GNUNET_HashCode * key, void *value)
* @param key key for the content
* @param put_path_length number of entries in put_path
* @param put_path peers the original PUT traversed (if tracked)
* @param key key for the content
* @param put_path_length number of entries in put_path
* @param put_path peers the original PUT traversed (if tracked)
- * @param get_path_length number of entries in
pu
t_path
+ * @param get_path_length number of entries in
ge
t_path
* @param get_path peers this reply has traversed so far (if tracked)
* @param data payload of the reply
* @param data_size number of bytes in data
* @param get_path peers this reply has traversed so far (if tracked)
* @param data payload of the reply
* @param data_size number of bytes in data
@@
-295,7
+295,7
@@
GDS_ROUTING_process (enum GNUNET_BLOCK_Type type,
reply as request-validation (but we need response-validation).
So we set 'data' to a 0-byte non-NULL value just to be sure */
GNUNET_break (0 == data_size);
reply as request-validation (but we need response-validation).
So we set 'data' to a 0-byte non-NULL value just to be sure */
GNUNET_break (0 == data_size);
- data_size = 0;
+
pc.
data_size = 0;
pc.data = ""; /* something not null */
}
GNUNET_CONTAINER_multihashmap_get_multiple (recent_map, key, &process, &pc);
pc.data = ""; /* something not null */
}
GNUNET_CONTAINER_multihashmap_get_multiple (recent_map, key, &process, &pc);
@@
-362,8
+362,7
@@
try_combine_recent (void *cls, const struct GNUNET_HashCode * key, void *value)
else
{
GNUNET_CONTAINER_bloomfilter_or2 (rr->reply_bf,
else
{
GNUNET_CONTAINER_bloomfilter_or2 (rr->reply_bf,
- in->reply_bf,
- GNUNET_CONTAINER_bloomfilter_get_size (in->reply_bf));
+ in->reply_bf);
GNUNET_CONTAINER_bloomfilter_free (in->reply_bf);
}
GNUNET_free (in);
GNUNET_CONTAINER_bloomfilter_free (in->reply_bf);
}
GNUNET_free (in);
@@
-421,7
+420,7
@@
GDS_ROUTING_add (const struct GNUNET_PeerIdentity *sender,
}
recent_req->heap_node =
GNUNET_CONTAINER_heap_insert (recent_heap, recent_req,
}
recent_req->heap_node =
GNUNET_CONTAINER_heap_insert (recent_heap, recent_req,
- GNUNET_TIME_absolute_get ().abs_value);
+ GNUNET_TIME_absolute_get ().abs_value
_us
);
GNUNET_CONTAINER_multihashmap_put (recent_map, key, recent_req,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
GNUNET_CONTAINER_multihashmap_put (recent_map, key, recent_req,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);