-allow caller ID to differ from zone used for resolution
[oweals/gnunet.git] / src / dht / gnunet-service-xdht_neighbours.c
index fa7aeb98168b6cd22edbd45e6e079e6d19f6fc25..ef19beed8360f8fded8afd93fe39ffbdf1d3dc15 100644 (file)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009-2013 Christian Grothoff (and other contributing authors)
+     (C) 2009-2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
 #include "gnunet_hello_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_protocols.h"
-#include "gnunet_nse_service.h"
 #include "gnunet_ats_service.h"
 #include "gnunet_core_service.h"
 #include "gnunet_datacache_lib.h"
 #include "gnunet_transport_service.h"
-#include "gnunet_hello_lib.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-xdht.h"
 #include "gnunet-service-xdht_clients.h"
 #include "gnunet-service-xdht_datacache.h"
-#include "gnunet-service-xdht_hello.h"
 #include "gnunet-service-xdht_neighbours.h"
-#include "gnunet-service-xdht_nse.h"
 #include "gnunet-service-xdht_routing.h"
 #include <fenv.h>
 #include "dht.h"
 
+/**
+ * Maximum possible fingers (including predecessor) of a peer 
+ */
+#define MAX_FINGERS 65
 
-/*TODO 
- * 1. Remove extra comments - FIXME,TODO,SUPU
- * 2. Use GNUNET_Log to debug
+/**
+ * Maximum allowed number of pending messages per friend peer.
  */
+#define MAXIMUM_PENDING_PER_FRIEND 64
 
 /**
- * Maximum possible fingers of a peer.
+ * How long to wait before sending another find finger trail request
  */
-#define MAX_FINGERS 256
+#define DHT_FIND_FINGER_TRAIL_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
 /**
- * Maximum allowed number of pending messages per friend peer.
+ * How long at most to wait for transmission of a request to another peer?
  */
-#define MAXIMUM_PENDING_PER_FRIEND 64
+#define GET_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+
+/**
+ * Duration for which I may remain congested. 
+ * Note: Its a static value. In future, a peer may do some analysis and calculate 
+ * congestion_timeout based on 'some' parameters. 
+ */
+#define CONGESTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+
+/**
+ * Maximum number of trails allowed to go through a friend.
+ */
+#define TRAILS_THROUGH_FRIEND_THRESHOLD 64
+
+/**
+ * Maximum number of trails stored per finger.
+ */
+#define MAXIMUM_TRAILS_PER_FINGER 2
 
 /**
- * How long at least to wait before sending another find finger trail request.
+ * Finger map index for predecessor entry in finger peermap.
  */
-#define DHT_MINIMUM_FIND_FINGER_TRAIL_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
+#define PREDECESSOR_FINGER_ID 64
 
 /**
- * How long at most to wait before sending another find finger trail request.
+ * Wrap around in peer identity circle. 
+ * FIXME: not used anywhere, should be used in
+ * find_successor() while comparing two peers.
  */
-#define DHT_MAXIMUM_FIND_FINGER_TRAIL_INTERVAL GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 10)
+#define PEER_IDENTITES_WRAP_AROUND pow(2, 64) - 1
 
+/**
+ * To check if a finger is predecessor or not. 
+ */
+enum GDS_NEIGHBOURS_finger_type
+{
+  GDS_FINGER_TYPE_PREDECESSOR = 0,
+  GDS_FINGER_TYPE_NON_PREDECESSOR = 1
+};
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
-/* FIXME:
- * 1) Bloomfilter is not required for X-Vine.
- * Keep the field now but remove it when implementing PUT/GET.
- * 2) also, check the field of put/get/result if all are required for
- * x-vine or not. */
-  
 /**
  * P2P PUT message
  */
@@ -101,7 +122,7 @@ struct PeerPutMessage
   /**
    * Content type.
    */
-  uint32_t type GNUNET_PACKED;
+  uint32_t block_type GNUNET_PACKED;
 
   /**
    * Hop count
@@ -110,6 +131,7 @@ struct PeerPutMessage
 
   /**
    * Replication level for this message
+   * In the current implementation, this value is not used. 
    */
   uint32_t desired_replication_level GNUNET_PACKED;
 
@@ -117,64 +139,133 @@ struct PeerPutMessage
    * Length of the PUT path that follows (if tracked).
    */
   uint32_t put_path_length GNUNET_PACKED;
-
+  
+  /** 
+   * Best known destination (could be my friend or finger) which should
+   * get this message next. 
+   */
+  struct GNUNET_PeerIdentity best_known_destination;
+  
+  /**
+   * In case best_known_destination is a finger, then trail to reach
+   * to that finger. Else its default value is 0. 
+   */
+  struct GNUNET_HashCode intermediate_trail_id;
+  
   /**
    * When does the content expire?
    */
   struct GNUNET_TIME_AbsoluteNBO expiration_time;
+  
+  /**
+   * The key to store the value under.
+   */
+  struct GNUNET_HashCode key GNUNET_PACKED;
+
+  /* put path (if tracked) */
+
+  /* Payload */
+};
 
+/**
+ * P2P GET message
+ */
+struct PeerGetMessage
+{
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_GET
+   */
+  struct GNUNET_MessageHeader header;
+  
   /**
-   * Bloomfilter (for peer identities) to stop circular routes
+   * Processing options
    */
-  char bloomfilter[DHT_BLOOM_SIZE];
+  uint32_t options GNUNET_PACKED;
 
   /**
-   * The key we are storing under.
+   * Desired content type.
+   */
+  uint32_t block_type GNUNET_PACKED;
+  
+  /**
+   * Hop count
+   */
+  uint32_t hop_count GNUNET_PACKED;
+  /**
+   * Desired replication level for this request.
+   * In the current implementation, this value is not used. 
+   */
+  uint32_t desired_replication_level GNUNET_PACKED;
+  
+  /**
+   * Total number of peers in get path. 
+   */
+  unsigned int get_path_length;
+  
+  /**
+   * Best known destination (could be my friend or finger) which should
+   * get this message next. 
+   */
+  struct GNUNET_PeerIdentity best_known_destination;
+  
+  /**
+   * In case best_known_destination is a finger, then trail to reach
+   * to that finger. Else its default value is 0. 
+   */
+  struct GNUNET_HashCode intermediate_trail_id;
+  /**
+   * The key we are looking for.
    */
   struct GNUNET_HashCode key;
-
-  /* put path (if tracked) */
-
-  /* Payload */
+  
+  /* Get path. */
 
 };
 
-
 /**
  * P2P Result message
  */
-struct PeerResultMessage
+struct PeerGetResultMessage
 {
   /**
-   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * Content type.
+   * The type for the data.
    */
   uint32_t type GNUNET_PACKED;
-
+  
   /**
-   * Length of the PUT path that follows (if tracked).
+   * Number of peers recorded in the outgoing path from source to the
+   * stored location of this message.
    */
   uint32_t put_path_length GNUNET_PACKED;
-
+  
   /**
    * Length of the GET path that follows (if tracked).
    */
   uint32_t get_path_length GNUNET_PACKED;
-
+  
+  /**
+   * Peer which queried for get and should get the result. 
+   */
+  struct GNUNET_PeerIdentity querying_peer;
+  
   /**
    * When does the content expire?
    */
-  struct GNUNET_TIME_AbsoluteNBO expiration_time;
+  struct GNUNET_TIME_Absolute expiration_time;
 
   /**
    * The key of the corresponding GET request.
    */
   struct GNUNET_HashCode key;
-
   /* put path (if tracked) */
 
   /* get path (if tracked) */
@@ -183,316 +274,606 @@ struct PeerResultMessage
 
 };
 
-
 /**
- * P2P GET message
+ * P2P Trail setup message
  */
-struct PeerGetMessage
+struct PeerTrailSetupMessage
 {
   /**
-   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_GET
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP
    */
   struct GNUNET_MessageHeader header;
+  
+  /**
+   * Is source_peer trying to setup the trail to any finger or predecessor.
+   */
+  uint32_t is_predecessor; 
+  
+  /**
+   * Peer closest to this value will be our finger.
+   */
+  uint64_t ultimate_destination_finger_value;
 
   /**
-   * Processing options
+   * Source peer which wants to setup the trail to one of its finger.
    */
-  uint32_t options GNUNET_PACKED;
+  struct GNUNET_PeerIdentity source_peer;
 
   /**
-   * Desired content type.
+   * Best known destination (could be my friend or finger) which should
+   * get this message next. 
    */
-  uint32_t type GNUNET_PACKED;
+  struct GNUNET_PeerIdentity best_known_destination; 
 
   /**
-   * Hop count
+   * Trail id of any intermediate trail we may encounter while doing trail setup.
    */
-  uint32_t hop_count GNUNET_PACKED;
+  struct GNUNET_HashCode intermediate_trail_id;
+  
+  /**
+   * Trail id for trail which we are trying to setup.
+   */
+  struct GNUNET_HashCode trail_id; 
+
+  /* List of peers which are part of trail setup so far.
+   * Trail does NOT include source_peer and peer which will be closest to
+   * ultimate_destination_finger_value.
+   * struct GNUNET_PeerIdentity trail_list[]
+   */
+};
+
+/**
+  * P2P Trail Setup Result message
+ */
+struct PeerTrailSetupResultMessage
+{
 
   /**
-   * Desired replication level for this request.
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT
    */
-  uint32_t desired_replication_level GNUNET_PACKED;
+  struct GNUNET_MessageHeader header;
 
   /**
-   * Size of the extended query.
+   * Finger to which we have found the path.
    */
-  uint32_t xquery_size;
+  struct GNUNET_PeerIdentity finger_identity;
 
   /**
-   * Bloomfilter mutator.
+   * Peer which started trail_setup to find trail to finger_identity
    */
-  uint32_t bf_mutator;
+  struct GNUNET_PeerIdentity querying_peer; 
 
   /**
-   * Bloomfilter (for peer identities) to stop circular routes
+   * Is the trail setup to querying_peer's predecessor or finger?
    */
-  char bloomfilter[DHT_BLOOM_SIZE];
+  uint32_t is_predecessor; 
 
   /**
-   * The key we are looking for.
+   * Value to which finger_identity is the closest peer. 
    */
-  struct GNUNET_HashCode key;
+  uint64_t ulitmate_destination_finger_value;
+  
+  /**
+   * Identifier of the trail from querying peer to finger_identity, NOT
+   * including both endpoints. 
+   */
+  struct GNUNET_HashCode trail_id;
 
+  /* List of peers which are part of the trail from querying peer to 
+   * finger_identity, NOT including both endpoints.
+   * struct GNUNET_PeerIdentity trail[] 
+   */
 };
 
-
 /**
- * FIXME: I have defined this struct between GNUNET_NETWORK_STRUCT_BEGIN. Is
- * it correct? Also, I am using the same struct inside finger info and trailsetup
- * trailsetupresult message. Is it correct? Verify while testing. */
- /**
-  * Linked List of peers which are part of trail to reach a particular Finger.
-  */
-struct TrailPeerList
+ * P2P Verify Successor Message.
+ */
+struct PeerVerifySuccessorMessage
 {
-   /**
-   * Pointer to next item in the list
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR
    */
-   struct TrailPeerList *next;
+  struct GNUNET_MessageHeader header;
 
-   /**
-   * Pointer to previous item in the list
+  /**
+   * Peer which wants to verify its successor.
    */
-   struct TrailPeerList *prev;
-   
-   /**
-    * An element in this trail list
-    */
-   struct GNUNET_PeerIdentity *peer;
-  
-};
+  struct GNUNET_PeerIdentity source_peer;
+
+  /**
+   * Source Peer's current successor.
+   */
+  struct GNUNET_PeerIdentity successor;
 
+  /**
+   * Identifier of trail to reach from source_peer to successor.
+   */
+  struct GNUNET_HashCode trail_id;
+
+  /* List of the peers which are part of trail to reach  from source_peer 
+   * to successor, NOT including them
+   * struct GNUNET_PeerIdentity trail[] 
+   */
+};
 
 /**
- * FIXME : I am using the same struct TrailPeerList in both finger info
- * and peertrailsetupmessage. Verify if its okay.
- * P2P Trail setup message
+ * FIXME: In case you append the trail it may contain the same peer twice.
+ * So, when you call search_my_index it can return error. Solution is while
+ * appending the entry first check for duplicate entries or may be don't
+ * send the current_predecessor at all. 
+ * P2P Verify Successor Result Message
  */
-struct PeerTrailSetupMessage
+struct PeerVerifySuccessorResultMessage
 {
   /**
-   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * Source peer which wants to find trail to one of its finger. 
+   * Peer which sent the request to verify its successor.
    */
-  struct GNUNET_PeerIdentity *source_peer;
+  struct GNUNET_PeerIdentity querying_peer;
 
   /**
-   * Finger id to which we want to set up the trail to. 
+   * Successor to which PeerVerifySuccessorMessage was sent.
    */
-  struct GNUNET_PeerIdentity *destination_finger;
+  struct GNUNET_PeerIdentity source_successor;
 
   /**
-   * This field contains the peer to which this packet is forwarded.
+   * Current Predecessor of source_successor. It can be same as querying peer
+   * or different.
    */
-  struct GNUNET_PeerIdentity *current_destination;
+  struct GNUNET_PeerIdentity current_predecessor;
+
   /**
-   * Head of trail list.
+   * Trail identifier of trail from querying_peer to source_successor.
    */
-  struct TrailPeerList *head;
-  
+  struct GNUNET_HashCode trail_id;
+
   /**
-   * Tail of trail list.
+   * Direction in which we are looking at the trail.
    */
-  struct TrailPeerList *tail;
-  
-};
+  uint32_t trail_direction;
 
+  /* In case current_predecessor != querying_peer, then trail to reach from
+   * querying_peer to current_predecessor, NOT including end points.
+   * struct GNUNET_PeerIdentity trail[]
+   */
+};
 
 /**
- * P2P Trail setup Result message
+ * P2P Notify New Successor Message.
  */
-struct PeerTrailSetupResultMessage
+struct PeerNotifyNewSuccessorMessage
 {
   /**
-   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_RESULT_SETUP
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR
    */
   struct GNUNET_MessageHeader header;
-  
-  /**
-   * Finger to which we have found the path. 
-   */
-  struct GNUNET_PeerIdentity *finger;
 
   /**
-   * Peer which was looking for the trail to finger. 
+   * Peer which wants to notify its new successor.
    */
-  struct GNUNET_PeerIdentity *destination_peer;
+  struct GNUNET_PeerIdentity source_peer;
 
   /**
-   * This field contains the peer to which this packet is forwarded.
+   * New successor of source_peer.
    */
-  struct GNUNET_PeerIdentity *current_destination;
-  
+  struct GNUNET_PeerIdentity new_successor;
+
   /**
-   * Head of trail list.
+   * Unique identifier of the trail from source_peer to new_successor,
+   * NOT including the endpoints.
    */
-  struct TrailPeerList *head;
-  
-  /**
-   * Tail of trail list.
+  struct GNUNET_HashCode trail_id;
+
+  /* List of peers in trail from source_peer to new_successor, 
+   * NOT including the endpoints. 
+   * struct GNUNET_PeerIdentity trail[]
    */
-  struct TrailPeerList *tail;
-  
 };
 
-GNUNET_NETWORK_STRUCT_END
-
-
 /**
- * Linked list of messages to send to a particular other peer.
+ * FIXME: Check if you can merge trail compression and trail teardown
+ * by modifying routing table structure a little bit. PRIORITY: at the end
+ * less code. 
+ * P2P Trail Compression Message.
  */
-struct P2PPendingMessage
+struct PeerTrailCompressionMessage
 {
   /**
-   * Pointer to next item in the list
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_COMPRESSION
    */
-  struct P2PPendingMessage *next;
+  struct GNUNET_MessageHeader header;
 
   /**
-   * Pointer to previous item in the list
+   * Source peer of this trail.
    */
-  struct P2PPendingMessage *prev;
+  struct GNUNET_PeerIdentity source_peer;
 
   /**
-   * When does this message time out?
+   * Destination of this trail.
    */
-  struct GNUNET_TIME_Absolute timeout;
+  struct GNUNET_PeerIdentity destination_peer;
 
-   /**
-   * Message importance level.  FIXME: used? useful?
+  /**
+   * Trail from source_peer to destination_peer compressed such that
+   * new_first_friend is the first hop in the trail from source to
+   * destination.
    */
-  unsigned int importance;
+  struct GNUNET_PeerIdentity new_first_friend;
 
   /**
-   * Actual message to be sent, allocated at the end of the struct:
-   * // msg = (cast) &pm[1];
-   * // memcpy (&pm[1], data, len);
+   * Unique identifier of trail.
    */
-  const struct GNUNET_MessageHeader *msg;
-
+  struct GNUNET_HashCode trail_id;
 };
 
+
 /**
- *  Entry in friend_peers map.
+ * P2P Trail Tear Down message.
  */
-struct FriendInfo
+struct PeerTrailTearDownMessage
 {
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN
+   */
+  struct GNUNET_MessageHeader header;
 
- /**
-  * What is the identity of the peer?
-  */
-  struct GNUNET_PeerIdentity id;
-
- /**
-  * Count of outstanding messages for peer.
-  */
- unsigned int pending_count;
+  /**
+   * Source peer of the trail.
+   */
+  struct GNUNET_PeerIdentity source_peer;
 
- /**
-  * Head of pending messages to be sent to this peer.
-  */
struct P2PPendingMessage *head;
 /**
+   * Destination peer of the trail.
+   */
 struct GNUNET_PeerIdentity destination_peer;
 
- /**
-  * Tail of pending messages to be sent to this peer.
-  */
- struct P2PPendingMessage *tail;
- /**
-  * TODO - How and where to use this?
-  * Core handle for sending messages to this peer.
-  */
- struct GNUNET_CORE_TransmitHandle *th;
+  /**
+   * Unique identifier of the trail.
+   */
+  struct GNUNET_HashCode TRAIL_ID;
 
+  /**
+   * Direction of trail.
+   */
+  uint32_t trail_direction;
 };
 
+
 /**
- * Entry in finger_peers map.
+ * P2P Trail Rejection Message.
  */
-struct FingerInfo
+struct PeerTrailRejectionMessage
 {
   /**
-   * What is the identity of the finger peer?
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_REJECTION
    */
-  struct GNUNET_PeerIdentity id;
-  
+  struct GNUNET_MessageHeader header;
+
   /**
-   * Start of the interval of keys for which this finger is responsible.
+   * Peer which wants to set up the trail.
    */
-  unsigned int interval_start;
+  struct GNUNET_PeerIdentity source_peer;
 
   /**
-   * End of the interval of keys for which this finger is responsible.
+   * Peer which sent trail rejection message as it it congested. 
    */
-  unsigned int interval_end;
+  struct GNUNET_PeerIdentity congested_peer;
 
   /**
-   * Head of trail list.
+   * Peer identity closest to this value will be finger of
+   * source_peer.
    */
-  struct TrailPeerList *head;
+  uint64_t ultimate_destination_finger_value;
 
   /**
-   * Tail of trail list.
+   * Is source_peer trying to setup the trail to its predecessor or finger.
    */
-  struct TrailPeerList *tail;
-  
-};
+  uint32_t is_predecessor;
 
+  /**
+   * Identifier for the trail that source peer is trying to setup.
+   */
+  struct GNUNET_HashCode trail_id;
+  
+  /**
+   * Relative time for which congested_peer will remain congested.
+   */
+  struct GNUNET_TIME_Relative congestion_time;
 
-/**
* Task that sends FIND FINGER TRAIL requests.
- */
-static GNUNET_SCHEDULER_TaskIdentifier find_finger_trail_task;
+  /* Trail_list from source_peer to peer which sent the message for trail setup
  * to congested peer. This trail does NOT include source_peer.
  struct GNUNET_PeerIdnetity trail[]*/
+};
 
 /**
- * Identity of this peer.
+ * P2P Add Trail Message.
  */
-static struct GNUNET_PeerIdentity my_identity;
+struct PeerAddTrailMessage
+{
+  /**
+   * Type: #GNUNET_MESSAGE_TYPE_DHT_P2P_ADD_TRAIL
+   */
+  struct GNUNET_MessageHeader header;
 
-/**
- * FIXME: Not used anywhere in the code yet. 
- * Hash of the identity of this peer.
- */
-static struct GNUNET_HashCode my_identity_hash;
+  /**
+   * Source of the routing trail.
+   */
+  struct GNUNET_PeerIdentity source_peer;
 
-/**
- * Hash map of all the friends of a peer
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *friend_peers;
+  /**
+   * Destination of the routing trail.
  */
+  struct GNUNET_PeerIdentity destination_peer;
 
-/**
- * Hash map of all the fingers of a peer
- */
-static struct GNUNET_CONTAINER_MultiPeerMap *finger_peers;
+  /**
+   * Unique identifier of the trail from source_peer to destination_peer,
+   * NOT including the endpoints.
+   */
+  struct GNUNET_HashCode trail_id;
 
-/**
- * TODO: Ask whats the use of ATS.
- * Handle to ATS.
- */
-static struct GNUNET_ATS_PerformanceHandle *atsAPI;
+  /* Trail from source peer to destination peer, NOT including them.
+   * struct GNUNET_PeerIdentity trail[]
+   */
+};
 
-/**
- * Handle to CORE.
- */
-static struct GNUNET_CORE_Handle *core_api;
+GNUNET_NETWORK_STRUCT_END
 
 /**
- * The current finger index that we have found trail to.
+ * Linked list of messages to send to a particular other peer.
  */
