diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-01-20 07:00:54 +0100 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-01-20 07:00:54 +0100 |
commit | 3cb90c74c5f591fd2541d154a8e7b05a1c2f4539 (patch) | |
tree | 620638f54539749f2a1b27a5991a90880fe7c14d /src/psycstore | |
parent | 7122f35e2c00c29b1af31bdd294e93e6fcc84498 (diff) | |
parent | aedd5919e802370061850486c96da72b25df7f22 (diff) | |
download | gnunet-3cb90c74c5f591fd2541d154a8e7b05a1c2f4539.tar.gz gnunet-3cb90c74c5f591fd2541d154a8e7b05a1c2f4539.zip |
- merge; service API change
Diffstat (limited to 'src/psycstore')
-rw-r--r-- | src/psycstore/gnunet-service-psycstore.c | 4 | ||||
-rw-r--r-- | src/psycstore/psycstore_api.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c index 573a58d5c..10c92a878 100644 --- a/src/psycstore/gnunet-service-psycstore.c +++ b/src/psycstore/gnunet-service-psycstore.c | |||
@@ -198,8 +198,8 @@ send_fragment (void *cls, struct GNUNET_MULTICAST_MessageHeader *msg, | |||
198 | res->psycstore_flags = htonl (flags); | 198 | res->psycstore_flags = htonl (flags); |
199 | GNUNET_memcpy (&res[1], msg, msg_size); | 199 | GNUNET_memcpy (&res[1], msg, msg_size); |
200 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 200 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
201 | "Sending fragment %ld to client\n", | 201 | "Sending fragment %llu to client\n", |
202 | GNUNET_ntohll (msg->fragment_id)); | 202 | (unsigned long long) GNUNET_ntohll (msg->fragment_id)); |
203 | GNUNET_free (msg); | 203 | GNUNET_free (msg); |
204 | 204 | ||
205 | GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (sc->client), env); | 205 | GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (sc->client), env); |
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c index 480d594fc..40322662e 100644 --- a/src/psycstore/psycstore_api.c +++ b/src/psycstore/psycstore_api.c | |||
@@ -348,7 +348,7 @@ do_connect (struct GNUNET_PSYCSTORE_Handle *h) | |||
348 | 348 | ||
349 | h->op = GNUNET_OP_create (); | 349 | h->op = GNUNET_OP_create (); |
350 | GNUNET_assert (NULL == h->mq); | 350 | GNUNET_assert (NULL == h->mq); |
351 | h->mq = GNUNET_CLIENT_connecT (h->cfg, "psycstore", | 351 | h->mq = GNUNET_CLIENT_connect (h->cfg, "psycstore", |
352 | handlers, disconnected, h); | 352 | handlers, disconnected, h); |
353 | GNUNET_assert (NULL != h->mq); | 353 | GNUNET_assert (NULL != h->mq); |
354 | } | 354 | } |