diff options
Diffstat (limited to 'src/psyc/gnunet-service-psyc.c')
-rw-r--r-- | src/psyc/gnunet-service-psyc.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/psyc/gnunet-service-psyc.c b/src/psyc/gnunet-service-psyc.c index 0f2216428..3edc0295c 100644 --- a/src/psyc/gnunet-service-psyc.c +++ b/src/psyc/gnunet-service-psyc.c | |||
@@ -1790,7 +1790,10 @@ client_recv_slave_join (void *cls, struct GNUNET_SERVER_Client *client, | |||
1790 | { | 1790 | { |
1791 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1791 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1792 | "%u + %u + %u != %u\n", | 1792 | "%u + %u + %u != %u\n", |
1793 | sizeof (*req), relay_size, join_msg_size, req_size); | 1793 | (unsigned int) sizeof (*req), |
1794 | relay_size, | ||
1795 | join_msg_size, | ||
1796 | req_size); | ||
1794 | GNUNET_break (0); | 1797 | GNUNET_break (0); |
1795 | GNUNET_SERVER_client_disconnect (client); | 1798 | GNUNET_SERVER_client_disconnect (client); |
1796 | GNUNET_free (slv); | 1799 | GNUNET_free (slv); |
@@ -2261,7 +2264,9 @@ client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, | |||
2261 | { | 2264 | { |
2262 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2265 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2263 | "%p Message payload too large: %u < %u.\n", | 2266 | "%p Message payload too large: %u < %u.\n", |
2264 | chn, GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD, size - sizeof (*msg)); | 2267 | chn, |
2268 | GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD, | ||
2269 | (unsigned int) (size - sizeof (*msg))); | ||
2265 | GNUNET_break (0); | 2270 | GNUNET_break (0); |
2266 | transmit_cancel (chn, client); | 2271 | transmit_cancel (chn, client); |
2267 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 2272 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
@@ -2298,13 +2303,18 @@ client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, | |||
2298 | * Received result of GNUNET_PSYCSTORE_membership_store() | 2303 | * Received result of GNUNET_PSYCSTORE_membership_store() |
2299 | */ | 2304 | */ |
2300 | static void | 2305 | static void |
2301 | store_recv_membership_store_result (void *cls, int64_t result, | 2306 | store_recv_membership_store_result (void *cls, |
2302 | const char *err_msg, uint16_t err_msg_size) | 2307 | int64_t result, |
2308 | const char *err_msg, | ||
2309 | uint16_t err_msg_size) | ||
2303 | { | 2310 | { |
2304 | struct Operation *op = cls; | 2311 | struct Operation *op = cls; |
2305 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2312 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2306 | "%p GNUNET_PSYCSTORE_membership_store() returned %" PRId64 " (%.s)\n", | 2313 | "%p GNUNET_PSYCSTORE_membership_store() returned %" PRId64 " (%.s)\n", |
2307 | op->chn, result, err_msg_size, err_msg); | 2314 | op->chn, |
2315 | result, | ||
2316 | (int) err_msg_size, | ||
2317 | err_msg); | ||
2308 | 2318 | ||
2309 | if (NULL != op->client) | 2319 | if (NULL != op->client) |
2310 | client_send_result (op->client, op->op_id, result, err_msg, err_msg_size); | 2320 | client_send_result (op->client, op->op_id, result, err_msg, err_msg_size); |
@@ -2432,7 +2442,10 @@ client_recv_history_replay (void *cls, struct GNUNET_SERVER_Client *client, | |||
2432 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2442 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2433 | "%p History replay #%" PRIu64 ": " | 2443 | "%p History replay #%" PRIu64 ": " |
2434 | "invalid method prefix. size: %u < %u?\n", | 2444 | "invalid method prefix. size: %u < %u?\n", |
2435 | chn, GNUNET_ntohll (req->op_id), size, sizeof (*req) + 1); | 2445 | chn, |
2446 | GNUNET_ntohll (req->op_id), | ||
2447 | size, | ||
2448 | (unsigned int) sizeof (*req) + 1); | ||
2436 | GNUNET_break (0); | 2449 | GNUNET_break (0); |
2437 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 2450 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
2438 | return; | 2451 | return; |