-static unsigned int current_finger_id;
+struct P2PPendingMessage
+{
+  /**
+   * Pointer to next item in the list
+   */
+  struct P2PPendingMessage *next;
+
+  /**
+   * Pointer to previous item in the list
+   */
+  struct P2PPendingMessage *prev;
+
+  /**
+   * Message importance level.  FIXME: used? useful?
+   */
+  unsigned int importance;
+
+  /**
+   * When does this message time out?
+   */
+  struct GNUNET_TIME_Absolute timeout;
+
+  /**
+   * Actual message to be sent, allocated at the end of the struct:
+   * // msg = (cast) &pm[1];
+   * // memcpy (&pm[1], data, len);
+   */
+  const struct GNUNET_MessageHeader *msg;
+
+};
+
+
+/**
+ *  Entry in friend_peermap.
+ */
+struct FriendInfo
+{
+  /**
+   * Friend Identity
+   */
+  struct GNUNET_PeerIdentity id;
+
+  /**
+   * Number of trails for which this friend is the first hop or if the friend
+   * is finger. 
+   */
+  unsigned int trails_count;
+
+  /**
+   * Count of outstanding messages for this friend.
+   */
+  unsigned int pending_count;
+
+  /**
+   * In case not 0, then amount of time for which this friend is congested.
+   */
+  struct GNUNET_TIME_Absolute congestion_timestamp;
+
+  /**
+   * Head of pending messages to be sent to this friend.
+   */
+  struct P2PPendingMessage *head;
+
+  /**
+   * Tail of pending messages to be sent to this friend.
+   */
+  struct P2PPendingMessage *tail;
+
+  /**
+   * Core handle for sending messages to this friend.
+   */
+  struct GNUNET_CORE_TransmitHandle *th;
+
+};
+
+/**
+ * An individual element of the trail to reach to a finger.
+ */
+struct Trail_Element 
+{
+  /**
+    * Pointer to next item in the list
+    */
+  struct Trail_Element *next;
+
+  /**
+    * Pointer to prev item in the list
+    */
+  struct Trail_Element *prev;
+
+  /**
+   * An element in this trail.
+   */
+  struct GNUNET_PeerIdentity peer;
+};
+
+/**
+ * FIXME: removed first_friend_trails_count, need to write a function
+ * to calculate each time we need it. Else, keep a pointer to first
+ * friend of in the trail. 
+ * Information about an individual trail. 
+ */
+struct Trail 
+{
+  /**
+   * Head of trail.
+   */
+  struct Trail_Element *trail_head;
+
+  /**
+   * Tail of trail.
+   */
+  struct Trail_Element *trail_tail;
+
+  /**
+   * Unique identifier of this trail.
+   */
+  struct GNUNET_HashCode trail_id;
+
+  /**
+   * Length of trail pointed
+   */
+  unsigned int trail_length;
+};
+
+/**
+ * An entry in finger_hashmap.
+ */
+struct FingerInfo
+{
+  /**
+   * Finger identity.
+   */
+  struct GNUNET_PeerIdentity finger_identity;
+
+  /**
+   * Index in finger peer map
+   */
+  uint32_t finger_map_index;
+
+  /**
+   * Number of trails setup so far for this finger.
+   * Should not cross MAXIMUM_TRAILS_PER_FINGER.
+   */
+  uint32_t trails_count;
+
+  /**
+   * Array of trails to reach to this finger.
+   */
+  struct Trail trail_list[MAXIMUM_TRAILS_PER_FINGER]; 
+};
+
+/**
+ * FIXME: Need to check if we need all the fields or not. 
+ * Data structure to keep track of closest peer seen so far in find_successor()
+ */
+struct Closest_Peer
+{
+  /**
+   * 64 bit value of the peer
+   */
+  uint64_t value;
+
+  /**
+   * Trail id to reach to peer.
+   */
+  struct GNUNET_HashCode trail_id;
+
+  /**
+   * FIXME: see the usage of this field and write comment. 
+   */
+  struct GNUNET_PeerIdentity next_hop;
+
+  /**
+   * Next destination. In case of friend and my_identity , it is same as next_hop
+   * In case of finger it is finger identity.
+   */
+  struct GNUNET_PeerIdentity best_known_destination;
+};
+
+/**
+ * FIXME: now I have removed the first_friend_trail_count,
+ * Need to update the code to find the count.
+ * Data structure to store the trail chosen to reach to finger.
+ */
+struct Selected_Finger_Trail
+{
+  /**
+   * First friend in the trail to reach finger.
+   */
+  struct FriendInfo friend;
+
+  /**
+   * Identifier of this trail.
+   */
+  struct GNUNET_HashCode trail_id;
+
+  /**
+   * Total number of peers in this trail.
+   */
+  unsigned int trail_length;
+};
+
+/**
+ * Task that sends FIND FINGER TRAIL requests. This task is started when we have
+ * get our first friend.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier find_finger_trail_task;
+
+/**
+ * Identity of this peer.
+ */
+static struct GNUNET_PeerIdentity my_identity;
+
+/**
+ * Peer map of all the friends of a peer
+ */
+static struct GNUNET_CONTAINER_MultiPeerMap *friend_peermap;
+
+/**
+ * Hash map of all the fingers of a peer
+ */
+static struct GNUNET_CONTAINER_MultiHashMap32 *finger_hashmap;
+
+/**
+ * FIXME: Check if you can replace finger_hashmap by an array of fingers. 
+ * Array of all the fingers. 
+ *
+static struct FingerInfo finger_table [MAX_FINGERS];*/
+
+/**
+ * Handle to CORE.
+ */
+static struct GNUNET_CORE_Handle *core_api;
+
+/**
+ * The current finger index that we have want to find trail to. We start the
+ * search with value = 0, i.e. successor  and then go to PREDCESSOR_FINGER_ID
+ * and decrement it. For any index 63 <= index < 0, if finger is same as successor,
+ * we reset this index to 0.
+ */
+static unsigned int current_search_finger_index;
 
 
 /**
  * Called when core is ready to send a message we asked for
- * out to the destination. 
- * 
- * @param cls the 'struct FriendInfo' of the target friend peer
+ * out to the destination.
+ *
+ * @param cls the 'struct FriendInfo' of the target friend
  * @param size number of bytes available in buf
  * @param buf where the callee should write the message
  * @return number of bytes written to buf
@@ -514,16 +895,16 @@ core_transmit_notify (void *cls, size_t size, void *buf)
     GNUNET_CONTAINER_DLL_remove (peer->head, peer->tail, pending);
     GNUNET_free (pending);
   }
-  if (pending == NULL)
+  if (NULL == pending)
   {
     /* no messages pending */
     return 0;
   }
-  if (buf == NULL)
+  if (NULL == buf)
   {
     peer->th =
         GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO,
-                                           pending->importance,
+                                           GNUNET_CORE_PRIO_BEST_EFFORT,
                                            GNUNET_TIME_absolute_get_remaining
                                            (pending->timeout), &peer->id,
                                            ntohs (pending->msg->size),
@@ -549,12 +930,13 @@ core_transmit_notify (void *cls, size_t size, void *buf)
   {
     peer->th =
         GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO,
-                                           pending->importance,
+                                           GNUNET_CORE_PRIO_BEST_EFFORT,
                                            GNUNET_TIME_absolute_get_remaining
                                            (pending->timeout), &peer->id, msize,
                                            &core_transmit_notify, peer);
     GNUNET_break (NULL != peer->th);
   }
+
   return off;
 }
 
@@ -573,13 +955,12 @@ process_friend_queue (struct FriendInfo *peer)
     return;
   if (NULL != peer->th)
     return;
+
   GNUNET_STATISTICS_update (GDS_stats,
                             gettext_noop
                             ("# Bytes of bandwidth requested from core"),
                             ntohs (pending->msg->size), GNUNET_NO);
-  
-  /*FIXME : here I don't know the use of importance, time out
-    Will check at run time if its all correct. */
+
   peer->th =
       GNUNET_CORE_notify_transmit_ready (core_api, GNUNET_NO,
                                          pending->importance,
@@ -592,827 +973,3592 @@ process_friend_queue (struct FriendInfo *peer)
 
 
 /**
- * FIXME: Check the parameters. 
- * Set up the trial message and forwards this message to friend. 
- * 
- * @param Finger id to which we want to setup the trail.
- * @param Friend id through which we will try to setup the trail.
+ * Construct a trail setup message and forward it to target_friend
+ * @param source_peer Peer which wants to setup the trail
+ * @param ultimate_destination_finger_value Peer identity closest to this value 
+ *                                          will be finger to @a source_peer
+ * @param best_known_destination Best known destination (could be finger or friend)
+ *                               which should get this message.
+ * @param target_friend Friend to which message is forwarded now.
+ * @param trail_length Total number of peers in trail setup so far.
+ * @param trail_peer_list Trail setup so far
+ * @param is_predecessor Is source_peer looking for trail to a predecessor or not.
+ * @param trail_id Unique identifier for the trail we are trying to setup.
+ * @param intermediate_trail_id Trail id of intermediate trail to reach to 
+ *                              best_known_destination when its a finger. If not 
+ *                              used then set to 0.
  */
 void
-GDS_NEIGHBOURS_trail_setup(struct GNUNET_PeerIdentity *finger_id,
-                                  struct FriendInfo *target_friend)
+GDS_NEIGHBOURS_send_trail_setup (struct GNUNET_PeerIdentity source_peer,
+                                 uint64_t ultimate_destination_finger_value,
+                                 struct GNUNET_PeerIdentity best_known_destination,
+                                 struct FriendInfo *target_friend,
+                                 unsigned int trail_length,
+                                 const struct GNUNET_PeerIdentity *trail_peer_list,
+                                 unsigned int is_predecessor,
+                                 struct GNUNET_HashCode trail_id,
+                                 struct GNUNET_HashCode *intermediate_trail_id)
 {
-  /*
-  * FIXME: check if pending message actually contains the correct data.
-  */
   struct P2PPendingMessage *pending;
-  /* FIXME: why I have defined as **? verify by testing. */
   struct PeerTrailSetupMessage *tsm;
-  
+  struct GNUNET_PeerIdentity *peer_list;
+  size_t msize;
+
+  msize = sizeof (struct PeerTrailSetupMessage) +
+          (trail_length * sizeof (struct GNUNET_PeerIdentity));
+
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
   if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
   {
     GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
                                1, GNUNET_NO);
   }
-  
-  /* SUPU: Verify if this copy between pending message, tsm is correct? */
-  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage));
-  /*SUPU: What does this code do? Does this initialize pending with
-   values of tsm? */
+
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
   tsm = (struct PeerTrailSetupMessage *) &pending[1];
   pending->msg = &tsm->header;
+  tsm->header.size = htons (msize);
   tsm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP);
-  tsm->destination_finger = finger_id;
-  tsm->source_peer = &my_identity;
+  tsm->ultimate_destination_finger_value = GNUNET_htonll (ultimate_destination_finger_value);
+  tsm->source_peer = source_peer;
+  tsm->best_known_destination = best_known_destination;
+  tsm->is_predecessor = htonl (is_predecessor);
+  tsm->trail_id = trail_id;
+  
+  if (NULL == intermediate_trail_id)
+    memset (&tsm->intermediate_trail_id, 0, sizeof (tsm->intermediate_trail_id));
+  else
+    tsm->intermediate_trail_id = *intermediate_trail_id;
+  
+  if (trail_length > 0)
+  {
+    peer_list = (struct GNUNET_PeerIdentity *) &tsm[1];
+    memcpy (peer_list, trail_peer_list, trail_length * sizeof(struct GNUNET_PeerIdentity));
+  }
+
   GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
   target_friend->pending_count++;
-  process_friend_queue(target_friend);
+  process_friend_queue (target_friend);
 }
 
 
-/**FIXME: Old implementation just to remove error
- * TODO: Modify this function to handle our get request. 
- * Perform a GET operation.  Forwards the given request to other
- * peers.  Does not lookup the key locally.  May do nothing if this is
- * the only peer in the network (or if we are the closest peer in the
- * network).
- *
- * @param type type of the block
- * @param options routing options
- * @param desired_replication_level desired replication count
- * @param hop_count how many hops did this request traverse so far?
- * @param key key for the content
- * @param xquery extended query
- * @param xquery_size number of bytes in @a xquery
- * @param reply_bf bloomfilter to filter duplicates
- * @param reply_bf_mutator mutator for @a reply_bf
- * @param peer_bf filter for peers not to select (again)
+/**
+ * Construct a trail setup result message and forward it to target friend.
+ * @param querying_peer Peer which sent the trail setup request and should get
+ *                      the result back. 
+ * @param Finger Peer to which the trail has been setup to.
+ * @param target_friend Friend to which this message should be forwarded.
+ * @param trail_length Numbers of peers in the trail.
+ * @param trail_peer_list Peers which are part of the trail from q
+ *                        querying_peer to Finger, NOT including them. 
+ * @param is_predecessor Is @a Finger predecessor to @a querying_peer
+ * @param ultimate_destination_finger_value Value to which @a finger is the closest
+ *                                          peer. 
+ * @param trail_id Unique identifier of the trail.
  */
 void
-GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type,
-                           enum GNUNET_DHT_RouteOption options,
-                           uint32_t desired_replication_level,
-                           uint32_t hop_count, const struct GNUNET_HashCode * key,
-                           const void *xquery, size_t xquery_size,
-                           const struct GNUNET_CONTAINER_BloomFilter *reply_bf,
-                           uint32_t reply_bf_mutator,
-                           struct GNUNET_CONTAINER_BloomFilter *peer_bf)
+GDS_NEIGHBOURS_send_trail_setup_result (struct GNUNET_PeerIdentity querying_peer,
+                                        struct GNUNET_PeerIdentity finger,
+                                        struct FriendInfo *target_friend,
+                                        unsigned int trail_length,
+                                        const struct GNUNET_PeerIdentity *trail_peer_list,
+                                        unsigned int is_predecessor,
+                                        uint64_t ultimate_destination_finger_value,
+                                        struct GNUNET_HashCode trail_id)
 {
+  struct P2PPendingMessage *pending;
+  struct PeerTrailSetupResultMessage *tsrm;
+  struct GNUNET_PeerIdentity *peer_list;
+  size_t msize;
+
+  msize = sizeof (struct PeerTrailSetupResultMessage) +
+          (trail_length * sizeof (struct GNUNET_PeerIdentity));
+
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+  {
+    GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+                               1, GNUNET_NO);
+  }
 
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+  tsrm = (struct PeerTrailSetupResultMessage *) &pending[1];
+  pending->msg = &tsrm->header;
+  tsrm->header.size = htons (msize);
+  tsrm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT);
+  tsrm->querying_peer = querying_peer;
+  tsrm->finger_identity = finger;
+  tsrm->is_predecessor = htonl (is_predecessor);
+  tsrm->trail_id = trail_id;
+  tsrm->ulitmate_destination_finger_value = 
+          GNUNET_htonll (ultimate_destination_finger_value);
+  peer_list = (struct GNUNET_PeerIdentity *) &tsrm[1];
+  if (trail_length > 0)
+  {
+    memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
+  }
+  /* Send the message to chosen friend. */
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
 }
 
-/**FIXME: Old implementation just to remove error.
- * TODO: Modify this function to handle our put request. 
- * Perform a PUT operation.   Forwards the given request to other
- * peers.   Does not store the data locally.  Does not give the
- * data to local clients.  May do nothing if this is the only
- * peer in the network (or if we are the closest peer in the
- * network).
- *
- * @param type type of the block
- * @param options routing options
- * @param desired_replication_level desired replication count
- * @param expiration_time when does the content expire
- * @param hop_count how many hops has this message traversed so far
- * @param bf Bloom filter of peers this PUT has already traversed
- * @param key key for the content
- * @param put_path_length number of entries in @a put_path
- * @param put_path peers this request has traversed so far (if tracked)
- * @param data payload to store
- * @param data_size number of bytes in @a data
+
+/**
+ * Send trail rejection message to next_hop
+ * @param source_peer Peer which is trying to setup the trail.
+ * @param ultimate_destination_finger_value Peer closest to this value will be 
+ *                                          @a source_peer's finger
+ * @param congested_peer Peer which sent this message as it is congested.
+ * @param is_predecessor Is source_peer looking for trail to a predecessor or not.
+ * @param trail_peer_list Trails seen so far in trail setup before getting rejected
+ *                        by congested_peer. This does not include @a source_peer
+ * @param trail_length Total number of peers in trail_peer_list, not including
+ *                     @a source_peer
+ * @param trail_id Unique identifier of this trail.
+ * @param congestion_timeout Duration given by congested peer as an estimate of
+ *                           how long it may remain congested.
  */
 void
-GDS_NEIGHBOURS_handle_put (enum GNUNET_BLOCK_Type type,
-                           enum GNUNET_DHT_RouteOption options,
-                           uint32_t desired_replication_level,
-                           struct GNUNET_TIME_Absolute expiration_time,
-                           uint32_t hop_count,
-                           struct GNUNET_CONTAINER_BloomFilter *bf,
-                           const struct GNUNET_HashCode *key,
-                           unsigned int put_path_length,
-                           struct GNUNET_PeerIdentity *put_path,
-                           const void *data, size_t data_size)
+GDS_NEIGHBOURS_send_trail_rejection (struct GNUNET_PeerIdentity source_peer,
+                                     uint64_t ultimate_destination_finger_value,
+                                     struct GNUNET_PeerIdentity congested_peer,
+                                     unsigned int is_predecessor,
+                                     const struct GNUNET_PeerIdentity *trail_peer_list,
+                                     unsigned int trail_length,
+                                     struct GNUNET_HashCode trail_id,
+                                     struct FriendInfo *target_friend,
+                                     const struct GNUNET_TIME_Relative congestion_timeout)
 {
+  struct PeerTrailRejectionMessage *trm;
+  struct P2PPendingMessage *pending;
+  struct GNUNET_PeerIdentity *peer_list;
+  size_t msize;
 
+  msize = sizeof (struct PeerTrailRejectionMessage) +
+          (trail_length * sizeof (struct GNUNET_PeerIdentity));
+
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+  {
+    GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+                               1, GNUNET_NO);
+  }
+
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+  trm = (struct PeerTrailRejectionMessage *)&pending[1];
+  pending->msg = &trm->header;
+  trm->header.size = htons (msize);
+  trm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_REJECTION);
+  trm->source_peer = source_peer;
+  trm->congested_peer = congested_peer;
+  trm->congestion_time = congestion_timeout;
+  trm->is_predecessor = htonl (is_predecessor);
+  trm->trail_id = trail_id;
+  trm->ultimate_destination_finger_value = GNUNET_htonll (ultimate_destination_finger_value);
+
+  peer_list = (struct GNUNET_PeerIdentity *) &trm[1];
+  if (trail_length > 0)
+  {
+    memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
+  }
+  
+  /* Send the message to chosen friend. */
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
 }
 
 
-/**FIXME: Old implementation just to remove error.
- * Handle a reply (route to origin).  Only forwards the reply back to
- * other peers waiting for it.  Does not do local caching or
- * forwarding to local clients.
- *
- * @param target neighbour that should receive the block (if still connected)
- * @param type type of the block
- * @param expiration_time when does the content expire
- * @param key key for the content
- * @param put_path_length number of entries in put_path
- * @param put_path peers the original PUT traversed (if tracked)
- * @param get_path_length number of entries in put_path
- * @param get_path peers this reply has traversed so far (if tracked)
- * @param data payload of the reply
- * @param data_size number of bytes in data
+/**
+ * Construct a verify successor message and forward it to target_friend.
+ * @param source_peer Peer which wants to verify its successor.
+ * @param successor Peer which is @a source_peer's current successor.
+ * @param trail_id Unique Identifier of trail from @a source_peer to @a successor,
+ *                 NOT including them. 
+ * @param trail List of peers which are part of trail to reach from @a source_peer
+ *              to @a successor, NOT including them. 
+ * @param trail_length Total number of peers in @a trail.
+ * @param target_friend Next friend to get this message. 
  */
 void
-GDS_NEIGHBOURS_handle_reply (const struct GNUNET_PeerIdentity *target,
-                             enum GNUNET_BLOCK_Type type,
-                             struct GNUNET_TIME_Absolute expiration_time,
-                             const struct GNUNET_HashCode * key,
-                             unsigned int put_path_length,
-                             const struct GNUNET_PeerIdentity *put_path,
-                             unsigned int get_path_length,
-                             const struct GNUNET_PeerIdentity *get_path,
-                             const void *data, size_t data_size)
+GDS_NEIGHBOURS_send_verify_successor_message (struct GNUNET_PeerIdentity source_peer,
+                                              struct GNUNET_PeerIdentity successor,
+                                              const struct GNUNET_HashCode trail_id,
+                                              struct GNUNET_PeerIdentity *trail,
+                                              unsigned int trail_length,
+                                              struct FriendInfo *target_friend)
 {
-    
-}
+  struct PeerVerifySuccessorMessage *vsm;
+  struct P2PPendingMessage *pending;
+  struct GNUNET_PeerIdentity *peer_list;
+  size_t msize;
 
+  msize = sizeof (struct PeerVerifySuccessorMessage);
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
 
-/**
- * SUPU: Check again. 
- * I have written a code where 
- * 1. I choose a random index from 0 to current size of my map.
- * 2. Create an iterator.
- * 3. set the iterator value to the current index id.
- * 4. get the element stored at that index id.
- * 5. return the index to calling function.
- * I have not yet tested this function and I am not sure if its correct. 
- * Randomly choose one of your friends from the friends_peer map
- * @return Friend
- */
-static struct FriendInfo *
-get_random_friend()
-{  
-  unsigned int current_size;
-  unsigned int *index; 
-  unsigned int j = 0;
-  struct GNUNET_CONTAINER_MultiPeerMapIterator *iter;
-  struct GNUNET_PeerIdentity key_ret;
-  struct FriendInfo *friend;
-  
-  current_size = GNUNET_CONTAINER_multipeermap_size(friend_peers);
-  
-  /* Element stored at this index in friend_peers map should be chosen friend. */
-  index = GNUNET_CRYPTO_random_permute (GNUNET_CRYPTO_QUALITY_WEAK, current_size);
-  
-  /* Create an iterator for friend_peers map. */
-  iter = GNUNET_CONTAINER_multipeermap_iterator_create(friend_peers);
-  
-  /* Set the position of iterator to index. */
-  while(j < (*index))
+  if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
   {
-    if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next(iter,NULL,NULL))
-      j++;
-    else 
-      return NULL;
-  }  
+    GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+                               1, GNUNET_NO);
+  }
+
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;    /* FIXME */
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+  vsm = (struct PeerVerifySuccessorMessage *) &pending[1];
+  pending->msg = &vsm->header;
+  vsm->header.size = htons (msize);
+  vsm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR);
+  vsm->source_peer = source_peer;
+  vsm->successor = successor;
+  vsm->trail_id = trail_id;
   
-  if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next(iter,&key_ret,(const void **)&friend))
+  if (trail_length > 0)
   {
-    return friend;
+    peer_list = (struct GNUNET_PeerIdentity *) &vsm[1];
+    memcpy (peer_list, trail, trail_length * sizeof (struct GNUNET_PeerIdentity));
   }
 
