[GNUnet-SVN] r32222 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2014-02-04 19:51:35 +0100 (Tue, 04 Feb 2014)
New Revision: 32222

Modified:
   gnunet/src/mesh/gnunet-service-mesh_peer.c
Log:
- simplify timing out of old hellos

Modified: gnunet/src/mesh/gnunet-service-mesh_peer.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_peer.c  2014-02-04 18:51:34 UTC (rev 
32221)
+++ gnunet/src/mesh/gnunet-service-mesh_peer.c  2014-02-04 18:51:35 UTC (rev 
32222)
@@ -1885,32 +1885,19 @@
 void
 GMP_set_hello (struct MeshPeer *peer, const struct GNUNET_HELLO_Message *hello)
 {
-  struct GNUNET_TIME_Absolute expiration;
-  struct GNUNET_TIME_Relative remaining;
+  struct GNUNET_HELLO_Message *old;
   size_t size;
 
-  if (NULL == peer->hello)
+  old = GMP_get_hello (peer);
+  if (NULL == old)
   {
     size = GNUNET_HELLO_size (hello);
     peer->hello = GNUNET_malloc (size);
     memcpy (peer->hello, hello, size);
     return;
   }
-
-  expiration = GNUNET_HELLO_get_last_expiration (peer->hello);
-  remaining = GNUNET_TIME_absolute_get_remaining (expiration);
-  if (0 == remaining.rel_value_us)
-  {
-    GNUNET_free (peer->hello);
-    size = GNUNET_HELLO_size (hello);
-    peer->hello = GNUNET_malloc (size);
-    memcpy (peer->hello, hello, size);
-  }
   else
   {
-    struct GNUNET_HELLO_Message *old;
-
-    old = peer->hello;
     peer->hello = GNUNET_HELLO_merge (old, hello);
     GNUNET_free (old);
   }
@@ -1932,7 +1919,7 @@
 
   if (NULL == peer->hello)
     return NULL;
-  
+
   expiration = GNUNET_HELLO_get_last_expiration (peer->hello);
   remaining = GNUNET_TIME_absolute_get_remaining (expiration);
   if (0 == remaining.rel_value_us)