From: Bart Polot <bart@net.in.tum.de>
Date: Tue, 21 Jan 2014 03:04:58 +0000 (+0000)
Subject: - dont schedule keepalive on connection creation, wait for first creation message... 
X-Git-Tag: initial-import-from-subversion-38251~4990
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e2f5d12d485a6160ca1fb4ed277aaab10bfda54b;p=oweals%2Fgnunet.git

- dont schedule keepalive on connection creation, wait for first creation message to be sent
---

diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c
index 40919ef34..5954941e6 100644
--- a/src/mesh/gnunet-service-mesh_connection.c
+++ b/src/mesh/gnunet-service-mesh_connection.c
@@ -1269,7 +1269,7 @@ connection_reset_timeout (struct MeshConnection *c, int fwd)
 
   if (GMC_is_origin (c, fwd)) /* Startpoint */
   {
-    f  = fwd ? &connection_fwd_keepalive : &connection_bck_keepalive;
+    f = fwd ? &connection_fwd_keepalive : &connection_bck_keepalive;
     *ti = GNUNET_SCHEDULER_add_delayed (refresh_connection_time, f, c);
   }
   else /* Relay, endpoint. */
@@ -1277,7 +1277,7 @@ connection_reset_timeout (struct MeshConnection *c, int fwd)
     struct GNUNET_TIME_Relative delay;
 
     delay = GNUNET_TIME_relative_multiply (refresh_connection_time, 4);
-    f  = fwd ? &connection_fwd_timeout : &connection_bck_timeout;
+    f = fwd ? &connection_fwd_timeout : &connection_bck_timeout;
     *ti = GNUNET_SCHEDULER_add_delayed (delay, f, c);
   }
 }
@@ -2484,13 +2484,6 @@ GMC_new (const struct GNUNET_HashCode *cid,
     return NULL;
   }
 
-  if (0 == own_pos)
-  {
-    c->fwd_maintenance_task =
-      GNUNET_SCHEDULER_add_delayed (create_connection_time,
-                                    &connection_fwd_keepalive, c);
-  }
-
   return c;
 }