-  return NULL;
+  /* Send the message to chosen friend. */
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
 }
 
 
 /**
- * TODO: Check the logic of using current_finger_id again. 
- * This code is not correct. I need to check the pointers and 
- * correct use of memcpy and all the data type. 
- * Use Chord formula finger[i]=(n+2^(i-1))mod m,
- * where i = current finger map index - max. 256 bits
- * n = own peer identity - 256 bits
- * m = number of bits in peer id - 256 bits
- * @return finger_peer_id for which we have to find the trail through network.
+ * FIXME: check if we can merge send_trail_teardown and trail_compression
+ * Construct a trail teardown message and send it to target_friend
+ * @param source_peer Source of the trail.
+ * @param destination_peer Destination of the trail.
+ * @param trail_id Unique identifier of the trail.
+ * @param trail_direction Direction of trail.
+ * @param target_friend Friend to get this message.
  */
-static 
-struct GNUNET_PeerIdentity *
-finger_id_to_search()
+void
+GDS_NEIGHBOURS_send_trail_teardown (struct GNUNET_PeerIdentity source_peer,
+                                    struct GNUNET_PeerIdentity destination_peer,
+                                    struct GNUNET_HashCode trail_id,
+                                    enum GDS_ROUTING_trail_direction trail_direction,
+                                    struct FriendInfo *target_friend)
+{
+  struct PeerTrailTearDownMessage *ttdm;
+  struct P2PPendingMessage *pending;
+  size_t msize;
+
+  msize = sizeof (struct PeerTrailTearDownMessage);
+
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+  {
+    GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+                               1, GNUNET_NO);
+  }
+
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;    /* FIXME */
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+  ttdm = (struct PeerTrailTearDownMessage *) &pending[1];
+  pending->msg = &ttdm->header;
+  ttdm->header.size = htons (msize);
+  ttdm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN);
+  ttdm->source_peer = source_peer;
+  ttdm->destination_peer = destination_peer;
+  ttdm->TRAIL_ID = trail_id;
+  ttdm->trail_direction = htonl (trail_direction);
+
+  /* Send the message to chosen friend. */
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
+}
+
+
+/**
+ * Construct a verify successor result message and send it to target_friend
+ * @param querying_peer Peer which sent the verify successor message. 
+ * @param source_successor Current_successor of @a querying_peer. 
+ * @param current_predecessor Current predecessor of @a successor. Could be same
+ *                            or different from @a querying_peer.
+ * @param trail_id Unique identifier of the trail from @a querying_peer to 
+ *                 @a successor, NOT including them.
+ * @param trail List of peers which are part of trail from @a querying_peer to 
+ *                 @a successor, NOT including them.
+ * @param trail_length Total number of peers in @a trail
+ * @param trail_direction Direction in which we are sending the message. In this
+ *                        case we are sending result from @a successor to @a querying_peer.
+ * @param target_friend Next friend to get this message. 
+ */
+void
+GDS_NEIGHBOURS_send_verify_successor_result (struct GNUNET_PeerIdentity querying_peer,
+                                             struct GNUNET_PeerIdentity source_successor,
+                                             struct GNUNET_PeerIdentity current_predecessor,
+                                             struct GNUNET_HashCode trail_id,
+                                             const struct GNUNET_PeerIdentity *trail,
+                                             unsigned int trail_length,
+                                             enum GDS_ROUTING_trail_direction trail_direction,
+                                             struct FriendInfo *target_friend)
+{
+  struct PeerVerifySuccessorResultMessage *vsmr;
+  struct P2PPendingMessage *pending;
+  struct GNUNET_PeerIdentity *peer_list;
+  size_t msize;
+
+  msize = sizeof (struct PeerVerifySuccessorResultMessage) +
+          (trail_length * sizeof(struct GNUNET_PeerIdentity));
+
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+  {
+    GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+                               1, GNUNET_NO);
+  }
+
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;    /* FIXME */
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+  vsmr = (struct PeerVerifySuccessorResultMessage *) &pending[1];
+  pending->msg = &vsmr->header;
+  vsmr->header.size = htons (msize);
+  vsmr->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT);
+  vsmr->querying_peer = querying_peer;
+  vsmr->source_successor = source_successor;
+  vsmr->current_predecessor = current_predecessor;
+  vsmr->trail_direction = htonl (trail_direction);
+  vsmr->trail_id = trail_id;
+  
+  if (trail_length > 0)
+  {
+    peer_list = (struct GNUNET_PeerIdentity *) &vsmr[1];
+    memcpy (peer_list, trail, trail_length * sizeof (struct GNUNET_PeerIdentity));
+  }
+
+   /* Send the message to chosen friend. */
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
+}
+
+
+/**
+ * Construct a notify new successor message and send it to target_friend
+ * @param source_peer Peer which wants to notify to its new successor that it
+ *                    could be its predecessor. 
+ * @param successor New successor of @a source_peer
+ * @param successor_trail List of peers in Trail to reach from 
+ *                            @a source_peer to @a new_successor, NOT including 
+ *                            the endpoints. 
+ * @param successor_trail_length Total number of peers in @a new_successor_trail.
+ * @param successor_trail_id Unique identifier of @a new_successor_trail. 
+ * @param target_friend Next friend to get this message. 
+ */
+void
+GDS_NEIGHBOURS_send_notify_new_successor (struct GNUNET_PeerIdentity source_peer,
+                                          struct GNUNET_PeerIdentity successor,
+                                          struct GNUNET_PeerIdentity *successor_trail,
+                                          unsigned int successor_trail_length,
+                                          struct GNUNET_HashCode succesor_trail_id,
+                                          struct FriendInfo *target_friend)
+{
+  struct PeerNotifyNewSuccessorMessage *nsm;
+  struct P2PPendingMessage *pending;
+  struct GNUNET_PeerIdentity *peer_list;
+  size_t msize;
+
+  msize = sizeof (struct PeerNotifyNewSuccessorMessage) +
+          (successor_trail_length * sizeof(struct GNUNET_PeerIdentity));
+
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+  {
+    GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+                               1, GNUNET_NO);
+  }
+
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;    /* FIXME */
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+  nsm = (struct PeerNotifyNewSuccessorMessage *) &pending[1];
+  pending->msg = &nsm->header;
+  nsm->header.size = htons (msize);
+  nsm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR);
+  nsm->new_successor = successor;
+  nsm->source_peer = source_peer;
+  nsm->trail_id = succesor_trail_id;
+  
+  if (successor_trail_length > 0)
+  {
+    peer_list = (struct GNUNET_PeerIdentity *) &nsm[1];
+    memcpy (peer_list, successor_trail,
+            successor_trail_length * sizeof (struct GNUNET_PeerIdentity));
+  }
+
+   /* Send the message to chosen friend. */
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
+}
+
+
+/**
+ * Construct an add_trail message and send it to target_friend
+ * @param source_peer Source of the trail.
+ * @param destination_peer Destination of the trail.
+ * @param trail_id Unique identifier of the trail from 
+ *                 @a source_peer to @a destination_peer, NOT including the endpoints.
+ * @param trail List of peers in Trail from @a source_peer to @a destination_peer,
+ *              NOT including the endpoints. 
+ * @param trail_length Total number of peers in @a trail.
+ * @param target_friend Next friend to get this message.
+ */
+void
+GDS_NEIGHBOURS_send_add_trail (struct GNUNET_PeerIdentity source_peer,
+                               struct GNUNET_PeerIdentity destination_peer,
+                               struct GNUNET_HashCode trail_id,
+                               struct GNUNET_PeerIdentity *trail,
+                               unsigned int trail_length,
+                               struct FriendInfo *target_friend)
+{
+  struct PeerAddTrailMessage *adm;
+  struct GNUNET_PeerIdentity *peer_list;
+  struct P2PPendingMessage *pending;
+  size_t msize;
+
+  msize = sizeof (struct PeerAddTrailMessage) +
+          (trail_length * sizeof(struct GNUNET_PeerIdentity));
+
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+  {
+    GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
+                               1, GNUNET_NO);
+  }
+
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;    /* FIXME */
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+  adm = (struct PeerAddTrailMessage *) &pending[1];
+  pending->msg = &adm->header;
+  adm->header.size = htons (msize);
+  adm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_ADD_TRAIL);
+  adm->source_peer = source_peer;
+  adm->destination_peer = destination_peer;
+  adm->trail_id = trail_id;
+
+  if (trail_length > 0)
+  {
+    peer_list = (struct GNUNET_PeerIdentity *)&adm[1];
+    memcpy (peer_list, trail, sizeof (struct GNUNET_PeerIdentity) * trail_length);
+  }
+
+  /* Send the message to chosen friend. */
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
+
+}
+
+
+/**
+ * FIXME: Merge into "teardown", add source and "last/new_first" in message struct.
+ * Construct a trail compression message and send it to target_friend.
+ * @param source_peer Source of the trail.
+ * @param destination_finger Destination of trail.
+ * @param trail_id Unique identifier of trail.
+ * @param first_friend First hop in compressed trail to reach from source to finger
+ * @param target_friend Next friend to get this message.
+ */
+void
+GDS_NEIGHBOURS_send_trail_compression (struct GNUNET_PeerIdentity source_peer,
+                                       struct GNUNET_PeerIdentity destination_peer,
+                                       struct GNUNET_HashCode trail_id,
+                                       struct GNUNET_PeerIdentity first_friend,
+                                       struct FriendInfo *target_friend)
+{
+  struct P2PPendingMessage *pending;
+  struct PeerTrailCompressionMessage *tcm;
+  size_t msize;
+
+  msize = sizeof (struct PeerTrailCompressionMessage);
+
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  if (target_friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+  {
+    GNUNET_STATISTICS_update (GDS_stats,
+                              gettext_noop ("# P2P messages dropped due to full queue"),
+                                                     1, GNUNET_NO);
+  }
+
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;    /* FIXME */
+  pending->timeout = GNUNET_TIME_relative_to_absolute (GET_TIMEOUT);
+  tcm = (struct PeerTrailCompressionMessage *) &pending[1];
+  pending->msg = &tcm->header;
+  tcm->header.size = htons (msize);
+  tcm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_COMPRESSION);
+  tcm->source_peer = source_peer;
+  tcm->new_first_friend = first_friend;
+  tcm->trail_id = trail_id;
+  tcm->destination_peer = destination_peer;
+
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
+
+}
+
+
+/**
+ * Search my location in trail.
+ * @param trail List of peers
+ * @return my_index if found
+ *         -1 if no entry found.
+ */
+static int
+search_my_index (const struct GNUNET_PeerIdentity *trail,
+                 int trail_length)
+{
+  int i;
+
+  for (i = 0; i < trail_length; i++)
+  {
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &trail[i]))
+      return i;
+  }
+
+  return -1;
+}
+
+/**
+ * Check if the friend is congested or have reached maximum number of trails
+ * it can be part of of. 
+ * @param friend Friend to be chechked.
+ * @return #GNUNET_YES if friend is not congested or have not crossed threshold.
+ *         #GNUNET_NO if friend is either congested or have crossed threshold 
+ */
+static int
+is_friend_congested (struct FriendInfo *friend)
+{
+  if ((friend->trails_count == TRAILS_THROUGH_FRIEND_THRESHOLD)||
+      ((0 != GNUNET_TIME_absolute_get_remaining
+             (friend->congestion_timestamp).rel_value_us)))
+    return GNUNET_YES;
+  else
+    return GNUNET_NO;
+}
+
+
+/**
+ * FIXME: here we should also check if iterator is null or not. It can be NULL
+ * only if we insert randomly at locations. But as we are using trails_count
+ * as the parameter, it should not happen.
+ * Iterate over the list of all the trails of a finger. In case the first
+ * friend to reach the finger has reached trail threshold or is congested,
+ * then don't select it. In case there multiple available good trails to reach
+ * to Finger, choose the one with shortest trail length.
+ * Note: We use length as parameter. But we can use any other suitable parameter
+ * also. 
+ * @param finger Finger
+ * @return struct Selected_Finger_Trail which contains the first friend , trail id
+ * and trail length. NULL in case none of the trails are free.
+ */
+static struct Selected_Finger_Trail *
+select_finger_trail (struct FingerInfo *finger)
+{
+  struct FriendInfo *friend;
+  struct Trail *iterator;
+  struct Selected_Finger_Trail *finger_trail;
+  unsigned int i;
+
+  finger_trail = GNUNET_new (struct Selected_Finger_Trail);
+  
+  for (i = 0; i < finger->trails_count; i++)
+  {
+    iterator = &finger->trail_list[i];
+    friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                &iterator->trail_head->peer);
+    if (GNUNET_YES == is_friend_congested (friend))
+      continue;
+   
+    /* Check if the trail length of this trail is least seen so far. If yes then
+     set finger_trail to this trail.*/
+    if (finger_trail->trail_length > iterator->trail_length)
+    {
+      finger_trail->friend = *friend;
+      finger_trail->trail_id = iterator->trail_id;
+      finger_trail->trail_length = iterator->trail_length;
+    }
+  }
+
+  /* No trail found. */  
+  if (i == finger->trails_count)
+    finger_trail = NULL;
+  
+  return finger_trail;
+}
+
+
+/**
+ * Select closest finger to value.
+ * @param peer1 First peer
+ * @param peer2 Second peer
+ * @param value Value to be compare
+ * @return Closest peer
+ */
+static struct GNUNET_PeerIdentity *
+select_closest_finger (struct GNUNET_PeerIdentity *peer1,
+                       struct GNUNET_PeerIdentity *peer2,
+                       uint64_t value)
+{
+#if 0
+  uint64_t peer1_value;
+  uint64_t peer2_value;
+
+  memcpy (&peer1_value, peer1, sizeof (uint64_t));
+  memcpy (&peer2_value, peer2, sizeof (uint64_t));
+
+  if ((peer1_value <= value) && (value <= peer2_value))
+    return peer2;
+  else if ((peer2_value <= value) && (value <= peer1_value))
+    return peer1;
+  else if ((peer1_value <= peer2_value) && (peer2_value <= value))
+    return peer1;
+  else if ((peer2_value <= peer1_value) && (peer1_value <= value))
+    return peer2;
+  else if ((value <= peer1_value) && (peer1_value <= peer2_value))
+    return peer1;
+  else /*if ((value <= peer2_value) && (peer2_value <= peer1_value))*/
+    return peer2;
+#endif
+  return NULL;
+}
+
+
+/**
+ * Select closest predecessor to value.
+ * @param peer1 First peer
+ * @param peer2 Second peer
+ * @param value Value to be compare
+ * @return Closest peer
+ */
+static struct GNUNET_PeerIdentity *
+select_closest_predecessor (struct GNUNET_PeerIdentity *peer1,
+                            struct GNUNET_PeerIdentity *peer2,
+                            uint64_t value)
+{
+  #if 0
+  uint64_t peer1_value;
+  uint64_t peer2_value;
+
+  memcpy (&peer1_value, peer1, sizeof (uint64_t));
+  memcpy (&peer2_value, peer2, sizeof (uint64_t));
+
+#endif
+  return NULL;
+}
+
+
+/**
+ * Select the closest peer among two peers (which should not be same)
+ * with respect to value and finger_map_index
+ * @param peer1 First peer
+ * @param peer2 Second peer
+ * @param value Value relative to which we find the closest
+ * @param finger_map_index Index in finger map. If equal to PREDECESSOR_FINGER_ID,
+ *                         then we use different logic than other
+ *                         finger_map_index
+ * @return Closest peer among two peers.
+ */
+static struct GNUNET_PeerIdentity *
+select_closest_peer (struct GNUNET_PeerIdentity *peer1,
+                     struct GNUNET_PeerIdentity *peer2,
+                     uint64_t value,
+                     unsigned int finger_map_index)
+{
+  struct GNUNET_PeerIdentity *closest_peer;
+
+  if (PREDECESSOR_FINGER_ID == finger_map_index)
+    closest_peer = select_closest_predecessor (peer1, peer2, value);
+  else
+    closest_peer = select_closest_finger (peer1, peer2, value);
+
+  return closest_peer;
+}
+
+
+/**
+ * Find the successor for destination_finger_value among my_identity, all my
+ * friend and all my fingers. Don't consider friends or fingers
+ * which are congested or have crossed the threshold.
+ * @param destination_finger_value Peer closest to this value will be the next successor.
+ * @param next_destination [out] Updated to friend identity in case a friend is
+ *                               successor, updated to first friend to reach to finger
+ *                               in case finger is the destination.
+ * @param new_intermediate_trail_id [out] In case we finger is the @a next_destination,
+ *                                then we updated the field with trail id to reach
+ *                                to that finger.
+ * @param finger_map_index Index in finger peermap for which we are
+ *                         looking for a finger, to discern between
+ *                         IS_PREDECESSOR or not.
+ * @return Closest successor for value. 
+ */
+static struct GNUNET_PeerIdentity *
+find_successor (uint64_t destination_finger_value,
+                struct GNUNET_PeerIdentity *best_known_destination,
+                struct GNUNET_HashCode *new_intermediate_trail_id,
+                unsigned int finger_map_index)
+{
+  struct Closest_Peer *current_successor;
+  struct GNUNET_PeerIdentity *next_hop;
+  struct GNUNET_CONTAINER_MultiPeerMapIterator *friend_iter;
+  struct GNUNET_CONTAINER_MultiHashMap32Iterator *finger_iter;
+  struct Selected_Finger_Trail *finger_trail;
+  struct FriendInfo *friend;
+  struct FingerInfo *finger;
+  int i;
+  
+  /* Initialize current_successor to my_identity. */
+  current_successor = GNUNET_new (struct Closest_Peer);
+  memcpy (&current_successor->value, &my_identity, sizeof (uint64_t));
+  memset (&current_successor->trail_id, 0, sizeof (current_successor->trail_id)); 
+  current_successor->next_hop = my_identity;
+  current_successor->best_known_destination = my_identity;
+  
+  /* Iterate over friend_peermap and compare each friend with current_successor.*/
+  friend_iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peermap);
+  for (i= 0; i < GNUNET_CONTAINER_multipeermap_size (friend_peermap); i++)
+  {
+    GNUNET_assert (GNUNET_YES ==
+      GNUNET_CONTAINER_multipeermap_iterator_next (friend_iter, NULL,
+                                                  (const void **)&friend));
+    
+    if (GNUNET_YES == is_friend_congested (friend))
+      continue;
+    
+    /* FIXME: select closest peer w.r.t. value. [friend_id, current_successor->id)
+     and [current_successor->id, friend_id). Check in which range value lies.
+     Also, check for wrap around. Set the value of current_successor accordingly.*/
+  }
+  
+  /* Iterate over finger_hashmap and compare each finger with current_successor.*/
+  finger_iter = GNUNET_CONTAINER_multihashmap32_iterator_create (finger_hashmap);
+  for (i = 0; i < GNUNET_CONTAINER_multihashmap32_size (finger_hashmap); i++)
+  {
+    GNUNET_assert (GNUNET_YES ==
+      GNUNET_CONTAINER_multihashmap32_iterator_next (finger_iter, NULL,
+                                                     (void *)&finger));
+    
+    /* If I am my own finger, then ignore this finger. */
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger->finger_identity,
+                                            &my_identity))
+      continue;
+    
+    /* If finger is friend. */
+    if(GNUNET_CONTAINER_multipeermap_get (friend_peermap, &finger->finger_identity))
+    {
+      /* If not congested then compare it with current_successor. */
+      if (GNUNET_NO == is_friend_congested (friend))
+      {
+        //compare it with current successor.   
+      }
+    }
+    /* Choose one of the trail to reach to finger. */
+    finger_trail = select_finger_trail (finger);
+    
+    /* In case no trail found, ignore this finger. */
+    if (NULL == finger_trail)
+      continue;
+    
+    /* FIXME: select closest peer w.r.t. value. [finger->friend_id, current_successor->id)
+     and [current_successor->id, finger->friend_id). Check in which range value lies.
+     Also, check for wrap around. But this will give you the immediate predecessor
+     For example. if we have 0,1,6 and I am 0 and one of my finger is 6. Then
+     for 1, we will have ranges like [0,6) and [6,0) 1 lies in range from [0,6)
+     but successor is 6 not 0 as 6 is > than 1. If you are the closest one, 
+     then set the values
+     in current_successor. Want to write a generic code so that it is used in 
+     * finger_table_add also while choosing the closest one among new and existing
+     * one. */
+  }
+  
+  best_known_destination = &current_successor->best_known_destination;
+  new_intermediate_trail_id = &current_successor->trail_id;
+  next_hop = &current_successor->next_hop;
+
+  return next_hop;
+}
+
+
+/**
+ * Construct a Put message and send it to target_peer.
+ * @param key Key for the content
+ * @param block_type Type of the block
+ * @param options Routing options
+ * @param desired_replication_level Desired replication count
+ * @param best_known_dest Peer to which this message should reach eventually,
+ *                        as it is best known destination to me. 
+ * @param intermediate_trail_id Trail id in case 
+ * @param target_peer Peer to which this message will be forwarded.
+ * @param hop_count Number of hops traversed so far.
+ * @param put_path_length Total number of peers in @a put_path
+ * @param put_path Number of peers traversed so far
+ * @param expiration_time When does the content expire
+ * @param data Content to store
+ * @param data_size Size of content @a data in bytes
+ */
+void
+GDS_NEIGHBOURS_send_put (const struct GNUNET_HashCode *key,
+                         enum GNUNET_BLOCK_Type block_type,
+                                          enum GNUNET_DHT_RouteOption options,
+                                          uint32_t desired_replication_level,
+                                          struct GNUNET_PeerIdentity *best_known_dest,
+                                          struct GNUNET_HashCode *intermediate_trail_id,
+                                          struct GNUNET_PeerIdentity *target_peer,
+                         uint32_t hop_count,
+                         uint32_t put_path_length,
+                         struct GNUNET_PeerIdentity *put_path,
+                         struct GNUNET_TIME_Absolute expiration_time,
+                         const void *data, size_t data_size)
+{
+  struct PeerPutMessage *ppm;
+  struct P2PPendingMessage *pending;
+  struct FriendInfo *target_friend;
+  struct GNUNET_PeerIdentity *pp;
+  size_t msize;
+
+  msize = put_path_length * sizeof (struct GNUNET_PeerIdentity) + data_size +
+          sizeof (struct PeerPutMessage);
+  
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    put_path_length = 0;
+    msize = data_size + sizeof (struct PeerPutMessage);
+  }
+  
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  
+   /* This is the first call made from clients file. So, we should search for the
+     target_friend. */
+  if (NULL == target_peer)
+  {
+    uint64_t key_value;
+    struct GNUNET_PeerIdentity *next_hop;
+   
+    memcpy (&key_value, key, sizeof (uint64_t));
+    next_hop = find_successor (key_value, best_known_dest, 
+                               intermediate_trail_id, GDS_FINGER_TYPE_NON_PREDECESSOR);
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity(next_hop, &my_identity)) 
+    {
+      /* I am the destination but we have already done datacache_put in client file.  */
+      return;
+    }
+    else
+      target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);   
+  }
+  
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->timeout = expiration_time;
+  ppm = (struct PeerPutMessage *) &pending[1];
+  pending->msg = &ppm->header;
+  ppm->header.size = htons (msize);
+  ppm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_PUT);
+  ppm->options = htonl (options);
+  ppm->block_type = htonl (block_type);
+  ppm->hop_count = htonl (hop_count + 1);
+  ppm->desired_replication_level = htonl (desired_replication_level);
+  ppm->put_path_length = htonl (put_path_length);
+  ppm->expiration_time = GNUNET_TIME_absolute_hton (expiration_time);
+  ppm->best_known_destination = *best_known_dest;
+  ppm->key = *key;
+  if (NULL == intermediate_trail_id)
+    memset (&ppm->intermediate_trail_id, 0, sizeof (ppm->intermediate_trail_id));
+  else
+    ppm->intermediate_trail_id = *intermediate_trail_id;
+  pp = (struct GNUNET_PeerIdentity *) &ppm[1];
+  if (put_path_length != 0)
+  {
+    memcpy (pp, put_path,
+            sizeof (struct GNUNET_PeerIdentity) * put_path_length);
+  }
+  memcpy (&pp[put_path_length], data, data_size);
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
+}
+
+
+
+/**
+ * Construct a Get message and send it to target_peer.
+ * @param key Key for the content
+ * @param block_type Type of the block
+ * @param options Routing options
+ * @param desired_replication_level Desired replication count
+ * @param best_known_dest 
+ * @param intermediate_trail_id 
+ * @param target_peer Peer to which this message will be forwarded.
+ * @param hop_count Number of hops traversed so far.
+ * @param data Content to store
+ * @param data_size Size of content @a data in bytes
+ * @param get_path_length Total number of peers in @a get_path
+ * @param get_path Number of peers traversed so far
+ */
+void
+GDS_NEIGHBOURS_send_get (const struct GNUNET_HashCode *key,
+                         enum GNUNET_BLOCK_Type block_type,
+                         enum GNUNET_DHT_RouteOption options,
+                         uint32_t desired_replication_level,
+                         struct GNUNET_PeerIdentity *best_known_dest,
+                         struct GNUNET_HashCode *intermediate_trail_id,
+                         struct GNUNET_PeerIdentity *target_peer,
+                         uint32_t hop_count,
+                         uint32_t get_path_length,
+                         struct GNUNET_PeerIdentity *get_path)
+{
+  struct PeerGetMessage *pgm;
+  struct P2PPendingMessage *pending;
+  struct FriendInfo *target_friend;
+  struct GNUNET_PeerIdentity *gp;
+  size_t msize;
+
+  msize = sizeof (struct PeerGetMessage) + 
+          (get_path_length * sizeof (struct GNUNET_PeerIdentity));
+  
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  
+  if (NULL == target_peer)
+  {
+    struct GNUNET_PeerIdentity *next_hop;
+    uint64_t key_value;
+    
+    memcpy (&key_value, key, sizeof (uint64_t));
+       // FIXME: endianess of key_value!?
+     /* FIXME: Here you should use enum GDS_NEIGHBOURS_FINGER_TYPE in place of 0. */
+    next_hop = find_successor (key_value, best_known_dest,
+                               intermediate_trail_id, GDS_FINGER_TYPE_NON_PREDECESSOR);
+    
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity(&my_identity,next_hop)) 
+    {
+      GDS_DATACACHE_handle_get (key,block_type, NULL, 0, 
+                                NULL, 0, 1, &my_identity, NULL,&my_identity);
+      return;
+    }
+    else
+    {
+      target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+    }
+  }
+  
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;    /* FIXME */
+  pgm = (struct PeerGetMessage *) &pending[1];
+  pending->msg = &pgm->header;
+  pgm->header.size = htons (msize);
+  pgm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_GET);
+  pgm->get_path_length = htonl (get_path_length);
+  pgm->key = *key;
+  pgm->best_known_destination = *best_known_dest;
+  pgm->intermediate_trail_id = *intermediate_trail_id;
+  pgm->hop_count = htonl (hop_count + 1);
+  
+  if (get_path != 0)
+  {
+    gp = (struct GNUNET_PeerIdentity *) &pgm[1];
+    memcpy (gp, get_path, get_path_length * sizeof (struct GNUNET_PeerIdentity));
+  }
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
+}
+
+
+/**
+ * Send the get result to requesting client.
+ * @param key Key of the requested data.
+ * @param type Block type
+ * @param target_peer Next peer to forward the message to.
+ * @param source_peer Peer which has the data for the key.
+ * @param put_path_length Number of peers in @a put_path
+ * @param put_path Path taken to put the data at its stored location.
+ * @param get_path_length Number of peers in @a get_path
+ * @param get_path Path taken to reach to the location of the key.
+ * @param expiration When will this result expire?
+ * @param data Payload to store
+ * @param data_size Size of the @a data
+ */
+void
+GDS_NEIGHBOURS_send_get_result (const struct GNUNET_HashCode *key,
+                                enum GNUNET_BLOCK_Type type,
+                                struct GNUNET_PeerIdentity *target_peer,
+                                struct GNUNET_PeerIdentity *source_peer,
+                                unsigned int put_path_length,
+                                const struct GNUNET_PeerIdentity *put_path,
+                                unsigned int get_path_length,
+                                struct GNUNET_PeerIdentity *get_path,
+                                struct GNUNET_TIME_Absolute expiration,
+                                const void *data, size_t data_size)
+{
+  struct PeerGetResultMessage *get_result;
+  struct GNUNET_PeerIdentity *get_result_path;
+  struct GNUNET_PeerIdentity *pp;
+  struct P2PPendingMessage *pending;
+  struct FriendInfo *target_friend;
+  int current_path_index;
+  size_t msize;
+  
+  msize = get_path_length * sizeof (struct GNUNET_PeerIdentity) + data_size +
+          sizeof (struct PeerPutMessage);
+  if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  
+  if(get_path_length > 0)
+  {
+    current_path_index = search_my_index(get_path, get_path_length);
+    if (GNUNET_SYSERR == current_path_index)
+    {
+      GNUNET_break (0);
+      return;
+    }
+  }
+  if (0 == current_path_index)
+  {
+    GDS_CLIENTS_handle_reply (expiration, key, get_path_length, 
+                              get_path, put_path_length,
+                              put_path, type, data_size, data);
+    return;
+  }
+  
+  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage) + msize);
+  pending->importance = 0;   
+  get_result = (struct PeerGetResultMessage *)&pending[1];
+  pending->msg = &get_result->header;
+  get_result->header.size = htons (msize);
+  get_result->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT);
+  get_result->key = *key;
+  /* FIXME: check if you are passing the correct querying_peer as described in
+   the get_result documentation. */
+  memcpy (&(get_result->querying_peer), source_peer, sizeof (struct GNUNET_PeerIdentity));
+  get_result->expiration_time = expiration;
+  
+  if (get_path_length != 0)
+  {
+    get_result_path = (struct GNUNET_PeerIdentity *)&get_result[1];
+    memcpy (get_result_path, get_path,
+            sizeof (struct GNUNET_PeerIdentity) * get_path_length);
+  }
+  memcpy (&get_result_path[get_path_length], data, data_size);
+  
+  /* FIXME: Is this correct? */
+  if (put_path_length != 0)
+  {
+    pp = (struct GNUNET_PeerIdentity *)&get_result_path[1];
+    memcpy (pp, put_path,sizeof (struct GNUNET_PeerIdentity) * put_path_length);
+  }
+  
+  target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, 
+                                                     &get_result_path[current_path_index - 1]);
+  GNUNET_CONTAINER_DLL_insert_tail (target_friend->head, target_friend->tail, pending);
+  target_friend->pending_count++;
+  process_friend_queue (target_friend);
+}
+
+
+/**
+ * Randomly choose one of your friends (which is not congested and have not crossed
+ * trail threshold) from the friends_peer map
+ * @return Friend Randomly chosen friend.
+ *         NULL in case friend peermap is empty, or all the friends are either
+ *              congested or have crossed trail threshold.
+ */
+static struct FriendInfo *
+select_random_friend ()
+{
+  unsigned int current_size;
+  uint32_t index;
+  unsigned int j = 0;
+  struct GNUNET_CONTAINER_MultiPeerMapIterator *iter;
+  struct GNUNET_PeerIdentity key_ret;
+  struct FriendInfo *friend;
+
+  current_size = GNUNET_CONTAINER_multipeermap_size (friend_peermap);
+  if (0 == current_size)
+    return NULL;
+
+  index = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, current_size);
+  iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peermap);
+
+  for (j = 0; j < index ; j++)
+    GNUNET_assert (GNUNET_YES ==
+                   GNUNET_CONTAINER_multipeermap_iterator_next (iter, NULL, NULL));
+  do
+  {
+    if (j == current_size)
+    {
+      j = 0;
+      GNUNET_CONTAINER_multipeermap_iterator_destroy (iter);
+      iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peermap);
+
+    }
+    GNUNET_assert (GNUNET_YES ==
+                GNUNET_CONTAINER_multipeermap_iterator_next (iter,
+                                                             &key_ret,
+                                                             (const void **)&friend));
+
+
+    if ((TRAILS_THROUGH_FRIEND_THRESHOLD == friend->trails_count) &&
+        (0 == GNUNET_TIME_absolute_get_remaining (friend->congestion_timestamp).rel_value_us))
+    {
+      break;
+    }
+    friend = NULL;
+    j++;
+  } while (j != index);
+
+  GNUNET_CONTAINER_multipeermap_iterator_destroy (iter);
+  return friend;
+}
+
+
+/**
+ * FIXME: pass current_search_finger_index as parameter
+ * Compute finger_identity to which we want to setup the trail
+ * @return finger_identity
+ */
+static uint64_t
+compute_finger_identity_value ()
+{
+  uint64_t my_id64;
+
+  memcpy (&my_id64, &my_identity, sizeof (uint64_t));
+  my_id64 = GNUNET_ntohll (my_id64);
+  return (my_id64 + (unsigned long) pow (2, current_search_finger_index));
+}
+
+
+/**
+ * Compute immediate predecessor identity in the network.
+ * @return peer identity of immediate predecessor.
+ */
+static uint64_t
+compute_predecessor_identity_value ()
+{
+  uint64_t my_id64;
+
+  memcpy (&my_id64, &my_identity, sizeof (uint64_t));
+  my_id64 = GNUNET_ntohll (my_id64);
+  return (my_id64 -1);
+}
+
+
+/*
+ * Choose a random friend and start looking for the trail to reach to
+ * finger identity through this random friend.
+ *
+ * @param cls closure for this task
+ * @param tc the context under which the task is running
+ */
+static void
+send_find_finger_trail_message (void *cls,
+                                const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct FriendInfo *target_friend;
+  struct GNUNET_TIME_Relative next_send_time;
+  struct GNUNET_HashCode trail_id;
+  unsigned int is_predecessor;
+  uint64_t finger_id_value;
+
+  next_send_time.rel_value_us =
+      DHT_FIND_FINGER_TRAIL_INTERVAL.rel_value_us +
+      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+                                DHT_FIND_FINGER_TRAIL_INTERVAL.rel_value_us);
+  find_finger_trail_task =
+      GNUNET_SCHEDULER_add_delayed (next_send_time, &send_find_finger_trail_message,
+                                    NULL);
+
+  target_friend = select_random_friend ();
+  if (NULL == target_friend)
+  {
+    return;
+  }
+
+  if (PREDECESSOR_FINGER_ID == current_search_finger_index)
+  {
+    finger_id_value = compute_predecessor_identity_value();
+    is_predecessor = 0;
+  }
+  else
+  {
+    finger_id_value = compute_finger_identity_value();
+    is_predecessor = 1;
+  }
+
+  GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG,
+                              &trail_id, sizeof (trail_id));
+  GDS_NEIGHBOURS_send_trail_setup (my_identity, finger_id_value,
+                                   target_friend->id, target_friend, 0, NULL,
+                                   is_predecessor, trail_id, NULL);
+}
+
+
+/**
+ * In case there are already maximum number of possible trails to reach to a
+ * finger, then check if the new trail's length is lesser than any of the
+ * existing trails.
+ * If yes then replace that old trail by new trail.
+ *
+ * Note: Here we are taking length as a parameter to choose the best possible
+ * trail, but there could be other parameters also like:
+ * 1. duration of existence of a trail - older the better.
+ * 2. if the new trail is completely disjoint than the
+ *    other trails, then may be choosing it is better.
+ *
+ * @param existing_finger
+ * @param new_finger_trail
+ * @param new_finger_trail_length
+ * @param new_finger_trail_id
+ */
+static void
+select_and_replace_trail (struct FingerInfo *existing_finger,
+                          const struct GNUNET_PeerIdentity *new_trail,
+                          unsigned int new_trail_length,
+                          struct GNUNET_HashCode new_trail_id)
+{
+  struct Trail *trail_list_iterator;
+  unsigned int largest_trail_length;
+  unsigned int largest_trail_index;
+  struct Trail_Element *trail_element;
+  unsigned int i;
+
+  largest_trail_length = new_trail_length;
+  largest_trail_index = MAXIMUM_TRAILS_PER_FINGER + 1;
+
+  GNUNET_assert (MAXIMUM_TRAILS_PER_FINGER == existing_finger->trails_count);
+
+  for (i = 0; i < existing_finger->trails_count; i++)
+  {
+    trail_list_iterator = &existing_finger->trail_list[i];
+    if (trail_list_iterator->trail_length > largest_trail_length)
+    {
+      largest_trail_length = trail_list_iterator->trail_length;
+      largest_trail_index = i;
+    }
+  }
+
+  if (largest_trail_index == (MAXIMUM_TRAILS_PER_FINGER + 1))
+  {
+    // tear down new trail: it's not better than the existing ones
+    return;
+  }
+
+  /* Send trail teardown message across the replaced trail. */
+  struct Trail *replace_trail = &existing_finger->trail_list[largest_trail_index];
+  struct FriendInfo *target_friend =
+      GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                         &replace_trail->trail_head->peer);
+
+  GDS_NEIGHBOURS_send_trail_teardown (my_identity,
+                                      existing_finger->finger_identity,
+                                      replace_trail->trail_id,
+                                      GDS_ROUTING_SRC_TO_DEST, target_friend);
+  /* Free the trail. */
+  while (NULL != (trail_element = replace_trail->trail_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (replace_trail->trail_head,
+                                 replace_trail->trail_tail, trail_element);
+    GNUNET_free (trail_element);
+  }
+
+  /* Add new trial at that location. */
+  i = 0;
+  while (i < new_trail_length)
+  {
+    struct Trail_Element *element = GNUNET_new (struct Trail_Element);
+    element->peer = new_trail[i];
+
+    GNUNET_CONTAINER_DLL_insert_tail (replace_trail->trail_head,
+                                      replace_trail->trail_tail,
+                                      element);
+  }
+}
+
+
+/**
+ * Check if the new trail to reach to finger is unique or do we already have
+ * such a trail present for finger.
+ * @param existing_finger Finger identity
+ * @param new_trail New trail to reach @a existing_finger
+ * @param trail_length Total number of peers in new_trail.
+ * @return #GNUNET_YES if the new trail is unique
+ *         #GNUNET_NO if same trail is already present.
+ */
+static int
+is_new_trail_unique (struct FingerInfo *existing_finger,
+                     const struct GNUNET_PeerIdentity *new_trail,
+                     unsigned int trail_length)
+{
+  struct Trail *trail_list_iterator;
+  struct Trail_Element *trail_element;
+  int i;
+  int j;
+  int trail_unique = GNUNET_NO;
+
+  for (i = 0; i < existing_finger->trails_count; i++)
+  {
+    trail_list_iterator = &existing_finger->trail_list[i];
+    if (trail_list_iterator->trail_length != trail_length)
+      continue;
+    trail_element = trail_list_iterator->trail_head;
+    for (j = 0; j < trail_list_iterator->trail_length; j++)
+    {
+      if (0 != GNUNET_CRYPTO_cmp_peer_identity (&new_trail[j],
+                                                &trail_element->peer))
+      {
+        trail_unique = GNUNET_YES;
+        break;
+      }
+    }
+  }
+  return trail_unique;
+}
+
+
+/**
+ * Add a new trail to existing finger.
+ * @param existing_finger
+ * @param new_finger_trail
+ * @param new_finger_trail_length
+ * @param new_finger_trail_id
+ */
+static void
+add_new_trail (struct FingerInfo *existing_finger,
+               const struct GNUNET_PeerIdentity *new_trail,
+               unsigned int new_trail_length,
+               struct GNUNET_HashCode new_trail_id)
+{
+  struct Trail *trail_list_iterator;
+  struct FriendInfo *first_friend;
+  int i;
+
+  if (GNUNET_NO == is_new_trail_unique (existing_finger, new_trail,
+                                        new_trail_length))
+  {
+    return;
+  }
+
+  // FIXME checking trail_head is NOT a valid way to verify an open slot
+  for (i = 0; existing_finger->trail_list[i].trail_head != NULL; i++)
+    GNUNET_assert (i < MAXIMUM_TRAILS_PER_FINGER);
+
+  trail_list_iterator = &existing_finger->trail_list[i];
+
+  if (new_trail_length > 0)
+    first_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                      &new_trail[0]);
+  else
+    first_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                      &(existing_finger->finger_identity));
+  first_friend->trails_count++;
+  /* FIXME; we removed this field but read fixme. */
+  //trail_list_iterator->first_friend_trail_count = first_friend->trails_count;
+  trail_list_iterator->trail_length = new_trail_length;
+
+  for (i = 0; i < new_trail_length; i++)
+  {
+    struct Trail_Element *element;
+    element = GNUNET_new (struct Trail_Element);
+
+    element->peer = new_trail[i];
+    GNUNET_CONTAINER_DLL_insert_tail (trail_list_iterator->trail_head,
+                                      trail_list_iterator->trail_tail,
+                                      element);
+  }
+  existing_finger->trails_count++;
+}
+
+
+/**
+ * Send trail teardown message on all trails associated with finger.
+ * @param finger_to_be_removed
+ */
+static void
+send_trail_teardown (struct FingerInfo *finger)
+{
+  struct Trail *trail_list_iterator;
+  struct FriendInfo *target_friend;
+  int i;
+
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger->finger_identity, &my_identity)
+     || (NULL != GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                    &finger->finger_identity)))
+    return;
+
+  for (i = 0; i < finger->trails_count; i++)
+  {
+    trail_list_iterator = &finger->trail_list[i];
+    if (trail_list_iterator->trail_length > 0)
+    {
+      target_friend =
+              GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                 &trail_list_iterator->trail_head->peer);
+      // check target_friend
+      GDS_NEIGHBOURS_send_trail_teardown (my_identity, finger->finger_identity,
+                                          trail_list_iterator->trail_id,
+                                          GDS_ROUTING_SRC_TO_DEST,
+                                          target_friend);
+    }
+  }
+}
+
+
+/**
+ * Decrement the trail count of the first friend to reach the finger
+ * In case finger is the friend, then decrement its trail count.
+ * @param finger
+ */
+static void
+decrement_friend_trail_count (struct FingerInfo *finger)
+{
+  struct Trail *trail_list_iterator;
+  struct FriendInfo *target_friend;
+  int i = 0;
+
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger->finger_identity,
+                                            &my_identity))
+    return;
+
+  for (i = 0; i < finger->trails_count; i++)
+  {
+    trail_list_iterator = &finger->trail_list[i];
+    if (trail_list_iterator->trail_length > 0)
+      target_friend =
+              GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                 &trail_list_iterator->trail_head->peer);
+    else
+     target_friend =
+              GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                 &finger->finger_identity);
+
+    // check target_friend for NULL
+    /* FIXME: we have removed first_friend_trail_count field. */
+   target_friend->trails_count--;
+    //trail_list_iterator->first_friend_trail_count--;
+  }
+  return;
+}
+
+
+/**
+ * Free finger and its trail.
+ * @param finger Finger to be freed.
+ */
+static void
+free_finger (struct FingerInfo *finger)
+{
+  struct Trail *trail_list_iterator;
+  struct Trail_Element *trail_element;
+  unsigned int i;
+
+  for (i = 0; i < finger->trails_count; i++)
+  {
+    trail_list_iterator = &finger->trail_list[i];
+    while (NULL != (trail_element = trail_list_iterator->trail_head))
+    {
+      GNUNET_CONTAINER_DLL_remove (trail_list_iterator->trail_head,
+                                   trail_list_iterator->trail_tail,
+                                   trail_element);
+      GNUNET_free (trail_element);
+    }
+  }
+  GNUNET_free (finger);
+}
+
+
+/**
+ * Add a new entry in finger hashmap at finger_map_index
+ * @param finger_identity Peer Identity of new finger
+ * @param finger_trail Trail to reach from me to finger (excluding both end points).
+ * @param finger_trail_length Total number of peers in @a finger_trail.
+ * @param trail_id Unique identifier of the trail.
+ * @param finger_map_index Index in finger hashmap.
+ * @return #GNUNET_OK if new entry is added
+ *         #GNUNET_NO -- FIXME: need to check what value does hahsmap put
+ *                       returns on failure.
+ */
+static int
+add_new_entry (struct GNUNET_PeerIdentity finger_identity,
+               const struct GNUNET_PeerIdentity *finger_trail,
+               unsigned int finger_trail_length,
+               struct GNUNET_HashCode trail_id,
+               unsigned int finger_map_index)
+{
+  struct FingerInfo *new_entry;
+  struct FriendInfo *first_trail_hop;
+  struct Trail *first_trail;
+  int i = 0;
+
+  new_entry = GNUNET_new (struct FingerInfo);
+  new_entry->finger_identity = finger_identity;
+  new_entry->finger_map_index = finger_map_index;
+  new_entry->trails_count = 1;
+
+  if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &finger_identity))
+  {
+    if (finger_trail_length > 0)
+    {
+      first_trail_hop = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                           &finger_trail[0]);
+    }
+    else
+    {
+      first_trail_hop = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                           &finger_identity);
+    }
+
+    first_trail_hop->trails_count++;
+    first_trail = &new_entry->trail_list[0];
+    /* FIXME: We have removed this field. */
+    //first_trail->first_friend_trail_count = first_trail_hop->trails_count;
+
+    while (i < finger_trail_length)
+    {
+      struct Trail_Element *element = GNUNET_new (struct Trail_Element);
+
+      element->next = NULL;
+      element->prev = NULL;
+      element->peer = finger_trail[i];
+      GNUNET_CONTAINER_DLL_insert_tail (first_trail->trail_head,
+                                        first_trail->trail_tail,
+                                        element);
+      i++;
+    }
+  }
+
+  return GNUNET_CONTAINER_multihashmap32_put (finger_hashmap,
+                                              new_entry->finger_map_index,
+                                              new_entry,
+                                              GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+}
+
+
+/**
+ * Scan the trail to check if there is any other friend in the trail other than
+ * first hop. If yes then shortcut the trail, send trail compression message to
+ * peers which are no longer part of trail and send back the updated trail
+ * and trail_length to calling function.
+ * @param finger_identity Finger whose trail we will scan.
+ * @param finger_trail [in, out] Trail to reach from source to finger,
+ * @param finger_trail_length  Total number of peers in original finger_trail.
+ * @param finger_trail_id Unique identifier of the finger trail.
+ * @return updated trail length in case we shortcut the trail, else original
+ *         trail length.
+ */
+static struct GNUNET_PeerIdentity *
+scan_and_compress_trail (struct GNUNET_PeerIdentity finger_identity,
+                         const struct GNUNET_PeerIdentity *trail,
+                         unsigned int trail_length,
+                         struct GNUNET_HashCode trail_id,
+                         int *new_trail_length)
+{
+  struct FriendInfo *target_friend;
+  struct GNUNET_PeerIdentity *new_trail;
+  int i;
+  
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &finger_identity))
+  {
+    *new_trail_length = 0;
+    return NULL;
+  }
+
+  if (NULL != GNUNET_CONTAINER_multipeermap_get (friend_peermap, &finger_identity))
+  {
+    if (trail_length > 0)
+    {
+      target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                       &trail[0]);
+      GDS_NEIGHBOURS_send_trail_compression (my_identity, finger_identity,
+                                             trail_id, finger_identity,
+                                             target_friend);
+      *new_trail_length = 0;
+    }
+    return NULL;
+  }
+
+  for (i = trail_length - 1; i > 0; i--)
+  {
+    if (NULL != GNUNET_CONTAINER_multipeermap_get (friend_peermap, &trail[i]))
+    {
+      struct FriendInfo *target_friend;
+      int j = 0;
+
+      target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                         &trail[0]);
+      GDS_NEIGHBOURS_send_trail_compression (my_identity, finger_identity,
+                                             trail_id, trail[i],
+                                             target_friend);
+
+    
+      /* Copy the trail from index i to index trail_length -1 and change
+       trail length and return */
+      new_trail = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity) * i);
+      while (i < trail_length)
+      {
+        memcpy (&new_trail[j], &trail[i], sizeof(struct GNUNET_PeerIdentity));
+        j++;
+        i++;
+      }
+      *new_trail_length = j+1;
+      break;
+      return new_trail;
+    }
+  }
+  *new_trail_length = trail_length;
+  memcpy (new_trail, new_trail, trail_length * sizeof (struct GNUNET_PeerIdentity));
+  return new_trail;
+}
+
+
+/**
+ * FIXME: Ensure that we add trail in succession in the trail list.
+ * There are no free spots within the trail list. 
+ * Send verify successor message to your successor on all trails to reach
+ * the successor.
+ * @param successor My current successor
+ */
+static void
+send_verify_successor_message (struct FingerInfo *successor)
+{
+  struct Trail *trail_list_iterator;
+  struct GNUNET_HashCode trail_id;
+  struct GNUNET_PeerIdentity next_hop;
+  struct FriendInfo *target_friend;
+  struct GNUNET_PeerIdentity *trail;
+  unsigned int trail_length;
+  int i;
+  int j;
+
+  for (i = 0; i < successor->trails_count; i++)
+  {
+    trail_list_iterator = &successor->trail_list[i];
+    GNUNET_assert (NULL != trail_list_iterator->trail_head);
+
+    if (trail_list_iterator->trail_length > 0)
+    {
+      struct Trail_Element *element;
+
+      trail_length = trail_list_iterator->trail_length;
+      trail = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity)
+                             * trail_length);
+      element = trail_list_iterator->trail_head;
+      for (j = 0; j < trail_length; j++, element = element->next)
+        trail[j] = element->peer;
+      next_hop = trail_list_iterator->trail_head->peer;
+    }
+    else
+    {
+      trail = NULL;
+      trail_length = 0;
+      next_hop = successor->finger_identity;
+    }
+    trail_id = trail_list_iterator->trail_id;
+    GNUNET_assert (NULL != (target_friend = 
+                           GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop)));
+    
+    GDS_NEIGHBOURS_send_verify_successor_message (my_identity,
+                                                  successor->finger_identity,
+                                                  trail_id, trail, trail_length,
+                                                  target_friend);
+    GNUNET_free_non_null (trail);
+  }
+}
+
+
+/**
+ * FIXME: Is it safe to assume that current_search_finger_index == finger_map_index?
+ * Update the current search finger index. 
+ */
+static void
+update_current_search_finger_index (struct GNUNET_PeerIdentity new_finger_identity)
+{
+  struct FingerInfo *successor;
+  
+  successor = GNUNET_CONTAINER_multihashmap32_get (finger_hashmap, 0);
+  
+  if (0 == current_search_finger_index)
+  {
+    current_search_finger_index = PREDECESSOR_FINGER_ID;
+
+    if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &new_finger_identity))
+    {
+        send_verify_successor_message (successor);
+    }
+  }
+  else if (0 == GNUNET_CRYPTO_cmp_peer_identity (&new_finger_identity,
+                                                  &(successor->finger_identity)))
+  {
+     current_search_finger_index = 0;
+  }
+  else
+     current_search_finger_index = current_search_finger_index - 1;
+}
+
+/**
+ * FIXME: Is it sage to assume that finger_map_index == current_search_finger_index
+ * Calculate finger_map_index from initial value that we send in trail setup
+ * message. 
+ * @param ultimate_destination_finger_value Value that we calculated from our
+ * identity and finger_map_index.
+ * @param is_predecessor Is the entry for predecessor or not. 
+ * @return finger_map_index which is a value between 0 <= finger_map_index <= 64
+ *         -1, if no valid finger_map_index is found. 
+ */
+static int
+get_finger_map_index (uint64_t ultimate_destination_finger_value,
+                      unsigned int is_predecessor)
+{
+  uint64_t my_id64;
+  unsigned int finger_map_index;
+  
+  finger_map_index = -1;
+  memcpy (&my_id64, &my_identity, sizeof (uint64_t));
+  
+  if (is_predecessor)
+  {
+    if(1 == (my_id64 - ultimate_destination_finger_value))
+      finger_map_index = PREDECESSOR_FINGER_ID;
+  }
+  else
+  {
+    finger_map_index = log (ultimate_destination_finger_value - my_id64);
+  }
+  
+  if ((finger_map_index > PREDECESSOR_FINGER_ID) ||
+      (finger_map_index == current_search_finger_index))
+    finger_map_index = -1;
+  
+  return finger_map_index;
+}
+
+
+/**
+ * Check if there is already an entry in finger peermap for given finger map index.
+ * If yes, then select the closest finger. If new and existing finger are same,
+ * the check if you can store more trails. If yes then add trail, else keep the best
+ * trails to reach to the finger. If the new finger is closest, add it.
+ * Then, update current_search_finger_index.
+ * @param new_finger_identity Peer Identity of new finger
+ * @param new_finger_trail Trail to reach the new finger
+ * @param new_finger_length Total number of peers in @a new_finger_trail.
+ * @param is_predecessor Is this entry for predecessor in finger_peermap. 
+ * @param new_finger_trail_id Unique identifier of @new_finger_trail.
+ * @return #GNUNET_YES if the new entry is added
+ *         #GNUNET_NO if new entry is not added, either it was discarded or
+ *                    it was same as existing finger at finger map index.
+ */
+static int
+finger_table_add (struct GNUNET_PeerIdentity finger_identity, 
+                  const struct GNUNET_PeerIdentity *finger_trail, 
+                  unsigned int finger_trail_length,
+                  unsigned int is_predecessor,
+                  uint64_t finger_value,
+                  struct GNUNET_HashCode finger_trail_id)
+{
+  struct FingerInfo *existing_finger;
+  struct GNUNET_PeerIdentity *closest_peer;
+  int updated_finger_trail_length; 
+  struct GNUNET_PeerIdentity *updated_trail;
+  unsigned int finger_map_index;
+  unsigned int new_entry_added;
+  
+  new_entry_added = GNUNET_NO;
+  
+  finger_map_index = get_finger_map_index (finger_value,
+                                           is_predecessor);
+  
+  if (-1 == finger_map_index)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  
+  updated_trail =
+       scan_and_compress_trail (finger_identity, finger_trail,
+                                finger_trail_length, finger_trail_id, 
+                                &updated_finger_trail_length);
+  
+  existing_finger = GNUNET_CONTAINER_multihashmap32_get (finger_hashmap,
+                                                         finger_map_index);
+  
+  /* No entry present in finger hashmap for given finger map index. */
+  if (NULL == existing_finger)
+  {
+    add_new_entry (finger_identity, updated_trail, updated_finger_trail_length,
+                   finger_trail_id, finger_map_index);
+    update_current_search_finger_index (finger_identity);
+    return GNUNET_YES;
+  }
+  
+  /* If existing entry and finger identity are not same. */
+  if (0 != GNUNET_CRYPTO_cmp_peer_identity (&(existing_finger->finger_identity),
+                                            &finger_identity))
+  {
+    closest_peer = select_closest_peer (&existing_finger->finger_identity,
+                                        &finger_identity,
+                                        finger_value, finger_map_index);
+    
+    /* If the new finger is the closest peer. */
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger_identity, closest_peer))
+    {
+      GNUNET_assert (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+                                                           &finger_identity));
+
+      send_trail_teardown (existing_finger);
+      decrement_friend_trail_count (existing_finger);
+      free_finger (existing_finger);
+      add_new_entry (finger_identity, updated_trail, updated_finger_trail_length,
+                     finger_trail_id, finger_map_index);
+      new_entry_added = GNUNET_YES;
+    }
+  }
+  else
+  {
+    /* If both new and existing entry are same as my_identity, then do nothing. */
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity (&(existing_finger->finger_identity),
+                                              &my_identity))
+    {
+      return GNUNET_NO;
+    }
+    
+    /* If the existing finger is not a friend. */
+    if (NULL ==
+        GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                            &(existing_finger->finger_identity)))
+    {
+      if (existing_finger->trails_count < MAXIMUM_TRAILS_PER_FINGER)
+        add_new_trail (existing_finger, updated_trail,
+                       finger_trail_length, finger_trail_id);
+      else
+        select_and_replace_trail (existing_finger, updated_trail,
+                                  finger_trail_length, finger_trail_id);
+    }
+    new_entry_added = GNUNET_NO;
+  }
+  
+  update_current_search_finger_index (finger_identity);
+  return new_entry_added;
+}
+
+
+/**
+ * Core handler for P2P put messages.
+ * @param cls closure
+ * @param peer sender of the request
+ * @param message message
+ * @return #GNUNET_OK to keep the connection open,
+ *         #GNUNET_SYSERR to close it (signal serious error)
+ */
+static int
+handle_dht_p2p_put (void *cls, const struct GNUNET_PeerIdentity *peer,
+                    const struct GNUNET_MessageHeader *message)
+{
+   struct PeerPutMessage *put;
+  struct GNUNET_PeerIdentity *put_path;
+  struct GNUNET_HashCode test_key;
+  enum GNUNET_DHT_RouteOption options;
+  struct GNUNET_PeerIdentity best_known_dest;
+  struct GNUNET_HashCode intermediate_trail_id;
+  struct GNUNET_PeerIdentity *next_hop;
+  void *payload;
+  size_t msize;
+  uint32_t putlen;
+  size_t payload_size;
+  uint64_t key_value;
+  
+  msize = ntohs (message->size);
+  if (msize < sizeof (struct PeerPutMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+  
+  put = (struct PeerPutMessage *) message;
+  putlen = ntohl (put->put_path_length);
+   
+  if ((msize <
+       sizeof (struct PeerPutMessage) +
+       putlen * sizeof (struct GNUNET_PeerIdentity)) ||
+      (putlen >
+       GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+
+  best_known_dest = put->best_known_destination;
+  put_path = (struct GNUNET_PeerIdentity *) &put[1];
+  payload = &put_path[putlen];
+  options = ntohl (put->options);
+  intermediate_trail_id = put->intermediate_trail_id;
+  
+  payload_size = msize - (sizeof (struct PeerPutMessage) + 
+                          putlen * sizeof (struct GNUNET_PeerIdentity));
+  
+  switch (GNUNET_BLOCK_get_key (GDS_block_context, ntohl (put->block_type),
+                                payload, payload_size, &test_key))
+  {
+    case GNUNET_YES:
+      if (0 != memcmp (&test_key, &put->key, sizeof (struct GNUNET_HashCode)))
+      {
+        char *put_s = GNUNET_strdup (GNUNET_h2s_full (&put->key));
+        GNUNET_break_op (0);
+        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                    "PUT with key `%s' for block with key %s\n",
+                     put_s, GNUNET_h2s_full (&test_key));
+        GNUNET_free (put_s);
+        return GNUNET_YES;
+      }
+    break;
+    case GNUNET_NO:
+      GNUNET_break_op (0);
+      return GNUNET_YES;
+    case GNUNET_SYSERR:
+      /* cannot verify, good luck */
+      break;
+  }
+  
+   if (ntohl (put->block_type) == GNUNET_BLOCK_TYPE_REGEX) /* FIXME: do for all tpyes */
+  {
+    switch (GNUNET_BLOCK_evaluate (GDS_block_context,
+                                   ntohl (put->block_type),
+                                   NULL,    /* query */
+                                   NULL, 0, /* bloom filer */
+                                   NULL, 0, /* xquery */
+                                   payload, payload_size))
+    {
+    case GNUNET_BLOCK_EVALUATION_OK_MORE:
+    case GNUNET_BLOCK_EVALUATION_OK_LAST:
+      break;
+
+    case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
+    case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
+    case GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT:
+    case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
+    case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
+    case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
+    default:
+      GNUNET_break_op (0);
+      return GNUNET_OK;
+    }
+  }
+  
+  /* extend 'put path' by sender */
+  struct GNUNET_PeerIdentity pp[putlen + 1];
+  if (0 != (options & GNUNET_DHT_RO_RECORD_ROUTE))
+  {
+    memcpy (pp, put_path, putlen * sizeof (struct GNUNET_PeerIdentity));
+    pp[putlen] = *peer;
+    putlen++;
+  }
+  else
+    putlen = 0;
+  
+  memcpy (&key_value, &(put->key), sizeof (uint64_t));
+  if (0 != (GNUNET_CRYPTO_cmp_peer_identity (&best_known_dest, &my_identity)))
+  {
+    next_hop = GDS_ROUTING_get_next_hop (intermediate_trail_id, 
+                                         GDS_ROUTING_SRC_TO_DEST);
+  }
+  else
+  {
+     /*FIXME: Here you should use enum GDS_NEIGHBOURS_FINGER_TYPE in place of 0. */
+    next_hop = find_successor (key_value, &best_known_dest, 
+                               &intermediate_trail_id, GDS_FINGER_TYPE_NON_PREDECESSOR); 
+  }
+  
+  if (NULL == next_hop)
+  {
+    GNUNET_STATISTICS_update (GDS_stats,
+                              gettext_noop ("# Next hop to forward the packet not found "
+                              "trail setup request, packet dropped."),
+                              1, GNUNET_NO);
+    return GNUNET_SYSERR;
+  }
+  
+  GDS_CLIENTS_process_put (options,
+                           ntohl (put->block_type),
+                           ntohl (put->hop_count),
+                           ntohl (put->desired_replication_level),
+                           putlen, pp,
+                           GNUNET_TIME_absolute_ntoh (put->expiration_time),
+                           &put->key,
+                           payload,
+                           payload_size);
+  
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity(&my_identity, next_hop)) /* I am the final destination */
+  {
+    GDS_DATACACHE_handle_put (GNUNET_TIME_absolute_ntoh (put->expiration_time),
+                              &(put->key),putlen, pp, ntohl (put->block_type), 
+                              payload_size, payload);
+    return GNUNET_YES;
+  }
+  else
+  {
+    GDS_NEIGHBOURS_send_put (&put->key,  
+                             ntohl (put->block_type),ntohl (put->options),
+                             ntohl (put->desired_replication_level),
+                             &best_known_dest, &intermediate_trail_id, next_hop,
+                             ntohl (put->hop_count), putlen, pp,
+                             GNUNET_TIME_absolute_ntoh (put->expiration_time),
+                             payload, payload_size);
+     return GNUNET_YES;
+  }
+  return GNUNET_SYSERR;
+}
+
+
+/**
+ * Core handler for p2p get requests.
+ *
+ * @param cls closure
+ * @param peer sender of the request
+ * @param message message
+ * @return #GNUNET_OK to keep the connection open,
+ *         #GNUNET_SYSERR to close it (signal serious error)
+ */
+static int
+handle_dht_p2p_get (void *cls, const struct GNUNET_PeerIdentity *peer,
+                    const struct GNUNET_MessageHeader *message)
+{
+  struct PeerGetMessage *get;
+  struct GNUNET_PeerIdentity *get_path;
+  struct GNUNET_PeerIdentity best_known_dest;
+  struct GNUNET_HashCode intermediate_trail_id;
+  struct GNUNET_PeerIdentity *next_hop;
+  uint32_t get_length;
+  uint64_t key_value;
+  size_t msize;
+  
+  msize = ntohs (message->size);
+  if (msize < sizeof (struct PeerGetMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+  
+  get = (struct PeerGetMessage *)message;
+  get_length = ntohl (get->get_path_length);
+  best_known_dest = get->best_known_destination;
+  intermediate_trail_id = get->intermediate_trail_id;
+  if (get_length > 0)
+    get_path = (struct GNUNET_PeerIdentity *)&get[1];
+  
+  if ((msize <
+       sizeof (struct PeerGetMessage) +
+       get_length * sizeof (struct GNUNET_PeerIdentity)) ||
+       (get_length >
+        GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES; 
+  }
+
+  /* Add sender to get path */
+  struct GNUNET_PeerIdentity gp[get_length + 1];
+  memcpy (gp, get_path, get_length * sizeof (struct GNUNET_PeerIdentity));
+  gp[get_length + 1] = *peer;
+  get_length = get_length + 1;
+  
+  memcpy (&key_value, &(get->key), sizeof (uint64_t));
+  if (0 != (GNUNET_CRYPTO_cmp_peer_identity (&best_known_dest, &my_identity)))
+  {
+    next_hop = GDS_ROUTING_get_next_hop (intermediate_trail_id, 
+                                         GDS_ROUTING_SRC_TO_DEST);
+  }
+  else
+  {
+     /*FIXME: Here you should use enum GDS_NEIGHBOURS_FINGER_TYPE in place of 0. */
+    next_hop = find_successor (key_value, &best_known_dest, 
+                               &intermediate_trail_id, GDS_FINGER_TYPE_NON_PREDECESSOR);  
+  }
+  
+  if (NULL == next_hop)
+  {
+    GNUNET_STATISTICS_update (GDS_stats,
+                              gettext_noop ("# Next hop to forward the packet not found "
+                              "trail setup request, packet dropped."),
+                              1, GNUNET_NO);
+    return GNUNET_SYSERR;
+  }
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity(&my_identity, next_hop))
+  {
+    /* I am the destination.*/
+    struct GNUNET_PeerIdentity final_get_path[get_length+1];
+    struct GNUNET_PeerIdentity next_hop;
+
+    memcpy (final_get_path, gp, get_length * sizeof (struct GNUNET_PeerIdentity));
+    memcpy (&final_get_path[get_length+1], &my_identity, sizeof (struct GNUNET_PeerIdentity));
+    get_length = get_length + 1;
+    memcpy (&next_hop, &final_get_path[get_length-2], sizeof (struct GNUNET_PeerIdentity));
+    GDS_DATACACHE_handle_get (&(get->key),(get->block_type), NULL, 0, NULL, 0,
+                              get_length, final_get_path,&next_hop, &my_identity);
+    
+    return GNUNET_YES;
+  }
+  else
+  {
+    GDS_NEIGHBOURS_send_get (&(get->key), get->block_type, get->options, 
+                             get->desired_replication_level, &best_known_dest,
+                             &intermediate_trail_id, next_hop, 0,
+                             get_length, gp);  
+  }
+  return GNUNET_SYSERR;
+}
+
+
+/**
+ * Core handler for get result
+ * @param cls closure
+ * @param peer sender of the request
+ * @param message message
+ * @return #GNUNET_OK to keep the connection open,
+ *         #GNUNET_SYSERR to close it (signal serious error)
+ */
+static int
+handle_dht_p2p_get_result (void *cls, const struct GNUNET_PeerIdentity *peer,
+                           const struct GNUNET_MessageHeader *message)
+{
+  struct PeerGetResultMessage *get_result;
+  struct GNUNET_PeerIdentity *get_path;
+  struct GNUNET_PeerIdentity *put_path;
+  void *payload;
+  size_t payload_size;
+  size_t msize;
+  unsigned int getlen;
+  unsigned int putlen;
+  int current_path_index;
+  
+  msize = ntohs (message->size);
+  if (msize < sizeof (struct PeerGetResultMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+  
+  get_result = (struct PeerGetResultMessage *)message;
+  getlen = ntohl (get_result->get_path_length);
+  putlen = ntohl (get_result->put_path_length);
+  
+  if ((msize <
+       sizeof (struct PeerGetResultMessage) +
+       getlen * sizeof (struct GNUNET_PeerIdentity) + 
+       putlen * sizeof (struct GNUNET_PeerIdentity)) ||
+      (getlen >
+       GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity) ||
+      (putlen >
+         GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity))))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+  
+  if (getlen > 0)
+   get_path = (struct GNUNET_PeerIdentity *) &get_result[1];
+  payload = &get_path[getlen];
+  payload_size = msize - (sizeof (struct PeerGetResultMessage) + 
+                          getlen * sizeof (struct GNUNET_PeerIdentity));
+  
+  if (putlen > 0)
+    put_path = &get_path[1];
+  else
+    put_path = NULL;
+  
+  if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &(get_path[0]))))
+  {
+    GDS_CLIENTS_handle_reply (get_result->expiration_time, &(get_result->key), 
+                              getlen, get_path, putlen,
+                              put_path, get_result->type, payload_size, payload);
+    return GNUNET_YES;
+  }
+  else
+  {
+    current_path_index = search_my_index (get_path, getlen);
+    if (GNUNET_SYSERR == current_path_index )
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+    GDS_NEIGHBOURS_send_get_result (&(get_result->key), get_result->type,
+                                    &get_path[current_path_index - 1],
+                                    &(get_result->querying_peer), putlen, put_path,
+                                    getlen, get_path, get_result->expiration_time,
+                                    payload, payload_size);
+    return GNUNET_YES;
+  }  
+  return GNUNET_SYSERR;
+}
+
+
+/* Core handle for PeerTrailSetupMessage.
+ * @param cls closure
+ * @param message message
+ * @param peer peer identity this notification is about
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
+ */
+static int
+handle_dht_p2p_trail_setup (void *cls, const struct GNUNET_PeerIdentity *peer,
+                            const struct GNUNET_MessageHeader *message)
+{
+  const struct PeerTrailSetupMessage *trail_setup;
+  const struct GNUNET_PeerIdentity *trail_peer_list;
+  struct GNUNET_PeerIdentity local_best_known_destination; 
+  struct GNUNET_PeerIdentity current_destination;
+  struct GNUNET_PeerIdentity *next_hop;
+  struct GNUNET_PeerIdentity next_peer;
+  struct FriendInfo *target_friend;
+  struct GNUNET_PeerIdentity source;
+  uint64_t ultimate_destination_finger_value;
+  struct GNUNET_HashCode new_intermediate_trail_id;
+  struct GNUNET_HashCode intermediate_trail_id;
+  struct GNUNET_HashCode trail_id;
+  unsigned int is_predecessor;
+  uint32_t trail_length;
+  size_t msize;
+
+  msize = ntohs (message->size);
+  /* There are PeerId's appended to the end of the message! */
+  if (msize < sizeof (struct PeerTrailSetupMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+
+  trail_setup = (const struct PeerTrailSetupMessage *) message;
+  trail_length = (msize - sizeof (struct PeerTrailSetupMessage))/
+                  sizeof (struct GNUNET_PeerIdentity);
+  if ((msize - sizeof (struct PeerTrailSetupMessage)) % 
+      sizeof (struct GNUNET_PeerIdentity) != 0)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_OK;      
+  }           
+  
+  trail_peer_list = (const struct GNUNET_PeerIdentity *)&trail_setup[1];
+  current_destination = trail_setup->best_known_destination;
+  trail_id = trail_setup->trail_id;
+  ultimate_destination_finger_value = 
+          GNUNET_ntohll (trail_setup->ultimate_destination_finger_value);
+  source = trail_setup->source_peer;
+  is_predecessor = ntohl (trail_setup->is_predecessor);
+  intermediate_trail_id = trail_setup->intermediate_trail_id;
+  
+  if (GNUNET_YES == GDS_ROUTING_threshold_reached())
+  {
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
+    GDS_NEIGHBOURS_send_trail_rejection (source, ultimate_destination_finger_value,
+                                         my_identity, is_predecessor,
+                                         trail_peer_list, trail_length,
+                                         trail_id, target_friend,
+                                         CONGESTION_TIMEOUT);
+    return GNUNET_OK;
+  }
+
+  
+  next_hop = find_successor (ultimate_destination_finger_value,
+                             &local_best_known_destination,
+                             &new_intermediate_trail_id, is_predecessor);
+
+  /* Are we just a part of a trail towards a finger (current_destination)? */
+  if (0 != (GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &current_destination)))
+  {
+    struct GNUNET_PeerIdentity *closest_peer;
+    
+    /* Select best successor among one found locally and current_destination.*/
+    closest_peer = select_closest_peer (&local_best_known_destination,
+                                        &current_destination,
+                                        ultimate_destination_finger_value,
+                                        is_predecessor);
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity (&current_destination, 
+                                              closest_peer))
+    {
+      next_hop = GDS_ROUTING_get_next_hop (intermediate_trail_id,
+                                           GDS_ROUTING_SRC_TO_DEST);
+      if (NULL == next_hop) /* FIXME: Here we found next_hop NULL from routing table,
+                             * but we still have a next_hop from find_successor.
+                             * Should we not break and choose that next_hop. */
+      {
+        GNUNET_break_op (0);
+        return GNUNET_SYSERR;
+      }
+      
+      local_best_known_destination =  current_destination;
+      new_intermediate_trail_id = intermediate_trail_id;
+    }
+  }
+  
+  GNUNET_assert (NULL != next_hop);
+  
+  /* Am I the final destination? */
+  if (0 == (GNUNET_CRYPTO_cmp_peer_identity (next_hop, &my_identity)))
+  {
+    if (0 == trail_length)
+      memcpy (&next_peer, &source, sizeof (struct GNUNET_PeerIdentity));
+    else
+      memcpy (&next_peer, &trail_peer_list[trail_length-1], sizeof (struct GNUNET_PeerIdentity));
+
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_peer);
+    GDS_NEIGHBOURS_send_trail_setup_result (source,
+                                            my_identity,
+                                            target_friend, trail_length,
+                                            trail_peer_list,
+                                            ultimate_destination_finger_value,
+                                            is_predecessor, trail_id);
+  }
+  else
+  {
+    struct GNUNET_PeerIdentity peer_list[trail_length + 1];
+
+    memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
+    peer_list[trail_length] = my_identity;
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+    GDS_NEIGHBOURS_send_trail_setup (source,
+                                     ultimate_destination_finger_value,
+                                     local_best_known_destination,
+                                     target_friend, trail_length + 1, peer_list,
+                                     is_predecessor, trail_id,
+                                     &new_intermediate_trail_id);
+  }
+  return GNUNET_OK;
+}
+
+
+/* FIXME: here we are calculating my_index and comparing also in this function.
+   And we are doing it again here in this function. Re factor the code. */
+/**
+ * Check if sender_peer and peer from which we should receive the message are
+ * same or different.
+ * @param trail_peer_list List of peers in trail
+ * @param trail_length Total number of peers in @a trail_peer_list
+ * @param sender_peer Peer from which we got the message. 
+ * @param finger_identity Finger to which trail is setup. It is not part of trail.
+ * @return #GNUNET_YES if sender_peer and peer from which we should receive the
+ *                    message are different.
+ *         #GNUNET_NO if sender_peer and peer from which we should receive the
+ *                    message are different. 
+ */
+static int
+is_sender_peer_correct (const struct GNUNET_PeerIdentity *trail_peer_list,
+                        unsigned int trail_length,
+                        const struct GNUNET_PeerIdentity *sender_peer,
+                        struct GNUNET_PeerIdentity finger_identity,
+                        struct GNUNET_PeerIdentity source_peer)
 {
-  struct GNUNET_PeerIdentity *finger_peer_id;
-  uint32_t peer_id;
-  uint32_t finger_id;
+  int my_index;
   
-  finger_peer_id = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
-  /* Copy unsigned char array into peer_id. */
-  if (0 == memcpy(&peer_id,&my_identity.public_key.q_y,sizeof(uint32_t)))
-    return NULL;
+  if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&source_peer,
+                                             &my_identity)))
+  {
+    if (trail_length > 0)
+    {
+      // source, then trail_length > 0, trail_peer_list[0] != peer
+      if (0 != GNUNET_CRYPTO_cmp_peer_identity (&trail_peer_list[0],
+                                                sender_peer))
+        return GNUNET_NO;
+    }
+    else
+    {
+      // source, trail_length == 0, finger != peer
+      if (0 != GNUNET_CRYPTO_cmp_peer_identity (sender_peer,
+                                                &finger_identity))
+        return GNUNET_NO;
+    }
+  }
+  else
+  {
+    my_index = search_my_index (trail_peer_list, trail_length);
+    if (-1 == my_index)
+      return GNUNET_NO;
+    
+    // my_index == trail_length -1, finger != peer
+    if ((trail_length - 1) == my_index)
+    {
+      if (0 != GNUNET_CRYPTO_cmp_peer_identity (sender_peer,
+                                                &finger_identity))
+        return GNUNET_NO;
+    }
+    else
+    {
+      // FIXME: if trail_peer_list[my_index + 1] != peer
+      if (0 != GNUNET_CRYPTO_cmp_peer_identity (sender_peer,
+                                                &trail_peer_list[my_index + 1]))
+        return GNUNET_NO;
+    }
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Core handle for p2p trail setup result messages.
+ * @param closure
+ * @param message message
+ * @param peer sender of this message. 
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
+ */
+static int
+handle_dht_p2p_trail_setup_result(void *cls, const struct GNUNET_PeerIdentity *peer,
+                                  const struct GNUNET_MessageHeader *message)
+{
+  const struct PeerTrailSetupResultMessage *trail_result;
+  const struct GNUNET_PeerIdentity *trail_peer_list;
+  struct GNUNET_PeerIdentity next_hop;
+  struct FriendInfo *target_friend;
+  struct GNUNET_PeerIdentity querying_peer;
+  struct GNUNET_PeerIdentity finger_identity;
+  uint32_t trail_length;
+  uint64_t ulitmate_destination_finger_value;
+  uint32_t is_predecessor;
+  struct GNUNET_HashCode trail_id;
+  int my_index;
+  size_t msize;
+
+  msize = ntohs (message->size);
+  if (msize < sizeof (struct PeerTrailSetupResultMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+
+  trail_result = (const struct PeerTrailSetupResultMessage *) message;
+  trail_length = (msize - sizeof (struct PeerTrailSetupResultMessage))/
+                  sizeof (struct GNUNET_PeerIdentity);
+  if ((msize - sizeof (struct PeerTrailSetupResultMessage)) % 
+      sizeof (struct GNUNET_PeerIdentity) != 0)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_OK;      
+  }       
   
-  /* We do all the arithmetic operation on peer_id to get finger_id*/
-  finger_id = (uint32_t)(peer_id + pow(2,current_finger_id)) % MAX_FINGERS;
-  /* Copy the finger_id to finger_peer_id. */
-  if (0 == memcpy(&finger_peer_id->public_key.q_y,&finger_id,sizeof(uint32_t)))
-    return NULL;
+  is_predecessor = htonl (trail_result->is_predecessor);
+  querying_peer = trail_result->querying_peer;
+  finger_identity = trail_result->finger_identity;
+  trail_id = trail_result->trail_id;
+  trail_peer_list = (const struct GNUNET_PeerIdentity *) &trail_result[1];
+  ulitmate_destination_finger_value = 
+          GNUNET_ntohll (trail_result->ulitmate_destination_finger_value);
+  /* FIXME: here we are calculating my_index and comparing also in this function.
+   And we are doing it again here in this function. Re factor the code. */
+  /* Ensure that sender peer is the peer from which we were expecting the message. */
+  if (GNUNET_NO == is_sender_peer_correct (trail_peer_list,
+                                           trail_length,
+                                           peer, finger_identity, querying_peer))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
   
+  /* Am I the one who initiated the query? */
+  if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&querying_peer,
+                                             &my_identity)))
+  {
+    finger_table_add (finger_identity, trail_peer_list,
+                      trail_length, ulitmate_destination_finger_value,
+                      is_predecessor, trail_id);
+    return GNUNET_YES;
+  }
   
