From: Matthias Wachs Date: Fri, 21 Oct 2011 09:38:56 +0000 (+0000) Subject: fixing mantis #18773 X-Git-Tag: initial-import-from-subversion-38251~16356 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4e565fee331b196766fbde23b177cd8fd3d9c179;p=oweals%2Fgnunet.git fixing mantis #18773 --- diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index 075d776e5..1dd7ad36f 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -209,6 +209,14 @@ transmit_message_to_ats (void *cls, char *cbuf; sh->th = NULL; + if ( (size == 0) || (buf == NULL)) + { + GNUNET_CLIENT_disconnect (sh->client, GNUNET_NO); + sh->client = NULL; + sh->task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, + &reconnect_task, sh); + return 0; + } ret = 0; cbuf = buf; while ( (NULL != (p = sh->pending_head)) && @@ -251,7 +259,7 @@ do_transmit (struct GNUNET_ATS_SchedulingHandle *sh) sh->th = GNUNET_CLIENT_notify_transmit_ready (sh->client, p->size, GNUNET_TIME_UNIT_FOREVER_REL, - GNUNET_YES, + GNUNET_NO, &transmit_message_to_ats, sh); } diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index efb94b6f1..486be2314 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -404,7 +404,7 @@ try_transmission_to_peer (struct NeighbourMapEntry *n) if (((n->session == NULL) && (n->addr == NULL) && (n->addrlen == 0))) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No address peer for peer `%s'\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "No address for peer `%s'\n", GNUNET_i2s (&n->id)); transmit_send_continuation (mq, &n->id, GNUNET_SYSERR); n->transmission_task = GNUNET_SCHEDULER_add_now (&transmission_task, n);