- fix

[oweals/gnunet.git] / src / transport / plugin_transport_tcp.c

diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 07abc46cf8924efb985ecea6f4271efba42bfc49..856ec6eafb53b3c4bcfa10ab8d383f1428b7807f 100644 (file)
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1956,21 +1956,11 @@ static void
 delayed_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct Session *session = cls;
-  struct GNUNET_TIME_Relative delay;
-  struct GNUNET_ATS_Information ats;
 
   session->receive_delay_task = GNUNET_SCHEDULER_NO_TASK;
-  delay =
-      session->plugin->env->receive (session->plugin->env->cls,
-                                     &session->target, NULL, &ats, 0, session,
-                                     NULL, 0);
   reschedule_session_timeout (session);
 
-  if (delay.rel_value == 0)
-    GNUNET_SERVER_receive_done (session->client, GNUNET_OK);
-  else
-    session->receive_delay_task =
-        GNUNET_SCHEDULER_add_delayed (delay, &delayed_done, session);
+  GNUNET_SERVER_receive_done (session->client, GNUNET_OK);
 }
 
 
@@ -2060,10 +2050,16 @@ handle_tcp_data (void *cls, struct GNUNET_SERVER_Client *client,
   delay = plugin->env->receive (plugin->env->cls,
                                 &session->target,
                                 message,
-                                (const struct GNUNET_ATS_Information *) &distance,
-                                2, session,
+                                session,
                                 (GNUNET_YES == session->inbound) ? NULL : session->addr,
                                 (GNUNET_YES == session->inbound) ? 0 : session->addrlen);
+  plugin->env->update_address_metrics (plugin->env->cls,
+               &session->target,
+               (GNUNET_YES == session->inbound) ? NULL : session->addr,
+      (GNUNET_YES == session->inbound) ? 0 : session->addrlen,
+      session,
+      (struct GNUNET_ATS_Information *) &distance,
+      2);
 
   reschedule_session_timeout (session);