-  /* FIXME: Here I increment the index so that next time when we enter this 
-    function, then we begin the search from current index. Is it possible
-    to set this value when we add the finger id to our finger table. No, because
-    even there is a call going on to find the finger, we can start another call 
-    to search another peer.  */
-  current_finger_id = (current_finger_id+1) % MAX_FINGERS;
+  my_index = search_my_index(trail_peer_list, trail_length);
+  if (-1 == my_index)
+  {
+    GNUNET_break_op(0);
+    return GNUNET_SYSERR;
+  }
   
-  /* Check if you already have an entry in finger_peers for this finger_id.
-   If yes then again look for a new finger_id. */
-   /*if(NULL != GNUNET_CONTAINER_multipeermap_get(finger_peers,finger_peer_id))
-   {
-   
-     finger_peer_id = finger_id_to_search();
-   }
-  */
-  return finger_peer_id;
+  if (my_index == 0)
+    next_hop = trail_result->querying_peer;
+  else
+    next_hop = trail_peer_list[my_index - 1];
+
+  /* If the querying_peer is its own finger, then don't add an entry in routing
+   * table as querying peer will discard the trail.
+   */
+  if (0 != (GNUNET_CRYPTO_cmp_peer_identity (&(trail_result->querying_peer),
+                                             &(trail_result->finger_identity))))
+  {
+    GDS_ROUTING_add (trail_id, next_hop, *peer);
+  }
+
+  target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
+  GDS_NEIGHBOURS_send_trail_setup_result (querying_peer, finger_identity,
+                                          target_friend, trail_length, trail_peer_list,
+                                          is_predecessor, 
+                                          ulitmate_destination_finger_value,
+                                          trail_id);
+  return GNUNET_OK;
 }
 
 
 /**
- * TODO: Implement after testing friend/finger map.
- * TODO: Handle the case when we already have a trail to our predecessor in
- * the network. 
- * This function will be needed when we are handling node joins/fails
- * to maintain correct pointer to our predecessor and successor in the network. 
- * Find immediate predecessor in the network.
- * @param me my own identity
- * @return peer identity of immediate predecessor.
+ * Invert the trail.
+ * @param trail Trail to be inverted
+ * @param trail_length Total number of peers in the trail.
+ * @return Updated trail
  */
