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

[gnunet]

Author: arthur
Date: 2015-04-30 14:29:58 +0200 (Thu, 30 Apr 2015)
New Revision: 35694

Modified:
   gnunet/src/dht/gnunet-service-wdht_neighbours.c
Log:
Adding the handle_dht_p2p_trail_destroy function.


Modified: gnunet/src/dht/gnunet-service-wdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-wdht_neighbours.c     2015-04-30 12:25:03 UTC 
(rev 35693)
+++ gnunet/src/dht/gnunet-service-wdht_neighbours.c     2015-04-30 12:29:58 UTC 
(rev 35694)
@@ -1156,18 +1156,20 @@
                              const struct GNUNET_MessageHeader *message)
 {
   const struct TrailDestroyMessage *tdm;
+  struct Trail *trail;
 
   tdm = (const struct TrailDestroyMessage *) message;
 
-  /*
-   * Steps :
-   *  1 check if message comme from a trail (that we still remember...)
-   *  1.a.1 if true: send the destroy message to the rest trail
-   *  1.a.2 clean the trail structure
-   *  1.a.3 did i have to remove the trail and ID from the db structure?
-   *  1.b if false: do nothing
-   */
+  /* 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);
+  }
+
   return GNUNET_OK;
 }
 
@@ -1227,15 +1229,22 @@
                             const struct GNUNET_MessageHeader *message)
 {
   const struct TrailRouteMessage *trm;
+  const void *payload;
+  size_t msize;
+  unsigned int start_payload;
 
-  trm = (const struct TrailRouteMessage *) message;
+  /* msize = ntohs (message->size); */
+  /* if (msize < sizeof (struct TrailRouteMessage)) */
+  /* { */
+  /*   GNUNET_break_op (0); */
+  /*   return GNUNET_YES; */
+  /* } */
 
-  /*
-   * Steps :
-   *  1 check if message comme from a trail
-   *  1.a.1 if trail not finished with us, continue to forward
-   *  1.a.2 otherwise handle body message embedded in trail
-   */
+  /* trm = (const struct TrailRouteMessage *) message; */
+  /* /\* Retreive payload *\/ */
+  /* start_payload = sizeof (struct PeerGetResultMessage); */
+  /* payload = message[start_payload]; */
+
   return GNUNET_OK;
 }