diff options
-rw-r--r-- | src/dv/plugin_transport_dv.c | 4 | ||||
-rw-r--r-- | src/include/gnunet_gns_service.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_namestore_service.h | 6 | ||||
-rw-r--r-- | src/namestore/gnunet-service-namestore.c | 1 | ||||
-rw-r--r-- | src/namestore/namestore.h | 11 | ||||
-rw-r--r-- | src/namestore/namestore_common.c | 19 |
6 files changed, 31 insertions, 12 deletions
diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c index 8ee49c519..3a8bafcef 100644 --- a/src/dv/plugin_transport_dv.c +++ b/src/dv/plugin_transport_dv.c | |||
@@ -385,9 +385,7 @@ dv_plugin_check_address (void *cls, const void *addr, size_t addrlen) | |||
385 | * notify us by calling the env->session_end function | 385 | * notify us by calling the env->session_end function |
386 | * | 386 | * |
387 | * @param cls the plugin | 387 | * @param cls the plugin |
388 | * @param target the neighbour id | 388 | * @param address the address |
389 | * @param addr pointer to the address | ||
390 | * @param addrlen length of addr | ||
391 | * @return the session if the address is valid, NULL otherwise | 389 | * @return the session if the address is valid, NULL otherwise |
392 | */ | 390 | */ |
393 | static struct Session * | 391 | static struct Session * |
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h index 242217866..f7bfc2aa7 100644 --- a/src/include/gnunet_gns_service.h +++ b/src/include/gnunet_gns_service.h | |||
@@ -121,8 +121,6 @@ typedef void (*GNUNET_GNS_LookupIterator) (void *cls, | |||
121 | * @param handle handle to the GNS service | 121 | * @param handle handle to the GNS service |
122 | * @param timeout how long to wait for transmission of this request to the service | 122 | * @param timeout how long to wait for transmission of this request to the service |
123 | * // FIXME: what happens afterwards? | 123 | * // FIXME: what happens afterwards? |
124 | * @param handle handle to the GNS service | ||
125 | * @param timeout timeout of request | ||
126 | * @param name the name to look up | 124 | * @param name the name to look up |
127 | * @param type the GNUNET_GNS_RecordType to look for | 125 | * @param type the GNUNET_GNS_RecordType to look for |
128 | * @param iter function to call on each result | 126 | * @param iter function to call on each result |
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index a8233fa4b..f3ea765fd 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h | |||
@@ -111,7 +111,7 @@ GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h, int drop); | |||
111 | * | 111 | * |
112 | * @param cls closure | 112 | * @param cls closure |
113 | * @param success GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate) | 113 | * @param success GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate) |
114 | * GNUNET_NO if content was already there | 114 | * GNUNET_NO if content was already there or not found |
115 | * GNUNET_YES (or other positive value) on success | 115 | * GNUNET_YES (or other positive value) on success |
116 | * @param emsg NULL on success, otherwise an error message | 116 | * @param emsg NULL on success, otherwise an error message |
117 | */ | 117 | */ |
@@ -419,7 +419,7 @@ GNUNET_NAMESTORE_records_get_size (unsigned int rd_count, | |||
419 | /** | 419 | /** |
420 | * Serialize the given records to the given destination buffer. | 420 | * Serialize the given records to the given destination buffer. |
421 | * | 421 | * |
422 | * @param rd_cound number of records in the rd array | 422 | * @param rd_count number of records in the rd array |
423 | * @param rd array of GNUNET_NAMESTORE_RecordData with rd_count elements | 423 | * @param rd array of GNUNET_NAMESTORE_RecordData with rd_count elements |
424 | * @param dest_size size of the destination array | 424 | * @param dest_size size of the destination array |
425 | * @param dest where to write the result | 425 | * @param dest where to write the result |
@@ -438,7 +438,7 @@ GNUNET_NAMESTORE_records_serialize (unsigned int rd_count, | |||
438 | * | 438 | * |
439 | * @param len size of the serialized record data | 439 | * @param len size of the serialized record data |
440 | * @param src the serialized record data | 440 | * @param src the serialized record data |
441 | * @param rd_cound number of records in the rd array | 441 | * @param rd_count number of records in the rd array |
442 | * @param dest where to put the data | 442 | * @param dest where to put the data |
443 | * | 443 | * |
444 | * @return GNUNET_OK on success, GNUNET_SYSERR on error | 444 | * @return GNUNET_OK on success, GNUNET_SYSERR on error |
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c index 23d45d080..600965e8a 100644 --- a/src/namestore/gnunet-service-namestore.c +++ b/src/namestore/gnunet-service-namestore.c | |||
@@ -225,6 +225,7 @@ void drop_iterator (void *cls, | |||
225 | * | 225 | * |
226 | * @param cls closure | 226 | * @param cls closure |
227 | * @param client identification of the client | 227 | * @param client identification of the client |
228 | * @param message the stop message | ||
228 | */ | 229 | */ |
229 | static void handle_stop (void *cls, | 230 | static void handle_stop (void *cls, |
230 | struct GNUNET_SERVER_Client * client, | 231 | struct GNUNET_SERVER_Client * client, |
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index a70d3a62c..f8aa71f0e 100644 --- a/src/namestore/namestore.h +++ b/src/namestore/namestore.h | |||
@@ -45,7 +45,16 @@ | |||
45 | 45 | ||
46 | #define GNUNET_MESSAGE_TYPE_NAMESTORE_DISCONNECT 443 | 46 | #define GNUNET_MESSAGE_TYPE_NAMESTORE_DISCONNECT 443 |
47 | 47 | ||
48 | 48 | /** | |
49 | * Sign name and records | ||
50 | * | ||
51 | * @param key the private key | ||
52 | * @param name the name | ||
53 | * @param rd record data | ||
54 | * @param rd_count number of records | ||
55 | * | ||
56 | * @return the signature | ||
57 | */ | ||
49 | struct GNUNET_CRYPTO_RsaSignature * | 58 | struct GNUNET_CRYPTO_RsaSignature * |
50 | GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey *key, const char *name, struct GNUNET_NAMESTORE_RecordData *rd, unsigned int rd_count); | 59 | GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey *key, const char *name, struct GNUNET_NAMESTORE_RecordData *rd, unsigned int rd_count); |
51 | 60 | ||
diff --git a/src/namestore/namestore_common.c b/src/namestore/namestore_common.c index 2e0a58c62..c1b5ddc1e 100644 --- a/src/namestore/namestore_common.c +++ b/src/namestore/namestore_common.c | |||
@@ -95,7 +95,7 @@ GNUNET_NAMESTORE_records_get_size (unsigned int rd_count, | |||
95 | /** | 95 | /** |
96 | * Serialize the given records to the given destination buffer. | 96 | * Serialize the given records to the given destination buffer. |
97 | * | 97 | * |
98 | * @param rd_cound number of records in the rd array | 98 | * @param rd_count number of records in the rd array |
99 | * @param rd array of GNUNET_NAMESTORE_RecordData with rd_count elements | 99 | * @param rd array of GNUNET_NAMESTORE_RecordData with rd_count elements |
100 | * @param dest_size size of the destination array | 100 | * @param dest_size size of the destination array |
101 | * @param dest where to write the result | 101 | * @param dest where to write the result |
@@ -158,7 +158,7 @@ GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a, | |||
158 | * | 158 | * |
159 | * @param len size of the serialized record data | 159 | * @param len size of the serialized record data |
160 | * @param src the serialized record data | 160 | * @param src the serialized record data |
161 | * @param rd_cound number of records in the rd array | 161 | * @param rd_count number of records in the rd array |
162 | * @param dest where to put the data | 162 | * @param dest where to put the data |
163 | * | 163 | * |
164 | * @return GNUNET_OK on success, GNUNET_SYSERR on error | 164 | * @return GNUNET_OK on success, GNUNET_SYSERR on error |
@@ -193,8 +193,21 @@ GNUNET_NAMESTORE_records_deserialize (size_t len, | |||
193 | return GNUNET_OK; | 193 | return GNUNET_OK; |
194 | } | 194 | } |
195 | 195 | ||
196 | /** | ||
197 | * Sign name and records | ||
198 | * | ||
199 | * @param key the private key | ||
200 | * @param name the name | ||
201 | * @param rd record data | ||
202 | * @param rd_count number of records | ||
203 | * | ||
204 | * @return the signature | ||
205 | */ | ||
196 | struct GNUNET_CRYPTO_RsaSignature * | 206 | struct GNUNET_CRYPTO_RsaSignature * |
197 | GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey *key, const char *name, struct GNUNET_NAMESTORE_RecordData *rd, unsigned int rd_count) | 207 | GNUNET_NAMESTORE_create_signature (const struct GNUNET_CRYPTO_RsaPrivateKey *key, |
208 | const char *name, | ||
209 | struct GNUNET_NAMESTORE_RecordData *rd, | ||
210 | unsigned int rd_count) | ||
198 | { | 211 | { |
199 | struct GNUNET_CRYPTO_RsaSignature *sig = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignature)); | 212 | struct GNUNET_CRYPTO_RsaSignature *sig = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_RsaSignature)); |
200 | struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose; | 213 | struct GNUNET_CRYPTO_RsaSignaturePurpose *sig_purpose; |