diff options
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 8 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_manipulation.c | 2 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport_neighbours.c | 28 | ||||
-rw-r--r-- | src/transport/transport_api_address_to_string.c | 2 |
4 files changed, 18 insertions, 22 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 119e5e564..14eefdfb3 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -224,7 +224,7 @@ process_payload (const struct GNUNET_HELLO_Address *address, | |||
224 | { | 224 | { |
225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
226 | "Discarded %u bytes type %u payload from peer `%s'\n", | 226 | "Discarded %u bytes type %u payload from peer `%s'\n", |
227 | msg_size, | 227 | (unsigned int) msg_size, |
228 | ntohs (message->type), | 228 | ntohs (message->type), |
229 | GNUNET_i2s (&address->peer)); | 229 | GNUNET_i2s (&address->peer)); |
230 | GNUNET_STATISTICS_update (GST_stats, gettext_noop | 230 | GNUNET_STATISTICS_update (GST_stats, gettext_noop |
@@ -866,9 +866,9 @@ run (void *cls, | |||
866 | { | 866 | { |
867 | max_fd_rlimit = r_file.rlim_cur; | 867 | max_fd_rlimit = r_file.rlim_cur; |
868 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 868 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
869 | "Maximum number of open files was: %u/%u\n", | 869 | "Maximum number of open files was: %u/%u\n", |
870 | r_file.rlim_cur, | 870 | (unsigned int) r_file.rlim_cur, |
871 | r_file.rlim_max); | 871 | (unsigned int) r_file.rlim_max); |
872 | } | 872 | } |
873 | max_fd_rlimit = (9 * max_fd_rlimit) / 10; /* Keep 10% for rest of transport */ | 873 | max_fd_rlimit = (9 * max_fd_rlimit) / 10; /* Keep 10% for rest of transport */ |
874 | #endif | 874 | #endif |
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index bd3fed6d7..7620cdbb1 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c | |||
@@ -350,7 +350,7 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target, | |||
350 | } | 350 | } |
351 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 351 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
352 | "Delaying %u byte message to peer `%s' with peer specific delay for %s\n", | 352 | "Delaying %u byte message to peer `%s' with peer specific delay for %s\n", |
353 | msg_size, | 353 | (unsigned int) msg_size, |
354 | GNUNET_i2s (target), | 354 | GNUNET_i2s (target), |
355 | GNUNET_STRINGS_relative_time_to_string (delay, | 355 | GNUNET_STRINGS_relative_time_to_string (delay, |
356 | GNUNET_YES)); | 356 | GNUNET_YES)); |
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index 65428ef2a..9d1c9459e 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -1296,12 +1296,12 @@ transmit_send_continuation (void *cls, | |||
1296 | if (bytes_in_send_queue < mq->message_buf_size) | 1296 | if (bytes_in_send_queue < mq->message_buf_size) |
1297 | { | 1297 | { |
1298 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1298 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1299 | "Bytes_in_send_queue `%u', Message_size %u, result: %s, payload %u, on wire %u\n", | 1299 | "Bytes_in_send_queue `%llu', Message_size %u, result: %s, payload %u, on wire %u\n", |
1300 | bytes_in_send_queue, | 1300 | bytes_in_send_queue, |
1301 | mq->message_buf_size, | 1301 | (unsigned int) mq->message_buf_size, |
1302 | (GNUNET_OK == success) ? "OK" : "FAIL", | 1302 | (GNUNET_OK == success) ? "OK" : "FAIL", |
1303 | size_payload, | 1303 | (unsigned int) size_payload, |
1304 | physical); | 1304 | (unsigned int) physical); |
1305 | GNUNET_break (0); | 1305 | GNUNET_break (0); |
1306 | } | 1306 | } |
1307 | 1307 | ||
@@ -1325,7 +1325,7 @@ transmit_send_continuation (void *cls, | |||
1325 | "Sending message to `%s' of type %u with %u bytes was a %s\n", | 1325 | "Sending message to `%s' of type %u with %u bytes was a %s\n", |
1326 | GNUNET_i2s (receiver), | 1326 | GNUNET_i2s (receiver), |
1327 | ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type), | 1327 | ntohs (((struct GNUNET_MessageHeader *) mq->message_buf)->type), |
1328 | mq->message_buf_size, | 1328 | (unsigned int) mq->message_buf_size, |
1329 | (success == GNUNET_OK) ? "success" : "FAILURE"); | 1329 | (success == GNUNET_OK) ? "success" : "FAILURE"); |
1330 | if (NULL != mq->cont) | 1330 | if (NULL != mq->cont) |
1331 | mq->cont (mq->cont_cls, | 1331 | mq->cont (mq->cont_cls, |
@@ -1401,7 +1401,7 @@ try_transmission_to_peer (struct NeighbourMapEntry *n) | |||
1401 | 1401 | ||
1402 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1402 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1403 | "Giving message with %u bytes to plugin session %p\n", | 1403 | "Giving message with %u bytes to plugin session %p\n", |
1404 | mq->message_buf_size, | 1404 | (unsigned int) mq->message_buf_size, |
1405 | n->primary_address.session); | 1405 | n->primary_address.session); |
1406 | (void) send_with_session (n, | 1406 | (void) send_with_session (n, |
1407 | mq->message_buf, | 1407 | mq->message_buf, |
@@ -1773,7 +1773,7 @@ GST_neighbours_send (const struct GNUNET_PeerIdentity *target, | |||
1773 | 1773 | ||
1774 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1774 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1775 | "Enqueueing %u bytes to send to peer %s\n", | 1775 | "Enqueueing %u bytes to send to peer %s\n", |
1776 | msg_size, | 1776 | (unsigned int) msg_size, |
1777 | GNUNET_i2s (target)); | 1777 | GNUNET_i2s (target)); |
1778 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, | 1778 | GNUNET_CONTAINER_DLL_insert_tail (n->messages_head, |
1779 | n->messages_tail, | 1779 | n->messages_tail, |
@@ -2117,7 +2117,7 @@ inbound_bw_tracker_update (void *cls) | |||
2117 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2117 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2118 | "New inbound delay for peer `%s' is %llu ms\n", | 2118 | "New inbound delay for peer `%s' is %llu ms\n", |
2119 | GNUNET_i2s (&n->id), | 2119 | GNUNET_i2s (&n->id), |
2120 | delay.rel_value_us / 1000); | 2120 | (unsigned long long) delay.rel_value_us / 1000LL); |
2121 | papi->update_inbound_delay (papi->cls, | 2121 | papi->update_inbound_delay (papi->cls, |
2122 | &n->id, | 2122 | &n->id, |
2123 | n->primary_address.session, | 2123 | n->primary_address.session, |
@@ -3244,11 +3244,9 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
3244 | /* The session used to send the SYN terminated: | 3244 | /* The session used to send the SYN terminated: |
3245 | * this implies a connect error*/ | 3245 | * this implies a connect error*/ |
3246 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 3246 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
3247 | "Failed to send SYN in %s with `%s' %p: session terminated\n", | 3247 | "Failed to send SYN in CONNECT_SENT with `%s' %p: session terminated\n", |
3248 | "CONNECT_SENT", | ||
3249 | GST_plugins_a2s (n->primary_address.address), | 3248 | GST_plugins_a2s (n->primary_address.address), |
3250 | n->primary_address.session, | 3249 | n->primary_address.session); |
3251 | GNUNET_i2s (peer)); | ||
3252 | 3250 | ||
3253 | /* Destroy the address since it cannot be used */ | 3251 | /* Destroy the address since it cannot be used */ |
3254 | unset_primary_address (n); | 3252 | unset_primary_address (n); |
@@ -3274,11 +3272,9 @@ GST_neighbours_session_terminated (const struct GNUNET_PeerIdentity *peer, | |||
3274 | break; | 3272 | break; |
3275 | case GNUNET_TRANSPORT_PS_RECONNECT_SENT: | 3273 | case GNUNET_TRANSPORT_PS_RECONNECT_SENT: |
3276 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 3274 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
3277 | "Failed to send SYN in %s with `%s' %p: session terminated\n", | 3275 | "Failed to send SYN in RECONNECT_SENT with `%s' %p: session terminated\n", |
3278 | "RECONNECT_SENT", | ||
3279 | GST_plugins_a2s (n->primary_address.address), | 3276 | GST_plugins_a2s (n->primary_address.address), |
3280 | n->primary_address.session, | 3277 | n->primary_address.session); |
3281 | GNUNET_i2s (peer)); | ||
3282 | /* Destroy the address since it cannot be used */ | 3278 | /* Destroy the address since it cannot be used */ |
3283 | unset_primary_address (n); | 3279 | unset_primary_address (n); |
3284 | set_state_and_timeout (n, | 3280 | set_state_and_timeout (n, |
diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c index 2220790be..2b8b426c7 100644 --- a/src/transport/transport_api_address_to_string.c +++ b/src/transport/transport_api_address_to_string.c | |||
@@ -203,7 +203,7 @@ GNUNET_TRANSPORT_address_to_string (const struct GNUNET_CONFIGURATION_Handle *cf | |||
203 | client, | 203 | client, |
204 | GNUNET_i2s (&address->peer), | 204 | GNUNET_i2s (&address->peer), |
205 | address->transport_name, | 205 | address->transport_name, |
206 | address->address_length); | 206 | (unsigned int) address->address_length); |
207 | 207 | ||
208 | msg = GNUNET_malloc (len); | 208 | msg = GNUNET_malloc (len); |
209 | msg->header.size = htons (len); | 209 | msg->header.size = htons (len); |