diff options
Diffstat (limited to 'src/secretsharing/secretsharing_api.c')
-rw-r--r-- | src/secretsharing/secretsharing_api.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c index e268fc56f..7b98a749c 100644 --- a/src/secretsharing/secretsharing_api.c +++ b/src/secretsharing/secretsharing_api.c | |||
@@ -260,10 +260,14 @@ GNUNET_SECRETSHARING_create_session (const struct GNUNET_CONFIGURATION_Handle *c | |||
260 | }; | 260 | }; |
261 | struct GNUNET_MQ_Envelope *ev; | 261 | struct GNUNET_MQ_Envelope *ev; |
262 | struct GNUNET_SECRETSHARING_CreateMessage *msg; | 262 | struct GNUNET_SECRETSHARING_CreateMessage *msg; |
263 | struct GNUNET_CLIENT_Connection *client; | ||
264 | 263 | ||
265 | client = GNUNET_CLIENT_connect ("secretsharing", cfg); | 264 | s->mq = GNUNET_CLIENT_connecT (cfg, |
266 | if (NULL == client) | 265 | "secretsharing", |
266 | client, | ||
267 | mq_handlers, | ||
268 | &handle_session_client_error, | ||
269 | s); | ||
270 | if (NULL == s->mq) | ||
267 | { | 271 | { |
268 | /* secretsharing not configured correctly */ | 272 | /* secretsharing not configured correctly */ |
269 | GNUNET_break (0); | 273 | GNUNET_break (0); |
@@ -272,12 +276,6 @@ GNUNET_SECRETSHARING_create_session (const struct GNUNET_CONFIGURATION_Handle *c | |||
272 | } | 276 | } |
273 | s->secret_ready_cb = cb; | 277 | s->secret_ready_cb = cb; |
274 | s->secret_ready_cls = cls; | 278 | s->secret_ready_cls = cls; |
275 | s->mq = GNUNET_MQ_queue_for_connection_client (client, | ||
276 | mq_handlers, | ||
277 | &handle_session_client_error, | ||
278 | s); | ||
279 | GNUNET_assert (NULL != s->mq); | ||
280 | |||
281 | ev = GNUNET_MQ_msg_extra (msg, | 279 | ev = GNUNET_MQ_msg_extra (msg, |
282 | num_peers * sizeof (struct GNUNET_PeerIdentity), | 280 | num_peers * sizeof (struct GNUNET_PeerIdentity), |
283 | GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_GENERATE); | 281 | GNUNET_MESSAGE_TYPE_SECRETSHARING_CLIENT_GENERATE); |
@@ -348,20 +346,19 @@ GNUNET_SECRETSHARING_decrypt (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
348 | struct GNUNET_MQ_Envelope *ev; | 346 | struct GNUNET_MQ_Envelope *ev; |
349 | struct GNUNET_SECRETSHARING_DecryptRequestMessage *msg; | 347 | struct GNUNET_SECRETSHARING_DecryptRequestMessage *msg; |
350 | size_t share_size; | 348 | size_t share_size; |
351 | struct GNUNET_CLIENT_Connection *client; | ||
352 | 349 | ||
353 | client = GNUNET_CLIENT_connect ("secretsharing", cfg); | ||
354 | if (NULL == client) | ||
355 | return NULL; | ||
356 | s->decrypt_cb = decrypt_cb; | 350 | s->decrypt_cb = decrypt_cb; |
357 | s->decrypt_cls = decrypt_cb_cls; | 351 | s->decrypt_cls = decrypt_cb_cls; |
358 | 352 | s->mq = GNUNET_CLIENT_connecT (cfg, | |
359 | s->mq = GNUNET_MQ_queue_for_connection_client (client, | 353 | "secretsharing", |
360 | mq_handlers, | 354 | mq_handlers, |
361 | &handle_decrypt_client_error, | 355 | &handle_decrypt_client_error, |
362 | s); | 356 | s); |
363 | GNUNET_assert (NULL != s->mq); | 357 | if (NULL == s->mq) |
364 | 358 | { | |
359 | GNUNET_free (s); | ||
360 | return NULL; | ||
361 | } | ||
365 | GNUNET_assert (GNUNET_OK == | 362 | GNUNET_assert (GNUNET_OK == |
366 | GNUNET_SECRETSHARING_share_write (share, NULL, 0, | 363 | GNUNET_SECRETSHARING_share_write (share, NULL, 0, |
367 | &share_size)); | 364 | &share_size)); |