diff options
-rw-r--r-- | src/fs/fs_namespace_advertise.c | 8 | ||||
-rw-r--r-- | src/nse/gnunet-nse-profiler.c | 7 | ||||
-rw-r--r-- | src/vpn/vpn.h | 2 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/fs/fs_namespace_advertise.c b/src/fs/fs_namespace_advertise.c index c0e15541c..3b64e619c 100644 --- a/src/fs/fs_namespace_advertise.c +++ b/src/fs/fs_namespace_advertise.c | |||
@@ -204,7 +204,7 @@ advertisement_cont (void *cls, int success, | |||
204 | * | 204 | * |
205 | * @param h handle to the file sharing subsystem | 205 | * @param h handle to the file sharing subsystem |
206 | * @param ksk_uri keywords to use for advertisment | 206 | * @param ksk_uri keywords to use for advertisment |
207 | * @param namespace handle for the namespace that should be advertised | 207 | * @param ns handle for the namespace that should be advertised |
208 | * @param meta meta-data for the namespace advertisement | 208 | * @param meta meta-data for the namespace advertisement |
209 | * @param bo block options | 209 | * @param bo block options |
210 | * @param rootEntry name of the root of the namespace | 210 | * @param rootEntry name of the root of the namespace |
@@ -215,7 +215,7 @@ advertisement_cont (void *cls, int success, | |||
215 | struct GNUNET_FS_AdvertisementContext * | 215 | struct GNUNET_FS_AdvertisementContext * |
216 | GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h, | 216 | GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h, |
217 | struct GNUNET_FS_Uri *ksk_uri, | 217 | struct GNUNET_FS_Uri *ksk_uri, |
218 | struct GNUNET_FS_Namespace *namespace, | 218 | struct GNUNET_FS_Namespace *ns, |
219 | const struct GNUNET_CONTAINER_MetaData *meta, | 219 | const struct GNUNET_CONTAINER_MetaData *meta, |
220 | const struct GNUNET_FS_BlockOptions *bo, | 220 | const struct GNUNET_FS_BlockOptions *bo, |
221 | const char *rootEntry, | 221 | const char *rootEntry, |
@@ -261,7 +261,7 @@ GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h, | |||
261 | } | 261 | } |
262 | size = mdsize + sizeof (struct NBlock) + reslen; | 262 | size = mdsize + sizeof (struct NBlock) + reslen; |
263 | nb = GNUNET_malloc (size); | 263 | nb = GNUNET_malloc (size); |
264 | GNUNET_CRYPTO_rsa_key_get_public (namespace->key, &nb->subspace); | 264 | GNUNET_CRYPTO_rsa_key_get_public (ns->key, &nb->subspace); |
265 | nb->ns_purpose.size = | 265 | nb->ns_purpose.size = |
266 | htonl (mdsize + reslen + | 266 | htonl (mdsize + reslen + |
267 | sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + | 267 | sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) + |
@@ -286,7 +286,7 @@ GNUNET_FS_namespace_advertise (struct GNUNET_FS_Handle *h, | |||
286 | ctx->nb = nb; | 286 | ctx->nb = nb; |
287 | ctx->pt = pt; | 287 | ctx->pt = pt; |
288 | ctx->pt_size = mdsize + reslen; | 288 | ctx->pt_size = mdsize + reslen; |
289 | ctx->ns = namespace; | 289 | ctx->ns = ns; |
290 | ctx->ns->rc++; | 290 | ctx->ns->rc++; |
291 | ctx->bo = *bo; | 291 | ctx->bo = *bo; |
292 | advertisement_cont (ctx, GNUNET_OK, GNUNET_TIME_UNIT_ZERO_ABS, NULL); | 292 | advertisement_cont (ctx, GNUNET_OK, GNUNET_TIME_UNIT_ZERO_ABS, NULL); |
diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c index b35abce3a..a7ed54c57 100644 --- a/src/nse/gnunet-nse-profiler.c +++ b/src/nse/gnunet-nse-profiler.c | |||
@@ -557,9 +557,6 @@ nse_disconnect_adapter (void *cls, | |||
557 | /** | 557 | /** |
558 | * Task run to connect to the NSE and statistics services to a subset of | 558 | * Task run to connect to the NSE and statistics services to a subset of |
559 | * all of the running peers. | 559 | * all of the running peers. |
560 | * | ||
561 | * @param cls handle the peer | ||
562 | * @param tc ignored | ||
563 | */ | 560 | */ |
564 | static void | 561 | static void |
565 | connect_nse_service () | 562 | connect_nse_service () |
@@ -617,8 +614,8 @@ next_round (void *cls, | |||
617 | * last round, terminates the run. | 614 | * last round, terminates the run. |
618 | * | 615 | * |
619 | * @param cls struct StatsContext | 616 | * @param cls struct StatsContext |
620 | * @param success GNUNET_OK if statistics were | 617 | * @param op operation handle |
621 | * successfully obtained, GNUNET_SYSERR if not. | 618 | * @param emsg error message, NULL on success |
622 | */ | 619 | */ |
623 | static void | 620 | static void |
624 | stats_finished_callback (void *cls, | 621 | stats_finished_callback (void *cls, |
diff --git a/src/vpn/vpn.h b/src/vpn/vpn.h index 12c9a7c81..e1ae130e7 100644 --- a/src/vpn/vpn.h +++ b/src/vpn/vpn.h | |||
@@ -82,7 +82,7 @@ struct RedirectToIpRequestMessage | |||
82 | struct RedirectToServiceRequestMessage | 82 | struct RedirectToServiceRequestMessage |
83 | { | 83 | { |
84 | /** | 84 | /** |
85 | * Type is GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_IP | 85 | * Type is GNUNET_MESSAGE_TYPE_VPN_CLIENT_REDIRECT_TO_SERVICE |
86 | */ | 86 | */ |
87 | struct GNUNET_MessageHeader header; | 87 | struct GNUNET_MessageHeader header; |
88 | 88 | ||