aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-02-26 11:32:46 +0000
committerng0 <ng0@n0.is>2019-02-26 11:32:46 +0000
commitb00ea4c4a360a9deb7619c01862f1910e4a906aa (patch)
treebf02d1b8d5a851fee6fd965353245b363c6b80a3
parent9537e6448b6275aa709c832080e9e05f5b3f7a47 (diff)
parent345a50d812dd16985c858f2e399b13c3938d744c (diff)
downloadgnunet-b00ea4c4a360a9deb7619c01862f1910e4a906aa.tar.gz
gnunet-b00ea4c4a360a9deb7619c01862f1910e4a906aa.zip
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r--src/transport/gnunet-service-transport.c8
-rw-r--r--src/transport/transport_api_core.c5
2 files changed, 8 insertions, 5 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index c621ea686..c5fce94a7 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -444,8 +444,8 @@ unicast (struct TransportClient *tc,
444 GNUNET_MQ_get_length (tc->mq), 444 GNUNET_MQ_get_length (tc->mq),
445 MAX_PENDING); 445 MAX_PENDING);
446 GNUNET_STATISTICS_update (GST_stats, 446 GNUNET_STATISTICS_update (GST_stats,
447 gettext_noop 447 gettext_noop ("# messages dropped due to slow client"),
448 ("# messages dropped due to slow client"), 1, 448 1,
449 GNUNET_NO); 449 GNUNET_NO);
450 return; 450 return;
451 } 451 }
@@ -1352,6 +1352,8 @@ GST_clients_broadcast (const struct GNUNET_MessageHeader *msg,
1352 NULL != tc; 1352 NULL != tc;
1353 tc = tc->next) 1353 tc = tc->next)
1354 { 1354 {
1355 if (CT_NONE == tc->type)
1356 continue; /* client not yet ready */
1355 if ( (GNUNET_YES == may_drop) && 1357 if ( (GNUNET_YES == may_drop) &&
1356 (CT_CORE != tc->type) ) 1358 (CT_CORE != tc->type) )
1357 continue; /* skip, this client does not care about payload */ 1359 continue; /* skip, this client does not care about payload */
@@ -1383,7 +1385,7 @@ GST_clients_broadcast_peer_notification (const struct GNUNET_PeerIdentity *peer,
1383{ 1385{
1384 struct GNUNET_MQ_Envelope *env; 1386 struct GNUNET_MQ_Envelope *env;
1385 struct PeerIterateResponseMessage *msg; 1387 struct PeerIterateResponseMessage *msg;
1386 1388
1387 msg = compose_address_iterate_response_message (peer, 1389 msg = compose_address_iterate_response_message (peer,
1388 address); 1390 address);
1389 msg->state = htonl (state); 1391 msg->state = htonl (state);
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c
index aa6da0098..e86499173 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -302,8 +302,9 @@ mq_error_handler (void *cls,
302{ 302{
303 struct GNUNET_TRANSPORT_CoreHandle *h = cls; 303 struct GNUNET_TRANSPORT_CoreHandle *h = cls;
304 304
305 LOG (GNUNET_ERROR_TYPE_DEBUG, 305 LOG (GNUNET_ERROR_TYPE_ERROR,
306 "Error receiving from transport service, disconnecting temporarily.\n"); 306 "Error receiving from transport service (%d), disconnecting temporarily.\n",
307 error);
307 disconnect_and_schedule_reconnect (h); 308 disconnect_and_schedule_reconnect (h);
308} 309}
309 310