-static
-struct GNUNET_PeerIdentity*
-find_immediate_predecessor()
+static struct GNUNET_PeerIdentity *
+invert_trail (const struct GNUNET_PeerIdentity *trail,
+              unsigned int trail_length)
 {
-  /* Using your own peer identity, calculate your predecessor
-   * in the network. Try to setup path to this predecessor using
-   * the same logic as used for other fingers. 
-   * If we already have a trail to our predecessor then send NULL and 
-   * calling function should be able to handle that case.
-  */
-  return NULL;
+  int i;
+  int j;
+  struct GNUNET_PeerIdentity *inverted_trail;
+
+  inverted_trail = GNUNET_malloc (sizeof(struct GNUNET_PeerIdentity) *
+                                  trail_length);
+  i = 0;
+  j = trail_length - 1;
+  while (i < trail_length)
+  {
+    inverted_trail[i] = trail[j];
+    i++;
+    j--;
+  }
+  return inverted_trail;
 }
 
 
 /**
- * Task to send a find finger trail message. We attempt to find trail
- * to our finger in the network.
- *
- * @param cls closure for this task
- * @param tc the context under which the task is running
+ * FIXME: 
+ * my_current_predecessor != source_peer. get the trail to reach to 
+ * my_current_predecessor and append it to the trail from source to me.
+ * It can contain duplicate elements. Need to get the correct one. 
+ * In case the source peer of verify successor message is not my successor,
+ * then construct a trail from source peer to my current predecessor.
+ * @param my_predecessor my current predecessor.
+ * @param current_trail Trail from source to me.
+ * @param current_trail_length Total number of peers in @a current_trail
+ * @param new_trail_length [out] Total number of peers in updated trail.
+ * @return Updated trail from source peer to my_predecessor.
  */
