- verify successor result

[oweals/gnunet.git] / src / dht / gnunet-service-xdht_routing.c

diff --git a/src/dht/gnunet-service-xdht_routing.c b/src/dht/gnunet-service-xdht_routing.c
index 66ab88eb4da6821318c9e7eb3f349aa7bb3dbd89..5830dc9f8c4eac5f7045100fad56a8d815b2bc7b 100644 (file)
--- a/src/dht/gnunet-service-xdht_routing.c
+++ b/src/dht/gnunet-service-xdht_routing.c
@@ -31,7 +31,12 @@
 /* FIXME
  * 1. We need field to understand which routing table is for which peer.
  * 2. Better function names and variable names.
+ * 3. Use destination peer id as key for routing table. 
+ * 4. What does GDS stands for?
+ * 
  */
+
+
 /**
  * Number of requests we track at most (for routing replies).
  */
@@ -39,29 +44,26 @@
 
 
 /**
+ * FIXME: Do we need a field prev_hop
  * Routing table entry .
  */
 struct RoutingTrail
 {
-    /**
-     * Source peer .
-     */
-    struct GNUNET_PeerIdentity endpoint1;
-
-    /**
-     * Destination peer.
-     */
-    struct GNUNET_PeerIdentity endppoint2;
-
-    /**
-     * The peer this request was received from.
-     */
-    struct GNUNET_PeerIdentity previous_hop;
-
-    /**
-     * The peer to which this request should be passed to.
-     */
-    struct GNUNET_PeerIdentity next_hop;
+  /**
+   * Source peer .
+   */
+  struct GNUNET_PeerIdentity *source;
+
+  /**
+   * Destination peer.
+   */
+  struct GNUNET_PeerIdentity *destination;
+
+  /**
+   * The peer to which this request should be passed to.
+   */
+  struct GNUNET_PeerIdentity *next_hop;
+  
 };
 
 
@@ -72,46 +74,59 @@ static struct GNUNET_CONTAINER_MultiPeerMap *routing_table;
 
 
 /**
- * Find the next hop to pass the message to .
- * @return
+ * FIXME: Change the name of variable. 
+ * Ensure that everywhere in this file you are using destination as the key.
+ * Do we need prev field in routing table?
+ * Add a new entry to our routing table.
+ * @param source peer
+ * @param destintation
+ * @param next_hop
  */
-//static struct GNUNET_PeerIdentity *
-//find_next_hop()
-//{
+void
+GDS_ROUTING_add (struct GNUNET_PeerIdentity *source,
+                 struct GNUNET_PeerIdentity *dest,
+                 struct GNUNET_PeerIdentity *next_hop)
+{
+  struct RoutingTrail *new_routing_entry;
     
-//}
-
+  /* If dest is already present in the routing table, then exit.*/
+  if (GNUNET_YES ==
+    GNUNET_CONTAINER_multipeermap_contains (routing_table,
+                                              dest))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  
+  new_routing_entry = GNUNET_malloc (sizeof (struct RoutingTrail));
+  new_routing_entry->source = source;
+  new_routing_entry->next_hop = next_hop;
+  new_routing_entry->destination = dest;
+  
+  GNUNET_assert (GNUNET_OK ==
+    GNUNET_CONTAINER_multipeermap_put (routing_table,
+                                       dest, new_routing_entry,
+                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+}
 
 
 /**
- * Add a new entry to our routing table.
- *
- * @param sender peer that originated the request
- * @param type type of the block
- * @param options options for processing
- * @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
+ * Find the next hop to send packet to .
+ * @return next hop peer id
  */
-void
-GDS_ROUTING_add (const struct GNUNET_PeerIdentity *sender,
-                 enum GNUNET_BLOCK_Type type,
-                 enum GNUNET_DHT_RouteOption options,
-                 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_PeerIdentity *
+GDS_ROUTING_search(struct GNUNET_PeerIdentity *source_peer,
+                   struct GNUNET_PeerIdentity *destination_peer)
 {
-
+  struct RoutingTrail *trail;
+  trail = (struct RoutingTrail *)(GNUNET_CONTAINER_multipeermap_get(routing_table,destination_peer));
+    
+  if(trail == NULL)
+      return NULL;
+    
+  return trail->next_hop;
 }
 
-/* search in routing table for next hop to pass the message to . 
- * struct GNUNET_PeerIdentity *
-GDS_Routing_search()
-{
-}*/
 
 /**FIXME: Old implementation just to remove error
  * Handle a reply (route to origin).  Only forwards the reply back to
@@ -139,13 +154,16 @@ GDS_ROUTING_process (enum GNUNET_BLOCK_Type type,
                      const struct GNUNET_PeerIdentity *get_path,
                      const void *data, size_t data_size)
 {
+
 }
+
+
 /**
  * Initialize routing subsystem.
  */
 void
 GDS_ROUTING_init ()
-{
+{ 
   routing_table = GNUNET_CONTAINER_multipeermap_create (DHT_MAX_RECENT * 4 / 3, GNUNET_NO);
 }