diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-03-03 21:23:50 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-03-03 21:23:50 +0100 |
commit | 908626e8e19695aa5cd291e5033761ed744d5332 (patch) | |
tree | 5ad7fc7d9514968a3e77a799e335c8cb6784ae7e /src/util/client.c | |
parent | c36f464031c4bebf11ce109cf6edbada584981d3 (diff) | |
download | gnunet-908626e8e19695aa5cd291e5033761ed744d5332.tar.gz gnunet-908626e8e19695aa5cd291e5033761ed744d5332.zip |
fix logging
Diffstat (limited to 'src/util/client.c')
-rw-r--r-- | src/util/client.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/util/client.c b/src/util/client.c index 7a718fc8d..3479fa971 100644 --- a/src/util/client.c +++ b/src/util/client.c | |||
@@ -261,11 +261,11 @@ transmit_ready (void *cls) | |||
261 | pos = (const char *) cstate->msg; | 261 | pos = (const char *) cstate->msg; |
262 | len = ntohs (cstate->msg->size); | 262 | len = ntohs (cstate->msg->size); |
263 | GNUNET_assert (cstate->msg_off < len); | 263 | GNUNET_assert (cstate->msg_off < len); |
264 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 264 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
265 | "client: message of type %u trying to send with socket %p (MQ: %p\n", | 265 | "message of type %u trying to send with socket %p (MQ: %p\n", |
266 | ntohs(cstate->msg->type), | 266 | ntohs(cstate->msg->type), |
267 | cstate->sock, | 267 | cstate->sock, |
268 | cstate->mq); | 268 | cstate->mq); |
269 | 269 | ||
270 | RETRY: | 270 | RETRY: |
271 | ret = GNUNET_NETWORK_socket_send (cstate->sock, | 271 | ret = GNUNET_NETWORK_socket_send (cstate->sock, |
@@ -273,13 +273,13 @@ transmit_ready (void *cls) | |||
273 | len - cstate->msg_off); | 273 | len - cstate->msg_off); |
274 | if (-1 == ret) | 274 | if (-1 == ret) |
275 | { | 275 | { |
276 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 276 | LOG (GNUNET_ERROR_TYPE_WARNING, |
277 | "client: error during sending message of type %u\n", | 277 | "Error during sending message of type %u\n", |
278 | ntohs(cstate->msg->type)); | 278 | ntohs(cstate->msg->type)); |
279 | if (EINTR == errno){ | 279 | if (EINTR == errno){ |
280 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 280 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
281 | "client: retrying message of type %u\n", | 281 | "Retrying message of type %u\n", |
282 | ntohs(cstate->msg->type)); | 282 | ntohs(cstate->msg->type)); |
283 | goto RETRY; | 283 | goto RETRY; |
284 | } | 284 | } |
285 | GNUNET_MQ_inject_error (cstate->mq, | 285 | GNUNET_MQ_inject_error (cstate->mq, |
@@ -290,9 +290,9 @@ transmit_ready (void *cls) | |||
290 | cstate->msg_off += ret; | 290 | cstate->msg_off += ret; |
291 | if (cstate->msg_off < len) | 291 | if (cstate->msg_off < len) |
292 | { | 292 | { |
293 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 293 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
294 | "client: rescheduling message of type %u\n", | 294 | "rescheduling message of type %u\n", |
295 | ntohs(cstate->msg->type)); | 295 | ntohs(cstate->msg->type)); |
296 | cstate->send_task | 296 | cstate->send_task |
297 | = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, | 297 | = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, |
298 | cstate->sock, | 298 | cstate->sock, |
@@ -302,9 +302,9 @@ transmit_ready (void *cls) | |||
302 | GNUNET_MQ_impl_send_in_flight (cstate->mq); | 302 | GNUNET_MQ_impl_send_in_flight (cstate->mq); |
303 | return; | 303 | return; |
304 | } | 304 | } |
305 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 305 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
306 | "client: sending message of type %u successful\n", | 306 | "sending message of type %u successful\n", |
307 | ntohs(cstate->msg->type)); | 307 | ntohs(cstate->msg->type)); |
308 | cstate->msg = NULL; | 308 | cstate->msg = NULL; |
309 | GNUNET_MQ_impl_send_continue (cstate->mq); | 309 | GNUNET_MQ_impl_send_continue (cstate->mq); |
310 | } | 310 | } |
@@ -394,9 +394,9 @@ connection_client_destroy_impl (struct GNUNET_MQ_Handle *mq, | |||
394 | if (NULL != cstate->retry_task) | 394 | if (NULL != cstate->retry_task) |
395 | GNUNET_SCHEDULER_cancel (cstate->retry_task); | 395 | GNUNET_SCHEDULER_cancel (cstate->retry_task); |
396 | if (NULL != cstate->sock){ | 396 | if (NULL != cstate->sock){ |
397 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 397 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
398 | "client: destroying socket: %p\n", | 398 | "destroying socket: %p\n", |
399 | cstate->sock); | 399 | cstate->sock); |
400 | GNUNET_NETWORK_socket_close (cstate->sock); | 400 | GNUNET_NETWORK_socket_close (cstate->sock); |
401 | } | 401 | } |
402 | cancel_aps (cstate); | 402 | cancel_aps (cstate); |
@@ -822,9 +822,9 @@ connection_client_send_impl (struct GNUNET_MQ_Handle *mq, | |||
822 | cstate->msg = msg; | 822 | cstate->msg = msg; |
823 | cstate->msg_off = 0; | 823 | cstate->msg_off = 0; |
824 | if (NULL == cstate->sock){ | 824 | if (NULL == cstate->sock){ |
825 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 825 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
826 | "client: message of type %u waiting for socket\n", | 826 | "message of type %u waiting for socket\n", |
827 | ntohs(msg->type)); | 827 | ntohs(msg->type)); |
828 | return; /* still waiting for connection */ | 828 | return; /* still waiting for connection */ |
829 | } | 829 | } |
830 | cstate->send_task | 830 | cstate->send_task |