-static void
-send_find_finger_trail_message (void *cls,
-                        const struct GNUNET_SCHEDULER_TaskContext *tc)
+static struct GNUNET_PeerIdentity *
+trail_source_to_my_predecessor (const struct GNUNET_PeerIdentity *current_trail,
+                                unsigned int current_trail_length,
+                                unsigned int *new_trail_length)
 {
-  struct GNUNET_PeerIdentity *finger_peer_id;
-  struct FriendInfo *friend_peer_id;
-  struct GNUNET_TIME_Relative next_send_time;
+  struct GNUNET_PeerIdentity *new_trail;
+  struct Trail *trail_list_iterator;
+  struct Trail_Element *trail_iterator;
+  struct FingerInfo *my_predecessor;
+  unsigned int i;
+  unsigned int j;
+  unsigned int shortest_trail_length = 0;
+  unsigned int trail_index = 0;
  
-  /* We already have found trail to each of our possible fingers in the network. */
-  if (GNUNET_CONTAINER_multipeermap_size(finger_peers) == MAX_FINGERS)
+  my_predecessor = GNUNET_CONTAINER_multihashmap32_get (finger_hashmap,
+                                                        PREDECESSOR_FINGER_ID);
+
+  for (i = 0; i < my_predecessor->trails_count; i++)
   {
-    /* We can find trail to our immediate predecessor in the network. */  
-    finger_peer_id = find_immediate_predecessor();  
-    if(NULL == finger_peer_id)
-    {
-      /* We already have a trail to reach to immediate predecessor. */
-      goto new_find_trail_request;
-    }
+    trail_list_iterator = &my_predecessor->trail_list[i];
+    if (trail_list_iterator->trail_length > shortest_trail_length)
+      continue;
+    shortest_trail_length = trail_list_iterator->trail_length;
+    trail_index = i;
   }
-  else
+
+  *new_trail_length = current_trail_length + shortest_trail_length + 1;
+  new_trail = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity) *
+                             *new_trail_length);
+  memcpy (new_trail, current_trail,
+         current_trail_length * sizeof (struct GNUNET_PeerIdentity));
+  new_trail[current_trail_length + 1] = my_identity;
+
+  i = 0;
+  j = current_trail_length + 1;
+  trail_list_iterator = &my_predecessor->trail_list[trail_index];
+  trail_iterator = trail_list_iterator->trail_head;
+  while ( i < shortest_trail_length)
   {
-    /* Find the finger_peer_id for which we want to setup the trail */
-    finger_peer_id = finger_id_to_search();
+    new_trail[j] = trail_iterator->peer;
+    j++;
+    i++;
+    trail_iterator = trail_iterator->next;
   }
+
+  *new_trail_length = j;
+  return new_trail;
+}
+
+
+/**
+ * FIMXE: IF you update your predecessor with new finger identity or added
+ * a new trail, then you should send add_trail message or else the peers
+ * which are part of the trail to reach to your new predecessor will not 
+ * know its existence.
+ * Check if we already have an entry for predecessor in our finger hashmap.
+ * If no, then add new predecessor.
+ * If yes, then compare new and existing entry. If both are same, and there is
+ * place to store more trail, then add entry. If both are different then choose
+ * the closest one. 
+ * @param finger Peer which claims to be our predecessor.
+ * @param trail Trail to reach from @a predecessor to me, NOT including both endpoints
+ * @param trail_length Total number of peers in @a trail.
+ * @return #GNUNET_YES if we added the new entry.
+ *         #GNUNET_NO, if new entry is not the closest predecessor or both new
+ *                     and existing entry are same. 
+ */
+static struct GNUNET_PeerIdentity 
+compare_and_update_predecessor (struct GNUNET_PeerIdentity finger_identity,
+                                const struct GNUNET_PeerIdentity *trail,
+                                unsigned int trail_length)
+{
+  struct FingerInfo *current_predecessor;
+  struct GNUNET_PeerIdentity *closest_peer;
+  struct GNUNET_PeerIdentity *inverted_trail;
+  struct GNUNET_HashCode trail_id;
+  uint64_t finger_value;
   
-  /* Choose a friend randomly from your friend_peers map. */
-  friend_peer_id = get_random_friend();
+  current_predecessor = GNUNET_CONTAINER_multihashmap32_get (finger_hashmap,
+                                                             PREDECESSOR_FINGER_ID);
+  inverted_trail = invert_trail (trail, trail_length);
   
-  /* We found a friend.*/
-  if(NULL != friend_peer_id)
-    GDS_NEIGHBOURS_trail_setup(finger_peer_id, friend_peer_id);
+  /* No predecessor in finger table. Add the new predecessor. */
+  if (NULL == current_predecessor)
+  {
+    add_new_entry (finger_identity, inverted_trail, trail_length,
+                   trail_id, PREDECESSOR_FINGER_ID);
+    return finger_identity;
+  }
   
+  /* If the new predecessor and current predecessor are not same, then choose
+   the closest one. */
+  if (0 != GNUNET_CRYPTO_cmp_peer_identity (&finger_identity, 
+                                            &current_predecessor->finger_identity))
+  {
+    finger_value = compute_predecessor_identity_value();
+    closest_peer = select_closest_peer (&current_predecessor->finger_identity,
+                                        &finger_identity,
+                                        finger_value, PREDECESSOR_FINGER_ID);
+    
+    /* If the finger is the closest predecessor, then add it in finger table
+     * and free resources of current_predecessor. */
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger_identity, closest_peer))
+    {
+      GNUNET_assert (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+                                                           &finger_identity));
+
+      send_trail_teardown (current_predecessor);
+      decrement_friend_trail_count (current_predecessor);
+      free_finger (current_predecessor);
+      add_new_entry (finger_identity, inverted_trail, trail_length,
+                     trail_id, PREDECESSOR_FINGER_ID);
+      return finger_identity;
+    }
+  }
   
-  new_find_trail_request:
-
-  next_send_time.rel_value_us =
-      DHT_MINIMUM_FIND_FINGER_TRAIL_INTERVAL.rel_value_us +
-      GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
-                                DHT_MAXIMUM_FIND_FINGER_TRAIL_INTERVAL.rel_value_us /
-                                (current_finger_id + 1));
-  find_finger_trail_task =
-      GNUNET_SCHEDULER_add_delayed (next_send_time, &send_find_finger_trail_message,
-                                    NULL);
+  /* If both finger and current_predecessor are same as my_identity, then do nothing. */
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger_identity, &my_identity))
+      return current_predecessor->finger_identity;
+    
+  /* If the current_predecessor is not a friend. */
+  if (NULL ==
+        GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                           &current_predecessor->finger_identity))
+  {
+    if (current_predecessor->trails_count < MAXIMUM_TRAILS_PER_FINGER)
+      add_new_trail (current_predecessor, inverted_trail, 
+                     trail_length, trail_id);
+    //FIXME: here you should send add a new trail as you don't have this trail
+    // in the routing table. 
+    else
+      select_and_replace_trail (current_predecessor, inverted_trail,
+                                trail_length, trail_id);
+     //FIXME: here you should send add a new trail as you don't have this trail
+    // in the routing table. 
+  }
+  return current_predecessor->finger_identity;
 }
 
 
 /**
- * Method called whenever a peer connects.
- *
+ * Core handle for p2p verify successor messages.
  * @param cls closure
+ * @param message message
  * @param peer peer identity this notification is about
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
-static void
-handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
+static int
+handle_dht_p2p_verify_successor(void *cls, const struct GNUNET_PeerIdentity *peer,
+                                const struct GNUNET_MessageHeader *message)
 {
-  struct FriendInfo *ret;
+  struct PeerVerifySuccessorMessage *vsm;
+  struct GNUNET_PeerIdentity successor;
+  struct GNUNET_PeerIdentity source_peer;
+  struct GNUNET_PeerIdentity *next_hop;
+  struct FriendInfo *target_friend;
+  struct GNUNET_HashCode trail_id;
+  struct GNUNET_PeerIdentity current_predecessor;
+  struct GNUNET_PeerIdentity *trail;
+  struct GNUNET_PeerIdentity *new_trail;
+  unsigned int trail_length;
+  unsigned int new_trail_length;
+  size_t msize;
 
-  /* Check for connect to self message */
-  if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
-    return;
+  msize = ntohs (message->size);
+  if (msize != sizeof (struct PeerVerifySuccessorMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Connected to %s\n",
-              GNUNET_i2s (peer));
+  vsm = (struct PeerVerifySuccessorMessage *) message;
+  trail_length = (msize - sizeof (struct PeerVerifySuccessorMessage))/
+                  sizeof (struct GNUNET_PeerIdentity);
+  if ((msize - sizeof (struct PeerVerifySuccessorMessage)) % 
+      sizeof (struct GNUNET_PeerIdentity) != 0)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_OK;      
+  }           
   
