aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/transport/gnunet-service-tng.c24
1 files changed, 19 insertions, 5 deletions
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index aaa9f129b..1bdd6fa7b 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -3681,6 +3681,7 @@ stop_peer_request (void *cls,
3681 return GNUNET_OK; 3681 return GNUNET_OK;
3682} 3682}
3683 3683
3684
3684static void 3685static void
3685do_shutdown (void *cls); 3686do_shutdown (void *cls);
3686 3687
@@ -3712,8 +3713,8 @@ client_disconnect_cb (void *cls,
3712 3713
3713 case CT_CORE: { 3714 case CT_CORE: {
3714 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3715 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3715 "CORE Client %p disconnected, cleaning up.\n", 3716 "CORE Client %p disconnected, cleaning up.\n",
3716 tc); 3717 tc);
3717 3718
3718 struct PendingMessage *pm; 3719 struct PendingMessage *pm;
3719 3720
@@ -4198,7 +4199,18 @@ queue_send_msg (struct Queue *queue,
4198 struct GNUNET_TRANSPORT_SendMessageTo *smt; 4199 struct GNUNET_TRANSPORT_SendMessageTo *smt;
4199 struct GNUNET_MQ_Envelope *env; 4200 struct GNUNET_MQ_Envelope *env;
4200 4201
4201 // queue->idle = GNUNET_NO; 4202 /**
4203 * FIXME: the queue idle member does not really make
4204 * sense in the code.
4205 * It is not clear what "idle" should mean? If it means
4206 * the queue is empty, then other code (see schedule_retransmit)
4207 * does not make sense at it ALWAYS expects and idle queue
4208 * or will refuse to transmit because it is "busy".
4209 * The problem is that the queue is (was) never set to
4210 * idle in the code. Now it is, but it is unclear if the
4211 * expected logic is preserved.
4212 */
4213 //queue->idle = GNUNET_NO;
4202 GNUNET_log ( 4214 GNUNET_log (
4203 GNUNET_ERROR_TYPE_DEBUG, 4215 GNUNET_ERROR_TYPE_DEBUG,
4204 "Queueing %u bytes of payload for transmission <%llu> on queue %llu to %s\n", 4216 "Queueing %u bytes of payload for transmission <%llu> on queue %llu to %s\n",
@@ -5204,7 +5216,7 @@ handle_del_address (void *cls,
5204 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 5216 GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
5205 "Communicator removed address we did not even have.\n"); 5217 "Communicator removed address we did not even have.\n");
5206 GNUNET_SERVICE_client_continue (tc->client); 5218 GNUNET_SERVICE_client_continue (tc->client);
5207 //GNUNET_SERVICE_client_drop (tc->client); 5219 // GNUNET_SERVICE_client_drop (tc->client);
5208} 5220}
5209 5221
5210 5222
@@ -8978,7 +8990,8 @@ transmit_on_queue (void *cls)
8978 8990
8979 OPTIMIZE: Note that in the future this heuristic should likely 8991 OPTIMIZE: Note that in the future this heuristic should likely
8980 be improved further (measure RTT stability, consider message 8992 be improved further (measure RTT stability, consider message
8981 urgency and size when delaying ACKs, etc.) */update_pm_next_attempt (pm, 8993 urgency and size when delaying ACKs, etc.) */
8994 update_pm_next_attempt (pm,
8982 GNUNET_TIME_relative_to_absolute ( 8995 GNUNET_TIME_relative_to_absolute (
8983 GNUNET_TIME_relative_multiply (queue->pd.aged_rtt, 8996 GNUNET_TIME_relative_multiply (queue->pd.aged_rtt,
8984 4))); 8997 4)));
@@ -10169,6 +10182,7 @@ do_shutdown (void *cls)
10169 GNUNET_SCHEDULER_shutdown (); 10182 GNUNET_SCHEDULER_shutdown ();
10170} 10183}
10171 10184
10185
10172static void 10186static void
10173shutdown_task (void *cls) 10187shutdown_task (void *cls)
10174{ 10188{