diff options
author | Julius Bünger <buenger@mytum.de> | 2016-05-13 22:49:06 +0000 |
---|---|---|
committer | Julius Bünger <buenger@mytum.de> | 2016-05-13 22:49:06 +0000 |
commit | d150cff9fc1c80ea458618cc39497bdc301a09fc (patch) | |
tree | 26ed39b1165466b067b538526ab283a19496ad40 /src/rps | |
parent | eeea5809f752477f50fc159f5c2adbdeb29d0521 (diff) | |
download | gnunet-d150cff9fc1c80ea458618cc39497bdc301a09fc.tar.gz gnunet-d150cff9fc1c80ea458618cc39497bdc301a09fc.zip |
-rps: logging
Diffstat (limited to 'src/rps')
-rw-r--r-- | src/rps/gnunet-service-rps.c | 11 | ||||
-rw-r--r-- | src/rps/gnunet-service-rps_peers.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c index 8113e40b6..38a644b01 100644 --- a/src/rps/gnunet-service-rps.c +++ b/src/rps/gnunet-service-rps.c | |||
@@ -966,7 +966,7 @@ client_respond (void *cls, | |||
966 | for (i = 0; i < num_peers; i++) | 966 | for (i = 0; i < num_peers; i++) |
967 | { | 967 | { |
968 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 968 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
969 | " %lu: %s\n", | 969 | " %" PRIu32 ": %s\n", |
970 | i, | 970 | i, |
971 | GNUNET_i2s (&peer_ids[i])); | 971 | GNUNET_i2s (&peer_ids[i])); |
972 | } | 972 | } |
@@ -1074,7 +1074,7 @@ handle_client_request_cancel (void *cls, | |||
1074 | GNUNET_assert (NULL != cli_ctx->rep_cls_head); | 1074 | GNUNET_assert (NULL != cli_ctx->rep_cls_head); |
1075 | rep_cls = cli_ctx->rep_cls_head; | 1075 | rep_cls = cli_ctx->rep_cls_head; |
1076 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1076 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1077 | "Client cancels request with id %lu\n", | 1077 | "Client cancels request with id %" PRIu32 "\n", |
1078 | ntohl (msg->id)); | 1078 | ntohl (msg->id)); |
1079 | while ( (NULL != rep_cls->next) && | 1079 | while ( (NULL != rep_cls->next) && |
1080 | (rep_cls->id != ntohl (msg->id)) ) | 1080 | (rep_cls->id != ntohl (msg->id)) ) |
@@ -1311,7 +1311,7 @@ handle_peer_pull_reply (void *cls, | |||
1311 | sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers)) | 1311 | sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers)) |
1312 | { | 1312 | { |
1313 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1313 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1314 | "message says it sends %" PRIu32 " peers, have space for %i peers\n", | 1314 | "message says it sends %" PRIu32 " peers, have space for %lu peers\n", |
1315 | ntohl (in_msg->num_peers), | 1315 | ntohl (in_msg->num_peers), |
1316 | (ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / | 1316 | (ntohs (msg->size) - sizeof (struct GNUNET_RPS_P2P_PullReplyMessage)) / |
1317 | sizeof (struct GNUNET_PeerIdentity)); | 1317 | sizeof (struct GNUNET_PeerIdentity)); |
@@ -1530,7 +1530,7 @@ handle_client_act_malicious (void *cls, | |||
1530 | sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers)) | 1530 | sizeof (struct GNUNET_PeerIdentity) != ntohl (in_msg->num_peers)) |
1531 | { | 1531 | { |
1532 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1532 | LOG (GNUNET_ERROR_TYPE_ERROR, |
1533 | "message says it sends %" PRIu64 " peers, have space for %i peers\n", | 1533 | "message says it sends %" PRIu32 " peers, have space for %lu peers\n", |
1534 | ntohl (in_msg->num_peers), | 1534 | ntohl (in_msg->num_peers), |
1535 | (ntohs (msg->size) - sizeof (struct GNUNET_RPS_CS_ActMaliciousMessage)) / | 1535 | (ntohs (msg->size) - sizeof (struct GNUNET_RPS_CS_ActMaliciousMessage)) / |
1536 | sizeof (struct GNUNET_PeerIdentity)); | 1536 | sizeof (struct GNUNET_PeerIdentity)); |
@@ -2221,7 +2221,7 @@ run (void *cls, | |||
2221 | GNUNET_SCHEDULER_shutdown (); | 2221 | GNUNET_SCHEDULER_shutdown (); |
2222 | return; | 2222 | return; |
2223 | } | 2223 | } |
2224 | LOG (GNUNET_ERROR_TYPE_DEBUG, "INITSIZE is %" PRIu64 "\n", sampler_size_est_need); | 2224 | LOG (GNUNET_ERROR_TYPE_DEBUG, "INITSIZE is %u\n", sampler_size_est_need); |
2225 | 2225 | ||
2226 | 2226 | ||
2227 | View_create (4); | 2227 | View_create (4); |
@@ -2266,7 +2266,6 @@ run (void *cls, | |||
2266 | {&handle_peer_pull_reply , GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY , 0}, | 2266 | {&handle_peer_pull_reply , GNUNET_MESSAGE_TYPE_RPS_PP_PULL_REPLY , 0}, |
2267 | {NULL, 0, 0} | 2267 | {NULL, 0, 0} |
2268 | }; | 2268 | }; |
2269 | |||
2270 | const uint32_t ports[] = {GNUNET_RPS_CADET_PORT, 0}; // _PORT specified in src/rps/rps.h | 2269 | const uint32_t ports[] = {GNUNET_RPS_CADET_PORT, 0}; // _PORT specified in src/rps/rps.h |
2271 | cadet_handle = GNUNET_CADET_connect (cfg, | 2270 | cadet_handle = GNUNET_CADET_connect (cfg, |
2272 | cls, | 2271 | cls, |
diff --git a/src/rps/gnunet-service-rps_peers.c b/src/rps/gnunet-service-rps_peers.c index a6cd1b839..70ae30f76 100644 --- a/src/rps/gnunet-service-rps_peers.c +++ b/src/rps/gnunet-service-rps_peers.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | 33 | ||
34 | 34 | ||
35 | #define LOG(kind, ...) GNUNET_log(kind, __VA_ARGS__) | 35 | #define LOG(kind, ...) GNUNET_log_from(kind,"rps-peers",__VA_ARGS__) |
36 | 36 | ||
37 | 37 | ||
38 | /** | 38 | /** |