-  /* If peer already exists in our friend_peers, then exit. */
-  if (GNUNET_YES ==
-      GNUNET_CONTAINER_multipeermap_contains (friend_peers,
-                                              peer))
+  trail = (struct GNUNET_PeerIdentity *)&vsm[1];
+  source_peer = vsm->source_peer;
+  successor = vsm->successor;
+  trail_id = vsm->trail_id;
+
+  /* I am not the successor of source_peer. Pass the message to next_hop on
+   * the trail. */
+  if(0 != (GNUNET_CRYPTO_cmp_peer_identity (&successor, &my_identity)))
   {
-    GNUNET_break (0);
-    return;
+    next_hop = GDS_ROUTING_get_next_hop (trail_id, GDS_ROUTING_SRC_TO_DEST);
+    if (NULL == next_hop)
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+    GDS_NEIGHBOURS_send_verify_successor_message (source_peer, successor,
+                                                  trail_id, trail, trail_length,
+                                                  target_friend);
+    return GNUNET_OK;
+  }
+  
+  target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
+  current_predecessor = compare_and_update_predecessor (source_peer, 
+                                                        trail, trail_length);
+  /* source_peer is my current_predecessor. */
+  if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&current_predecessor, &source_peer)))
+  {
+    /* Here we don't need to pass the trail as it is of new use. We can pass
+     NULL and trail length = 0. */
+    new_trail = NULL;
+    new_trail_length = 0;
+  }
+  else
+  { 
+    new_trail = trail_source_to_my_predecessor (trail, trail_length, 
+                                                &new_trail_length);
   }
+  GDS_NEIGHBOURS_send_verify_successor_result (source_peer, my_identity,
+                                               current_predecessor, trail_id,
+                                               new_trail, new_trail_length,
+                                               GDS_ROUTING_DEST_TO_SRC,
+                                               target_friend);
+  return GNUNET_OK;
+}
 
-  GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# peers connected"), 1,
-                            GNUNET_NO);
 
-  ret = GNUNET_new (struct FriendInfo);
-  ret->id = *peer;
+/**
+ * Here you may or may not be the predecessor. If you are then also while adding
+ * you have to check and if not then notify new successor. But again the trail
+ * may be a problem here. 
+ * FIXME: I will keep the logic to remove the old trail to reach from me to
+ * my old successor here and move adding a new trail from me to new successor to notify
+ * new successor. And in case if the new successor also take it as predecessor
+ * then call add_trail.
+ * Core handle for p2p verify successor result messages.
+ * @param cls closure
+ * @param message message
+ * @param peer peer identity this notification is about
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
+ */
+static int
+handle_dht_p2p_verify_successor_result(void *cls, const struct GNUNET_PeerIdentity *peer,
+                                       const struct GNUNET_MessageHeader *message)
+{
+  struct PeerVerifySuccessorResultMessage *vsrm;
+  enum GDS_ROUTING_trail_direction trail_direction;
+  struct GNUNET_HashCode trail_id;
+  unsigned int new_trail_length;
+  struct GNUNET_PeerIdentity *new_trail;
+  struct GNUNET_PeerIdentity querying_peer;
+  struct GNUNET_PeerIdentity current_predecessor;
+  //struct GNUNET_PeerIdentity old_successor;
+  struct GNUNET_PeerIdentity *next_hop;
+  struct FriendInfo *target_friend;
+  size_t msize;
 
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONTAINER_multipeermap_put (friend_peers,
-                                                    peer, ret,
-                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+  msize = ntohs (message->size);
+  if (msize != sizeof (struct PeerVerifySuccessorResultMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+  vsrm = (struct PeerVerifySuccessorResultMessage *) message;
+  new_trail_length = (msize - sizeof (struct PeerTrailSetupMessage))/
+                      sizeof (struct GNUNET_PeerIdentity);
+  if ((msize - sizeof (struct PeerTrailSetupMessage)) % 
+      sizeof (struct GNUNET_PeerIdentity) != 0)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_OK;      
+  }           
+  trail_direction = ntohl (vsrm->trail_direction);
+  trail_id = vsrm->trail_id;
 
-  /* got a first connection, good time to start with FIND FINGER TRAIL requests... */
-  if (1 == GNUNET_CONTAINER_multipeermap_size(friend_peers))
-    find_finger_trail_task = GNUNET_SCHEDULER_add_now (&send_find_finger_trail_message, NULL);
+  new_trail = (struct GNUNET_PeerIdentity *) &vsrm[1];
+  querying_peer = vsrm->querying_peer;
+  current_predecessor = vsrm->current_predecessor;
+  //old_successor = vsrm->source_successor;
+
+  if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&querying_peer, &my_identity)))
+  {
+#if 0
+    //Here I am the final quering peer and its verify successor result.
+    // now I know it is for successor and now I don't have any finger_map_index
+    // as parameter in finger_table_add. 
+    // BIG FIX HOW TO ADAPT IT FOR change in finger_table_add
+    struct GNUNET_HashCode new_finger_trail_id;
+    /* FIXME: generate a new trail id. */
+    if (GNUNET_YES == finger_table_add (my_new_successor,
+                                        new_trail,
+                                        new_trail_length,
+                                        PREDECESSOR_FINGER_ID, new_finger_trail_id))
+    {
+      if (new_trail_length > 0)
+        target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                           &new_trail[0]);
+      else
+        target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                           peer);
+      GDS_NEIGHBOURS_send_trail_teardown (my_identity, old_successor, trail_id,
+                                          GDS_ROUTING_SRC_TO_DEST, target_friend);
+      GDS_NEIGHBOURS_send_notify_new_successor (my_identity, my_new_successor,
+                                                new_trail,
+                                                new_trail_length,
+                                                new_finger_trail_id, target_friend);
+    }
+#endif
+    return GNUNET_OK;
+  }
+
+  GNUNET_assert (NULL != (next_hop =
+                         GDS_ROUTING_get_next_hop (trail_id, trail_direction)));
+  target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+  GDS_NEIGHBOURS_send_verify_successor_result (querying_peer,
+                                               vsrm->source_successor,
+                                               current_predecessor, trail_id,
+                                               new_trail,
+                                               new_trail_length,
+                                               trail_direction, target_friend);
+  return GNUNET_OK;
 }
 
 
-/**
- * FIXME: Implement after testing finger/friend table setup.
- * Method called whenever a peer disconnects.
- *
+/*
+ * FIXME: here before adding the peer you again have to call to check 
+ * if its correct predecessor or not.
+ * Core handle for p2p notify new successor messages.
  * @param cls closure
+ * @param message message
  * @param peer peer identity this notification is about
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
-static void
-handle_core_disconnect (void *cls,
-                       const struct GNUNET_PeerIdentity *peer)
+static int
+handle_dht_p2p_notify_new_successor(void *cls, const struct GNUNET_PeerIdentity *peer,
+                                    const struct GNUNET_MessageHeader *message)
 {
-  /**
-   * 1. remove the friend from the friend map.
-   * 2. remove the trail for the fingers for which this peer was the first hop.
-   * 3. start send_find_finger_trail for these fingers to find a new trail 
-   * in the network.
-   * 4. Also when a node gets disconnected, how should we update pointers of its
-   * immediate successor and predecessor in the network ?
-   * 5. Also how do we distribute the keys in the network?
-   * 6. Here is case where we started put operation but a peer got disconnected and 
-      we removed the entry from the table. How to handle such a case. 
-   */
+  struct PeerNotifyNewSuccessorMessage *nsm;
+  struct GNUNET_PeerIdentity *trail;
+  struct GNUNET_PeerIdentity source;
+  struct GNUNET_PeerIdentity new_successor;
+  struct FriendInfo *target_friend;
+  struct GNUNET_PeerIdentity closest_successor;
+  struct GNUNET_HashCode trail_id;
+  unsigned int my_index;
+  struct GNUNET_PeerIdentity next_hop;
+  size_t msize;
+  uint32_t trail_length;
+
+  msize = ntohs (message->size);
+  if (msize != sizeof (struct PeerNotifyNewSuccessorMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+
+  nsm = (struct PeerNotifyNewSuccessorMessage *) message;
+  trail_length = (msize - sizeof (struct PeerNotifyNewSuccessorMessage))/
+                  sizeof (struct GNUNET_PeerIdentity);
+  if ((msize - sizeof (struct PeerTrailRejectionMessage)) % 
+      sizeof (struct GNUNET_PeerIdentity) != 0)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_OK;      
+  }  
+
+  if ((msize < sizeof (struct PeerNotifyNewSuccessorMessage) +
+               trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
+      (trail_length >
+       GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+
+  trail = (struct GNUNET_PeerIdentity *) &nsm[1];
+  source  = nsm->source_peer;
+  new_successor = nsm->new_successor;
+  trail_id = nsm->trail_id;
+
+  /* I am the new_successor to source_peer. */
+  if ( 0 == GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &new_successor))
+  {
+    closest_successor = compare_and_update_predecessor (source, trail, trail_length);
+    /* If the source peer is my new predecessor, then add trail in the
+     routing table of all the peers which are part of the trail to reach from 
+     me to source, NOT including endpoints. 
+     FIXME: In case we have same predecessor but we added just a new trail, then
+     we are not sending add a new trail message. Need to update this. */
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity (&closest_successor, &source))
+    {
+      struct GNUNET_HashCode new_trail_id;
+      target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                         peer);
+      GDS_NEIGHBOURS_send_add_trail (my_identity, source, new_trail_id,
+                                     trail, trail_length, target_friend);
+    }
+    return GNUNET_OK;
+  }
+
+  my_index = search_my_index (trail, trail_length);
+  if (-1 == my_index)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if (trail_length == my_index)
+    next_hop = new_successor;
+  else
+    next_hop = trail[my_index + 1];
+  GNUNET_assert (GNUNET_OK == GDS_ROUTING_add (trail_id, *peer, next_hop));
+  target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
+  GDS_NEIGHBOURS_send_notify_new_successor (source, new_successor, trail,
+                                            trail_length,
+                                            trail_id, target_friend);
+  return GNUNET_OK;
 }
 
 
-/**
- * To be called on core init/fail.
- *
- * @param cls service closure
- * @param identity the public identity of this peer
- */
-static void
-core_init (void *cls,
-           const struct GNUNET_PeerIdentity *identity)
-{
-  my_identity = *identity;
-  GNUNET_CRYPTO_hash (identity,
-                     sizeof (struct GNUNET_PeerIdentity),
-                     &my_identity_hash);
+/**
+ * FIXME: Here you should keep the trail id with you.
+ * Core handler for P2P trail rejection message
+ * @param cls closure
+ * @param message message
+ * @param peer peer identity this notification is about
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
+ */
+static int
+handle_dht_p2p_trail_rejection(void *cls, const struct GNUNET_PeerIdentity *peer,
+                               const struct GNUNET_MessageHeader *message)
+{
+  struct PeerTrailRejectionMessage *trail_rejection;
+  unsigned int trail_length;
+  struct GNUNET_PeerIdentity *trail_peer_list;
+  struct FriendInfo *target_friend;
+  struct GNUNET_TIME_Relative congestion_timeout;
+  struct GNUNET_HashCode trail_id;
+  struct GNUNET_PeerIdentity next_destination;
+  struct GNUNET_HashCode new_intermediate_trail_id;
+  struct GNUNET_PeerIdentity next_peer;
+  struct GNUNET_PeerIdentity source;
+  struct GNUNET_PeerIdentity *next_hop;
+  uint64_t ultimate_destination_finger_value;
+  unsigned int is_predecessor;
+  size_t msize;
+
+  msize = ntohs (message->size);
+  if (msize != sizeof (struct PeerTrailRejectionMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_YES;
+  }
+
+  trail_rejection = (struct PeerTrailRejectionMessage *) message;
+  trail_length = (msize - sizeof (struct PeerTrailRejectionMessage))/
+                  sizeof (struct GNUNET_PeerIdentity);
+  if ((msize - sizeof (struct PeerTrailRejectionMessage)) % 
+      sizeof (struct GNUNET_PeerIdentity) != 0)
+  {
+    GNUNET_break_op (0);
+    return GNUNET_OK;      
+  }           
+
+  trail_peer_list = (struct GNUNET_PeerIdentity *)&trail_rejection[1];
+  is_predecessor = ntohl (trail_rejection->is_predecessor);
+  congestion_timeout = trail_rejection->congestion_time;
+  source = trail_rejection->source_peer;
+  trail_id = trail_rejection->trail_id;
+  ultimate_destination_finger_value = 
+          trail_rejection->ultimate_destination_finger_value;
+
+  /* First set the congestion time of the friend that sent you this message. */
+  target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
+  target_friend->congestion_timestamp = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get(),
+                                                                 congestion_timeout);
+
+  if(0 == (GNUNET_CRYPTO_cmp_peer_identity (&my_identity, &source)))
+  {
+    return GNUNET_OK;
+  }
+
+  /* If I am congested then pass this message to peer before me in trail. */
+  if(GNUNET_YES == GDS_ROUTING_threshold_reached())
+  {
+    struct GNUNET_PeerIdentity *new_trail;
+    unsigned int new_trail_length;
+
+    if (trail_length == 1)
+    {
+      new_trail = NULL;
+      new_trail_length = 0;
+      next_hop = &source;
+    }
+    else
+    {
+      next_hop = &trail_peer_list[trail_length - 2];
+      /* Remove myself from the trail. */
+      new_trail_length = trail_length -1;
+      new_trail = GNUNET_malloc (new_trail_length * sizeof (struct GNUNET_PeerIdentity));
+      memcpy (new_trail, trail_peer_list, new_trail_length * sizeof (struct GNUNET_PeerIdentity));
+    }
+
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+    GDS_NEIGHBOURS_send_trail_rejection (source,
+                                         ultimate_destination_finger_value,
+                                         my_identity, is_predecessor,
+                                         new_trail,new_trail_length,trail_id,
+                                         target_friend, CONGESTION_TIMEOUT);
+    return GNUNET_YES;
+  }
+
+  /* Look for next_hop to pass the trail setup message */
+  next_hop = find_successor (ultimate_destination_finger_value,
+                             &next_destination,
+                             &new_intermediate_trail_id,
+                             is_predecessor);
+
+  if (0 == (GNUNET_CRYPTO_cmp_peer_identity (next_hop, &my_identity)))/* This means I am the final destination */
+  {
+    if (0 == trail_length)
+      next_peer = source;
+    else
+      next_peer = trail_peer_list[trail_length-1];
+
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_peer);
+    GDS_NEIGHBOURS_send_trail_setup_result (source,
+                                            my_identity,
+                                            target_friend, trail_length,
+                                            trail_peer_list,
+                                            is_predecessor, 
+                                            ultimate_destination_finger_value,
+                                            trail_id);
+  }
+  else
+  {
+    struct GNUNET_PeerIdentity peer_list[trail_length + 1];
+
+    memcpy (peer_list, trail_peer_list, trail_length * sizeof (struct GNUNET_PeerIdentity));
+    peer_list[trail_length] = my_identity;
+
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+    GDS_NEIGHBOURS_send_trail_setup (source,
+                                     ultimate_destination_finger_value,
+                                     next_destination,
+                                     target_friend, trail_length + 1, peer_list,
+                                     is_predecessor, trail_id,
+                                     &new_intermediate_trail_id);
+  }
+  return GNUNET_OK;
 }
 
 
-/**
- * Core handler for p2p put requests.
- *
+/*
+ * Core handle for p2p trail tear down messages.
  * @param cls closure
- * @param peer sender of the request
  * @param message message
  * @param peer peer identity this notification is about
- * @return #GNUNET_OK to keep the connection open,
- *         #GNUNET_SYSERR to close it (signal serious error)
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 static int
-handle_dht_p2p_put (void *cls,
-                   const struct GNUNET_PeerIdentity *peer,
-                    const struct GNUNET_MessageHeader *message)
+handle_dht_p2p_trail_compression (void *cls, const struct GNUNET_PeerIdentity *peer,
+                               const struct GNUNET_MessageHeader *message)
 {
-    /**
-     1. Search the friend,finger and check your own id to find the closest
-     * predecessor the given key. --> find_predecessor()
-     2. If self then datache_store
-     3. If friend, then add to peer queue 
-     4. If finger, then add to the peer queue of the first hop.
-     * in put message also maintain a field current_destination and use
-     * same logic as trail setup to understand if you are just part of trail
-     * to reach to a particular peer or you are endpoint of trail or just a friend.
-     * 
-     */
-  return 0;
-}
+  struct PeerTrailCompressionMessage *trail_compression;
+  struct GNUNET_PeerIdentity *next_hop;
+  struct GNUNET_HashCode trail_id;
+  struct FriendInfo *target_friend;
+  size_t msize;
 
+  msize = ntohs (message->size);
+  if (msize != sizeof (struct PeerTrailCompressionMessage))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_OK;
+  }
 
-/**
- * Core handler for p2p get requests.
- *
- * @param cls closure
- * @param peer sender of the request
- * @param message message
- * @return #GNUNET_OK to keep the connection open,
- *         #GNUNET_SYSERR to close it (signal serious error)
- */
-static int
-handle_dht_p2p_get (void *cls, const struct GNUNET_PeerIdentity *peer,
-                    const struct GNUNET_MessageHeader *message)
-{
-  return 0;
+  trail_compression = (struct PeerTrailCompressionMessage *) message;
+  trail_id = trail_compression->trail_id;
+
+  if (0 == (GNUNET_CRYPTO_cmp_peer_identity (&(trail_compression->new_first_friend),
+                                             &my_identity)))
+  {
+     if(0 != (GNUNET_CRYPTO_cmp_peer_identity (&(trail_compression->destination_peer),
+                                               &my_identity)))
+     {
+       GDS_ROUTING_update_trail_prev_hop (trail_id,
+                                          trail_compression->source_peer);
+     }
+     return GNUNET_OK;
+  }
+
+  next_hop = GDS_ROUTING_get_next_hop (trail_id, GDS_ROUTING_SRC_TO_DEST);
+  if (NULL == next_hop)
+  {
+    GNUNET_break (0); /*FIXME: How to handle this case.  */
+    return GNUNET_OK;
+  }
+  GNUNET_assert (GNUNET_YES == GDS_ROUTING_remove_trail (trail_id));
+  target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, next_hop);
+  GDS_NEIGHBOURS_send_trail_compression (trail_compression->source_peer,
+                                         trail_compression->destination_peer,
+                                         trail_id,
+                                         trail_compression->new_first_friend,
+                                         target_friend);
+  return GNUNET_OK;
 }
 
 
 /**
- * Core handler for p2p result messages.
- *
+ * Core handler for trail teardown message.
  * @param cls closure
  * @param message message
  * @param peer peer identity this notification is about
- * @return #GNUNET_YES (do not cut p2p connection)
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 static int
-handle_dht_p2p_result (void *cls, const struct GNUNET_PeerIdentity *peer,
-                       const struct GNUNET_MessageHeader *message)
+handle_dht_p2p_trail_teardown (void *cls, const struct GNUNET_PeerIdentity *peer,
+                               const struct GNUNET_MessageHeader *message)
 {
-  return 0;
-}
-
+  struct PeerTrailTearDownMessage *trail_teardown;
+  struct GNUNET_HashCode trail_id;
+  enum GDS_ROUTING_trail_direction trail_direction;
+  size_t msize;
 
-/**
- * FIXME:1. Check if current_destination field is set correctly. 
- * 2. Is it correct to use GNUNET_CMP_PEER_IDENTITY to find out the successor
- * of a finger. 
- * The code flow seems to be very large. Could do better. 
- * @param destination peer id's predecessor we are looking for. 
- * @return
- */
-static struct GNUNET_PeerIdentity *
-find_successor(struct GNUNET_PeerIdentity *destination, struct GNUNET_PeerIdentity *current_destination)
-{
-  unsigned int friend_index;
-  unsigned int finger_index;
-  struct GNUNET_CONTAINER_MultiPeerMapIterator *friend_iter;
-  struct GNUNET_CONTAINER_MultiPeerMapIterator *finger_iter;
-  struct GNUNET_PeerIdentity key_ret;
-  struct FriendInfo *friend;
-  struct FingerInfo *finger;
-  struct GNUNET_PeerIdentity *current_successor;
-  
-  /* FIXME: Temporary field used to understand if we got a friend or finger
-     as next successor. find something better.*/
-  int successor;
-  int finger_peer = 0;
-  int friend_peer = 1;  
-  int me = 2;
-  
-  current_successor = GNUNET_malloc (sizeof (struct GNUNET_PeerIdentity));
-  
-  /* initialize current_successor with your own identity.*/
-  memcpy(current_successor,&my_identity,sizeof(struct GNUNET_PeerIdentity));
-  successor = me;
-  
-  friend_iter = GNUNET_CONTAINER_multipeermap_iterator_create (friend_peers); 
-  
-  /*iterate over friend map till you reach a peer id such that destination <= peer id */ 
-  for (friend_index = 0; friend_index < GNUNET_CONTAINER_multipeermap_size (friend_peers); friend_index++)
+  msize = ntohs (message->size);
+  if (msize != sizeof (struct PeerTrailTearDownMessage))
   {
-    if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next(friend_iter,&key_ret,(const void **)&friend)) 
-    {
-      if(0 > GNUNET_CRYPTO_cmp_peer_identity(&friend->id,destination) ||
-        (0 == GNUNET_CRYPTO_cmp_peer_identity(&friend->id,destination)))
-      {
-        /* If yes then check if finger <= current_successor */
-        if(0 < GNUNET_CRYPTO_cmp_peer_identity(&friend->id,current_successor) ||
-          (0 == GNUNET_CRYPTO_cmp_peer_identity(&friend->id,current_successor)))
-        {
-          memcpy(current_successor,friend,sizeof(struct GNUNET_PeerIdentity));
-          successor = friend_peer;
-        }
-      }   
-    }
+    GNUNET_break_op (0);
+    return GNUNET_OK;
   }
