diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-04-07 09:43:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-04-07 09:43:30 +0000 |
commit | f17707fd0e6c789f57c8b7c0b4a4b500f4cefd47 (patch) | |
tree | 80db41804a54a05831087802099b52b68fd07d15 | |
parent | 906f67b113fa2a9b27ab7a333d1e25cb0b500140 (diff) | |
download | gnunet-f17707fd0e6c789f57c8b7c0b4a4b500f4cefd47.tar.gz gnunet-f17707fd0e6c789f57c8b7c0b4a4b500f4cefd47.zip |
-doxygen
-rw-r--r-- | src/dht/gnunet-service-dht_clients.c | 8 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_clients.h | 20 | ||||
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.h | 7 |
3 files changed, 20 insertions, 15 deletions
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c index 2ec3c180c..eb42f6747 100644 --- a/src/dht/gnunet-service-dht_clients.c +++ b/src/dht/gnunet-service-dht_clients.c | |||
@@ -110,7 +110,7 @@ struct ClientList | |||
110 | 110 | ||
111 | 111 | ||
112 | /** | 112 | /** |
113 | * Entry in the DHT routing table for a client's GET request. | 113 | * Entry in the local forwarding map for a client's GET request. |
114 | */ | 114 | */ |
115 | struct ClientQueryRecord | 115 | struct ClientQueryRecord |
116 | { | 116 | { |
@@ -253,7 +253,7 @@ static struct ClientMonitorRecord *monitor_head; | |||
253 | static struct ClientMonitorRecord *monitor_tail; | 253 | static struct ClientMonitorRecord *monitor_tail; |
254 | 254 | ||
255 | /** | 255 | /** |
256 | * Hashmap for fast key based lookup, maps keys to 'struct ClientQueryRecord' entries. | 256 | * Hashmap for fast key based lookup, maps keys to `struct ClientQueryRecord` entries. |
257 | */ | 257 | */ |
258 | static struct GNUNET_CONTAINER_MultiHashMap *forward_map; | 258 | static struct GNUNET_CONTAINER_MultiHashMap *forward_map; |
259 | 259 | ||
@@ -427,7 +427,9 @@ transmit_request (struct ClientQueryRecord *cqr) | |||
427 | GNUNET_CONSTANTS_BLOOMFILTER_K); | 427 | GNUNET_CONSTANTS_BLOOMFILTER_K); |
428 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 428 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
429 | "Initiating GET for %s, replication %u, already have %u replies\n", | 429 | "Initiating GET for %s, replication %u, already have %u replies\n", |
430 | GNUNET_h2s(&cqr->key), cqr->replication, cqr->seen_replies_count); | 430 | GNUNET_h2s (&cqr->key), |
431 | cqr->replication, | ||
432 | cqr->seen_replies_count); | ||
431 | GDS_NEIGHBOURS_handle_get (cqr->type, cqr->msg_options, cqr->replication, | 433 | GDS_NEIGHBOURS_handle_get (cqr->type, cqr->msg_options, cqr->replication, |
432 | 0 /* hop count */ , | 434 | 0 /* hop count */ , |
433 | &cqr->key, cqr->xquery, cqr->xquery_size, reply_bf, | 435 | &cqr->key, cqr->xquery, cqr->xquery_size, reply_bf, |
diff --git a/src/dht/gnunet-service-dht_clients.h b/src/dht/gnunet-service-dht_clients.h index 44491377e..81c876401 100644 --- a/src/dht/gnunet-service-dht_clients.h +++ b/src/dht/gnunet-service-dht_clients.h | |||
@@ -37,17 +37,17 @@ | |||
37 | * | 37 | * |
38 | * @param expiration when will the reply expire | 38 | * @param expiration when will the reply expire |
39 | * @param key the query this reply is for | 39 | * @param key the query this reply is for |
40 | * @param get_path_length number of peers in 'get_path' | 40 | * @param get_path_length number of peers in @a get_path |
41 | * @param get_path path the reply took on get | 41 | * @param get_path path the reply took on get |
42 | * @param put_path_length number of peers in 'put_path' | 42 | * @param put_path_length number of peers in @a put_path |
43 | * @param put_path path the reply took on put | 43 | * @param put_path path the reply took on put |
44 | * @param type type of the reply | 44 | * @param type type of the reply |
45 | * @param data_size number of bytes in 'data' | 45 | * @param data_size number of bytes in @a data |
46 | * @param data application payload data | 46 | * @param data application payload data |
47 | */ | 47 | */ |
48 | void | 48 | void |
49 | GDS_CLIENTS_handle_reply (struct GNUNET_TIME_Absolute expiration, | 49 | GDS_CLIENTS_handle_reply (struct GNUNET_TIME_Absolute expiration, |
50 | const struct GNUNET_HashCode * key, | 50 | const struct GNUNET_HashCode *key, |
51 | unsigned int get_path_length, | 51 | unsigned int get_path_length, |
52 | const struct GNUNET_PeerIdentity *get_path, | 52 | const struct GNUNET_PeerIdentity *get_path, |
53 | unsigned int put_path_length, | 53 | unsigned int put_path_length, |
@@ -75,7 +75,8 @@ GDS_CLIENTS_process_get (uint32_t options, | |||
75 | uint32_t desired_replication_level, | 75 | uint32_t desired_replication_level, |
76 | unsigned int path_length, | 76 | unsigned int path_length, |
77 | const struct GNUNET_PeerIdentity *path, | 77 | const struct GNUNET_PeerIdentity *path, |
78 | const struct GNUNET_HashCode * key); | 78 | const struct GNUNET_HashCode *key); |
79 | |||
79 | 80 | ||
80 | /** | 81 | /** |
81 | * Check if some client is monitoring GET RESP messages and notify | 82 | * Check if some client is monitoring GET RESP messages and notify |
@@ -83,13 +84,13 @@ GDS_CLIENTS_process_get (uint32_t options, | |||
83 | * | 84 | * |
84 | * @param type The type of data in the result. | 85 | * @param type The type of data in the result. |
85 | * @param get_path Peers on GET path (or NULL if not recorded). | 86 | * @param get_path Peers on GET path (or NULL if not recorded). |
86 | * @param get_path_length number of entries in get_path. | 87 | * @param get_path_length number of entries in @a get_path. |
87 | * @param put_path peers on the PUT path (or NULL if not recorded). | 88 | * @param put_path peers on the PUT path (or NULL if not recorded). |
88 | * @param put_path_length number of entries in get_path. | 89 | * @param put_path_length number of entries in @a get_path. |
89 | * @param exp Expiration time of the data. | 90 | * @param exp Expiration time of the data. |
90 | * @param key Key of the data. | 91 | * @param key Key of the @a data. |
91 | * @param data Pointer to the result data. | 92 | * @param data Pointer to the result data. |
92 | * @param size Number of bytes in data. | 93 | * @param size Number of bytes in @a data. |
93 | */ | 94 | */ |
94 | void | 95 | void |
95 | GDS_CLIENTS_process_get_resp (enum GNUNET_BLOCK_Type type, | 96 | GDS_CLIENTS_process_get_resp (enum GNUNET_BLOCK_Type type, |
@@ -102,6 +103,7 @@ GDS_CLIENTS_process_get_resp (enum GNUNET_BLOCK_Type type, | |||
102 | const void *data, | 103 | const void *data, |
103 | size_t size); | 104 | size_t size); |
104 | 105 | ||
106 | |||
105 | /** | 107 | /** |
106 | * Check if some client is monitoring PUT messages and notify | 108 | * Check if some client is monitoring PUT messages and notify |
107 | * them in that case. | 109 | * them in that case. |
diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h index 225c4aae0..6eac593a0 100644 --- a/src/dht/gnunet-service-dht_neighbours.h +++ b/src/dht/gnunet-service-dht_neighbours.h | |||
@@ -75,16 +75,17 @@ GDS_NEIGHBOURS_handle_put (enum GNUNET_BLOCK_Type type, | |||
75 | * @param hop_count how many hops did this request traverse so far? | 75 | * @param hop_count how many hops did this request traverse so far? |
76 | * @param key key for the content | 76 | * @param key key for the content |
77 | * @param xquery extended query | 77 | * @param xquery extended query |
78 | * @param xquery_size number of bytes in xquery | 78 | * @param xquery_size number of bytes in @a xquery |
79 | * @param reply_bf bloomfilter to filter duplicates | 79 | * @param reply_bf bloomfilter to filter duplicates |
80 | * @param reply_bf_mutator mutator for reply_bf | 80 | * @param reply_bf_mutator mutator for @a reply_bf |
81 | * @param peer_bf filter for peers not to select (again, updated) | 81 | * @param peer_bf filter for peers not to select (again, updated) |
82 | */ | 82 | */ |
83 | void | 83 | void |
84 | GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type, | 84 | GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type, |
85 | enum GNUNET_DHT_RouteOption options, | 85 | enum GNUNET_DHT_RouteOption options, |
86 | uint32_t desired_replication_level, | 86 | uint32_t desired_replication_level, |
87 | uint32_t hop_count, const struct GNUNET_HashCode * key, | 87 | uint32_t hop_count, |
88 | const struct GNUNET_HashCode *key, | ||
88 | const void *xquery, size_t xquery_size, | 89 | const void *xquery, size_t xquery_size, |
89 | const struct GNUNET_CONTAINER_BloomFilter *reply_bf, | 90 | const struct GNUNET_CONTAINER_BloomFilter *reply_bf, |
90 | uint32_t reply_bf_mutator, | 91 | uint32_t reply_bf_mutator, |