[GNUnet-SVN] r35695 - gnunet/src/dht

[gnunet]

Author: grothoff
Date: 2015-04-30 14:36:38 +0200 (Thu, 30 Apr 2015)
New Revision: 35695

Modified:
   gnunet/src/dht/gnunet-service-wdht_neighbours.c
Log:
-fix ftbfs

Modified: gnunet/src/dht/gnunet-service-wdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-wdht_neighbours.c     2015-04-30 12:29:58 UTC 
(rev 35694)
+++ gnunet/src/dht/gnunet-service-wdht_neighbours.c     2015-04-30 12:36:38 UTC 
(rev 35695)
@@ -1159,17 +1159,15 @@
   struct Trail *trail;
 
   tdm = (const struct TrailDestroyMessage *) message;
-
-  /* Retreive the trail from the trail_map */
-  trail = GNUNET_CONTAINER_multihashmap_get(trail_map, tdm->trail_id);
-
-  if(peer == trail->pred_id){
-    delete(trail, GNUNET_NO, GNUNET_YES);
-  }
-  else{
-    delete(trail, GNUNET_YES, GNUNET_NO);
-  }
-
+  trail = GNUNET_CONTAINER_multihashmap_get (trail_map,
+                                             &tdm->trail_id);
+  delete_trail (trail,
+                0 != memcmp (peer,
+                             &trail->pred_id,
+                             sizeof (struct GNUNET_PeerIdentity)),
+                0 != memcmp (peer,
+                             &trail->succ_id,
+                             sizeof (struct GNUNET_PeerIdentity)));
   return GNUNET_OK;
 }