-  
 
-  finger_iter = GNUNET_CONTAINER_multipeermap_iterator_create (finger_peers);  
-  /*iterate over finger map till you reach a peer id such that destination <= peer id */
-  for (finger_index = 0; finger_index < GNUNET_CONTAINER_multipeermap_size (finger_peers); finger_index++)
+  trail_teardown = (struct PeerTrailTearDownMessage *) message;
+  trail_direction = ntohl (trail_teardown->trail_direction);
+  trail_id = trail_teardown->TRAIL_ID;
+
+  if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+                                            &trail_teardown->destination_peer))
   {
-    if(GNUNET_YES == GNUNET_CONTAINER_multipeermap_iterator_next(finger_iter,&key_ret,(const void **)&finger)) 
+    struct GNUNET_PeerIdentity *next_hop;
+    struct FriendInfo *target_friend;
+
+    next_hop = GDS_ROUTING_get_next_hop (trail_id, trail_direction);
+    if (NULL == next_hop)
     {
-       if(0 > GNUNET_CRYPTO_cmp_peer_identity(&finger->id,destination) ||
-         (0 == GNUNET_CRYPTO_cmp_peer_identity(&finger->id,destination)))
-       {
-         /* If yes then check if finger <= current_friend_successor */
-         if(0 < GNUNET_CRYPTO_cmp_peer_identity(&finger->id,current_successor) 
-         || (0 == GNUNET_CRYPTO_cmp_peer_identity(&finger->id,current_successor)))
-         {
-           memcpy(current_successor,finger,sizeof(struct GNUNET_PeerIdentity));
-           successor = finger_peer;
-         } 
-       } 
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
     }
-  }
-  
-  if(successor == finger_peer)
-  { 
-    memcpy(current_destination,current_successor,sizeof(struct GNUNET_PeerIdentity));
-  }
-  else
-  {
-    /* The successor is either my_identity or friend. */  
-    current_destination = NULL;
-  }
-  
-  return current_successor;
-}
 
-
-/* Traverse the trail list to find the prev hop to store in routing table. */
-static
-struct GNUNET_PeerIdentity *
-find_trail_list_prev_hop(struct PeerTrailSetupMessage *trail_result)
-{
-  /*FIXME: I don't see any function in existing dll implementation, to 
-   just read the dll backward or forward. So, I would implement one here. 
-   * As no one else uses this functionality so I guess its okay to just
-   * implement it here.  */ 
-  return NULL;
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
+                                                       next_hop);
+    GNUNET_assert (GNUNET_YES == GDS_ROUTING_remove_trail (trail_id));
+    GDS_NEIGHBOURS_send_trail_teardown (trail_teardown->source_peer,
+                                        trail_teardown->destination_peer,
+                                        trail_id, trail_direction,
+                                        target_friend);
+  }
+  return GNUNET_OK;
 }
 
 
 /**
- * FIXME: 
- * 1. Check if we are maintaining the 64k size of struct PeerTrailSetupMessage.
- * when we add ourself to the trail list. 
- * 2. Ensure every case is handled for current_destination. 
- * Core handler for P2P trail setup message.
+ * Fixme: this function is called only in case in notify new successor, the new
+ * successor wants to add the source of the peer as its predecessor. Identify
+ * if there is any other use case where it is required and if yes then adapt the
+ * code for it.
+ * Core handle for p2p add trail message.
  * @param cls closure
  * @param message message
  * @param peer peer identity this notification is about
- * @return #GNUNET_YES 
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 static int
-handle_dht_p2p_trail_setup(void *cls, const struct GNUNET_PeerIdentity *peer,
-                    const struct GNUNET_MessageHeader *message)
+handle_dht_p2p_add_trail (void *cls, const struct GNUNET_PeerIdentity *peer,
+                          const struct GNUNET_MessageHeader *message)
 {
-  struct PeerTrailSetupMessage *trail_setup; 
-  struct GNUNET_PeerIdentity *next_hop;
-  struct GNUNET_PeerIdentity *prev_hop; 
-  struct FriendInfo *friend;
-  struct TrailPeerList *peer_entry;
-  struct P2PPendingMessage *pending;
-  
-  uint16_t msize;
-  
+  struct PeerAddTrailMessage *add_trail;
+  struct GNUNET_PeerIdentity *trail;
+  struct GNUNET_HashCode trail_id;
+  struct GNUNET_PeerIdentity destination_peer;
+  struct GNUNET_PeerIdentity source_peer;
+  struct GNUNET_PeerIdentity next_hop;
+  unsigned int trail_length;
+  unsigned int my_index;
+  size_t msize;
+
   msize = ntohs (message->size);
-  if (msize < sizeof (struct PeerTrailSetupMessage))
+  if (msize != sizeof (struct PeerAddTrailMessage))
   {
     GNUNET_break_op (0);
-    return GNUNET_YES;
+    return GNUNET_OK;
   }
-  
-  trail_setup = (struct PeerTrailSetupMessage *) message;
-  
-  GNUNET_STATISTICS_update (GDS_stats,
-                            gettext_noop ("# TRAIL SETUP requests received"), 1,
-                            GNUNET_NO);
-  GNUNET_STATISTICS_update (GDS_stats,
-                            gettext_noop ("# TRAIL SETUP bytes received"), msize,
-                            GNUNET_NO);
-  
-  
-  /* Check the value of current_destination and handle the respective case. */
-  if(trail_setup->current_destination == NULL)
+
+  add_trail = (struct PeerAddTrailMessage *) message;
+  trail_length = (msize - sizeof (struct PeerAddTrailMessage))/
+                  sizeof (struct GNUNET_PeerIdentity);
+  if ((msize - sizeof (struct PeerAddTrailMessage)) % 
+      sizeof (struct GNUNET_PeerIdentity) != 0)
   {
-    /* Find the next peer to pass the trail setup message. */  
-    next_hop = find_successor(trail_setup->destination_finger,trail_setup->current_destination);
-  }
-  else if( 0 == (GNUNET_CRYPTO_cmp_peer_identity(trail_setup->current_destination,&my_identity)))
+    GNUNET_break_op (0);
+    return GNUNET_OK;      
+  }           
+
+  if ((msize < sizeof (struct PeerAddTrailMessage) +
+               trail_length * sizeof (struct GNUNET_PeerIdentity)) ||
+      (trail_length >
+       GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
   {
-    /* I am current destination, find the next peer to pass the trail setup message. */  
-    next_hop = find_successor(trail_setup->destination_finger,trail_setup->current_destination);  
+    GNUNET_break_op (0);
+    return GNUNET_OK;
   }
-  else
+
+  trail = (struct GNUNET_PeerIdentity *)&add_trail[1];
+  destination_peer = add_trail->destination_peer;
+  source_peer = add_trail->source_peer;
+  trail_id = add_trail->trail_id;
+
+  if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+                                            &destination_peer))
   {
-    /* I am part of the trail to reach to current_destination. */
-    next_hop = GDS_Routing_search(trail_setup->source_peer, trail_setup->current_destination, trail_setup->tail->peer);
+    struct FriendInfo *target_friend;
+
+    my_index = search_my_index (trail, trail_length);
+    if (GNUNET_SYSERR == my_index)
+    {
+      GNUNET_break_op (0);
+      return GNUNET_SYSERR;
+    }
+
+    if (0 == my_index)
+      next_hop = source_peer;
+    else
+      next_hop = trail[trail_length - 1];
+
+    GNUNET_assert (GNUNET_OK == GDS_ROUTING_add (trail_id, next_hop, *peer));
+    target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, &next_hop);
+    GDS_NEIGHBOURS_send_add_trail (source_peer, destination_peer, trail_id,
+                                   trail, trail_length, target_friend);
   }
-  
-  if(0 == (GNUNET_CRYPTO_cmp_peer_identity(next_hop,&my_identity)))
+  return GNUNET_OK;
+}
+
+
+/**
+ *FIXME; call send_trail_teardown_message on all the trails of the finger that
+ * you remove. Also you don't need to decerement friend trail count as that
+ * friend is removed. But you can not send trail teardown message as the friend
+ * is disconnected. then you don't have any next_hop. and in case there are
+ * multiple trails. and friend is the first trail then you remove only the trail.
+ * Iterate over finger_hashmap, and remove entries if finger is the disconnected
+ * peer or if disconnected peer is the first friend in the trail to reach the
+ * finger.
+ * @param cls closure
+ * @param key current public key
+ * @param value value in the hash map
+ * @return #GNUNET_YES if we should continue to
+ *         iterate,
+ *         #GNUNET_NO if not.
+ */
+static int
+remove_matching_finger (void *cls,
+                        uint32_t key,
+                        void *value)
+{
+  struct FingerInfo *remove_finger = value;
+  const struct GNUNET_PeerIdentity *disconnected_peer = cls;
+  struct Trail *trail_list;
+  int i;
+
+  if (0 == GNUNET_CRYPTO_cmp_peer_identity (&remove_finger->finger_identity,
+                                            disconnected_peer))
   {
-    /* I am the closest successor of the destination finger in the network. */
-    /*TODO::
-      1. Prepare a trail setup result message.
-      2. Add yourself to trail list. 
-      3. send packet to last element in the list. 
-    */
+    GNUNET_assert (GNUNET_YES ==
+                   GNUNET_CONTAINER_multihashmap32_remove (finger_hashmap,
+                                                         key,
+                                                         remove_finger));
+    free_finger (remove_finger);
     return GNUNET_YES;
   }
-  
-  /* FIXME:
-   * Do we really need to pass the whole trail_setup? I guess
-   * we can just pass the double linked list. 
-  */
-  prev_hop = find_trail_list_prev_hop(trail_setup);
-     
-  GDS_ROUTING_add(trail_setup->source_peer,trail_setup->current_destination,prev_hop,next_hop);
-  peer_entry = GNUNET_malloc (sizeof (struct TrailPeerList));
-  peer_entry->peer = &my_identity;
-  peer_entry->next = NULL;
-  peer_entry->prev = NULL;
-  
-  /*SUPU what is this stupid code that I have written. */
-  GNUNET_CONTAINER_DLL_insert_tail(trail_setup->head->next,trail_setup->tail->prev,peer_entry);
-  
-  /* Find the struct FriendInfo for next_hop peer id. */
-  friend = GNUNET_CONTAINER_multipeermap_get(friend_peers,next_hop);
-  
-  if (friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
+
+  for (i = 0; i< remove_finger->trails_count; i++)
   {
-    GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
-                               1, GNUNET_NO);
+    trail_list = &remove_finger->trail_list[i];
+    if (0 == GNUNET_CRYPTO_cmp_peer_identity (&trail_list->trail_head->peer,
+                                                disconnected_peer))
+    {
+      GNUNET_assert (GNUNET_YES ==
+                     GNUNET_CONTAINER_multihashmap32_remove (finger_hashmap,
+                                                           key,
+                                                           remove_finger));
+       free_finger (remove_finger);
+    }
   }
-  
-  /* Send trail setup message to next hop friend. */
-  pending = GNUNET_malloc (sizeof (struct P2PPendingMessage));
-  
-  /* FIXME: Check if we are properly initializing pending. */
-  trail_setup = (struct PeerTrailSetupMessage *) &pending[1];
-  pending->msg = &trail_setup->header;
-  GNUNET_CONTAINER_DLL_insert_tail (friend->head, friend->tail, pending);
-  friend->pending_count++;
-  process_friend_queue(friend);
+
   return GNUNET_YES;
 }
 
 
-/* Add an entry to finger table. */
-static 
-void finger_table_add(struct PeerTrailSetupResultMessage *result)
+/**
+ * Method called whenever a peer disconnects.
+ *
+ * @param cls closure
+ * @param peer peer identity this notification is about
+ */
+static void
+handle_core_disconnect (void *cls,
+                                         const struct GNUNET_PeerIdentity *peer)
 {
-    /* 1. create a struct FingerInfo and copy respective members
-     * of result into this struct. 
-     * Add the whole trail in your finger table, 
-     also add interval. */
-}
+  struct FriendInfo *remove_friend;
+
+  if (0 == memcmp (&my_identity, peer, sizeof (struct GNUNET_PeerIdentity)))
+    return;
 
+  remove_friend =
+      GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
 
-/* Traverse the trail list to find the next hop to pass the result message. */
-static
-struct GNUNET_PeerIdentity *
-find_trail_list_next_hop(struct PeerTrailSetupResultMessage *trail_result)
-{
-  /* Setup the current_destination value to new next hop found. */
-  return NULL;
+  if (NULL == remove_friend)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  GNUNET_assert (GNUNET_SYSERR !=
+                 GNUNET_CONTAINER_multihashmap32_iterate (finger_hashmap,
+                                                          &remove_matching_finger,
+                                                          (void *)peer));
+  GDS_ROUTING_remove_trail_by_peer (peer);
+  GNUNET_assert (GNUNET_YES ==
+                 GNUNET_CONTAINER_multipeermap_remove (friend_peermap,
+                                                       peer,
+                                                       remove_friend));
+
+  if (0 != GNUNET_CONTAINER_multipeermap_size (friend_peermap))
+    return;
+
+  if (GNUNET_SCHEDULER_NO_TASK != find_finger_trail_task)
+  {
+      GNUNET_SCHEDULER_cancel (find_finger_trail_task);
+      find_finger_trail_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  else
+    GNUNET_break (0);
 }
 
 
 /**
- * Core handle for p2p trail construction result messages.
+ * Method called whenever a peer connects.
+ *
  * @param cls closure
- * @param message message
- * @param peer peer identity this notification is about
- * @return #GNUNET_YES (do not cut p2p connection)
- * @return
+ * @param peer_identity peer identity this notification is about
  */
-static int
-handle_dht_p2p_trail_setup_result(void *cls, const struct GNUNET_PeerIdentity *peer,
-                    const struct GNUNET_MessageHeader *message)
+static void
+handle_core_connect (void *cls, const struct GNUNET_PeerIdentity *peer_identity)
 {
-  /* FIXME: Should it be const? */
-  struct PeerTrailSetupResultMessage *trail_result;
-  struct GNUNET_PeerIdentity *next_hop;
   struct FriendInfo *friend;
-  struct P2PPendingMessage *pending;
-  trail_result = (struct PeerTrailSetupResultMessage *) message;   
-  uint16_t msize;
-   
-  msize = ntohs (message->size);
-  if (msize < sizeof (struct PeerTrailSetupResultMessage))
-  {
-    GNUNET_break_op (0);
-    return GNUNET_YES;
-  }  
-  
-  /* This should always be the case. */
-  if( 0 == (GNUNET_CRYPTO_cmp_peer_identity(trail_result->current_destination,&my_identity)))
+
+  /* Check for connect to self message */
+  if (0 == memcmp (&my_identity, peer_identity, sizeof (struct GNUNET_PeerIdentity)))
+    return;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to %s\n", GNUNET_i2s (peer_identity));
+
+  /* If peer already exists in our friend_peermap, then exit. */
+  if (GNUNET_YES == GNUNET_CONTAINER_multipeermap_contains (friend_peermap, peer_identity))
   {
-    /* Am I the destination ? */
-    if( 0 == (GNUNET_CRYPTO_cmp_peer_identity(trail_result->destination_peer,&my_identity)))
-    {
-      /* I am the destination. Add the trail to my finger table. */
-      finger_table_add(trail_result);
-      return GNUNET_YES;
-    }
-    else
-    {
-      /* Find the next peer in the trail list to pass the message to. */
-      next_hop = find_trail_list_next_hop(trail_result);
-      
-      /* Find the struct FriendInfo for next_hop peer id. */
-      friend = GNUNET_CONTAINER_multipeermap_get(friend_peers,next_hop);
-      
-      if (friend->pending_count >= MAXIMUM_PENDING_PER_FRIEND)
-      {
-        GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# P2P messages dropped due to full queue"),
-                               1, GNUNET_NO);
-      }
-      /* Send trail setup result message to next hop friend. */
-      /*FIXME:
-       I have not yet written the code to copy struct trail message to
-       pending message. Also, before sending the message I need to check
-       the MAXIMUM_PENDNIG_PEER limit is not crossed. Modify the same part
-       of code for handle_dht_p2p_trail_setup. */
-      pending = GNUNET_malloc (sizeof (struct P2PPendingMessage));
-      trail_result = (struct PeerTrailSetupResultMessage *) &pending[1];
-      pending->msg = &trail_result->header;
-      GNUNET_CONTAINER_DLL_insert_tail (friend->head, friend->tail, pending);
-      friend->pending_count++;
-      process_friend_queue(friend);
-      
-      return GNUNET_YES;
-    }
-  }    
-  else
-    return GNUNET_SYSERR;
+    GNUNET_break (0);
+    return;
+  }
+
+  GNUNET_STATISTICS_update (GDS_stats, gettext_noop ("# peers connected"), 1,
+                            GNUNET_NO);
+
+  friend = GNUNET_new (struct FriendInfo);
+  friend->id = *peer_identity;
+
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_CONTAINER_multipeermap_put (friend_peermap,
+                                                    peer_identity, friend,
+                                                    GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+
+  /* got a first connection, good time to start with FIND FINGER TRAIL requests... */
+  if (GNUNET_SCHEDULER_NO_TASK == find_finger_trail_task)
+    find_finger_trail_task = GNUNET_SCHEDULER_add_now (&send_find_finger_trail_message, NULL);
+}
+
+
+/**
+ * To be called on core init/fail.
+ *
+ * @param cls service closure
+ * @param identity the public identity of this peer
+ */
+static void
+core_init (void *cls,
+           const struct GNUNET_PeerIdentity *identity)
+{
+  my_identity = *identity;
 }
 
 
 /**
  * Initialize neighbours subsystem.
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 int
-GDS_NEIGHBOURS_init()
+GDS_NEIGHBOURS_init (void)
 {
   static struct GNUNET_CORE_MessageHandler core_handlers[] = {
-    {&handle_dht_p2p_get, GNUNET_MESSAGE_TYPE_DHT_P2P_GET, 0},
     {&handle_dht_p2p_put, GNUNET_MESSAGE_TYPE_DHT_P2P_PUT, 0},
-    {&handle_dht_p2p_result, GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT, 0},
+    {&handle_dht_p2p_get, GNUNET_MESSAGE_TYPE_DHT_P2P_GET, 0},
+    {&handle_dht_p2p_get_result, GNUNET_MESSAGE_TYPE_DHT_P2P_GET_RESULT, 0},
     {&handle_dht_p2p_trail_setup, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP, 0},
     {&handle_dht_p2p_trail_setup_result, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_SETUP_RESULT, 0},
+    {&handle_dht_p2p_verify_successor, GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR, 0},
+    {&handle_dht_p2p_verify_successor_result, GNUNET_MESSAGE_TYPE_DHT_P2P_VERIFY_SUCCESSOR_RESULT, 0},
+    {&handle_dht_p2p_notify_new_successor, GNUNET_MESSAGE_TYPE_DHT_P2P_NOTIFY_NEW_SUCCESSOR, 0},
+    {&handle_dht_p2p_trail_rejection, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_REJECTION, 0},
+    {&handle_dht_p2p_trail_compression, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_COMPRESSION, 0},
+    {&handle_dht_p2p_trail_teardown, GNUNET_MESSAGE_TYPE_DHT_P2P_TRAIL_TEARDOWN, 0},
+    {&handle_dht_p2p_add_trail, GNUNET_MESSAGE_TYPE_DHT_P2P_ADD_TRAIL, 0},
     {NULL, 0, 0}
   };
 
-  /*ASK: What is ATS? Why do we need it? */
-  atsAPI = GNUNET_ATS_performance_init (GDS_cfg, NULL, NULL);
   core_api =
     GNUNET_CORE_connect (GDS_cfg, NULL, &core_init, &handle_core_connect,
-                           &handle_core_disconnect, NULL, GNUNET_NO, NULL,
-                           GNUNET_NO, core_handlers);
-  if (core_api == NULL)
+                         &handle_core_disconnect, NULL, GNUNET_NO, NULL,
+                         GNUNET_NO, core_handlers);
+  if (NULL == core_api)
     return GNUNET_SYSERR;
 
-  friend_peers = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_NO);
-  finger_peers = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_NO);
-  
+  friend_peermap = GNUNET_CONTAINER_multipeermap_create (256, GNUNET_NO);
+  finger_hashmap = GNUNET_CONTAINER_multihashmap32_create (MAX_FINGERS * 4/3);
+
   return GNUNET_OK;
 }
 
-
 /**
  * Shutdown neighbours subsystem.
  */
 void
-GDS_NEIGHBOURS_done ()
+GDS_NEIGHBOURS_done (void)
 {
   if (NULL == core_api)
     return;
+
   GNUNET_CORE_disconnect (core_api);
   core_api = NULL;
-  GNUNET_ATS_performance_done (atsAPI);
-  atsAPI = NULL;
 
-  GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (friend_peers));
-  GNUNET_CONTAINER_multipeermap_destroy (friend_peers);
-  friend_peers = NULL;
+  GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (friend_peermap));
+  GNUNET_CONTAINER_multipeermap_destroy (friend_peermap);
+  friend_peermap = NULL;
 
-  GNUNET_assert (0 == GNUNET_CONTAINER_multipeermap_size (finger_peers));
-  GNUNET_CONTAINER_multipeermap_destroy (finger_peers);
-  finger_peers = NULL;
+  GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap32_size (finger_hashmap));
+  GNUNET_CONTAINER_multihashmap32_destroy (finger_hashmap);
+  finger_hashmap = NULL;
 
   if (GNUNET_SCHEDULER_NO_TASK != find_finger_trail_task)
   {
+    GNUNET_break (0);
     GNUNET_SCHEDULER_cancel (find_finger_trail_task);
     find_finger_trail_task = GNUNET_SCHEDULER_NO_TASK;
   }
@@ -1420,15 +4566,12 @@ GDS_NEIGHBOURS_done ()
 
 
 /**
- * Get the ID of the local node.
+ * Get my identity
  *
- * @return identity of the local node
+ * @return my identity
  */
-struct GNUNET_PeerIdentity *
-GDS_NEIGHBOURS_get_id ()
+struct GNUNET_PeerIdentity
+GDS_NEIGHBOURS_get_my_id (void)
 {
-  return &my_identity;
+  return my_identity;
 }
-
-
-/* end of gnunet-service-xdht_neighbours.c */
\ No newline at end of file