/*
This file is part of GNUnet.
- (C) 2011 - 2014 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011 - 2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
/**
* FIXME: Check if its better to store pointer to friend rather than storing
- * peer identity next_hop or prev_hop.
+ * peer identity next_hop or prev_hop.
* keep entries in destnation and source peer also. so when we send the trail
* teardown message then we don't know the source but if source gets the message
* then it shold remove that trail id from its finger table. But how does
* will do a lookup in routing table and if no trail id present the remove
* that trail of the finger and if only one trail then remove the finger.
* because of this use case of trail teardown I think trail compression
- * and trail teardown should not be merged.
- * 2. store a pointer to friendInfo in place o peer identity.
+ * and trail teardown should not be merged.
+ * 2. store a pointer to friendInfo in place o peer identity.
*/
/**
* Maximum number of entries in routing table.
*/
-#define ROUTING_TABLE_THRESHOLD 64
+#define ROUTING_TABLE_THRESHOLD 80000
/**
+ * FIXME: Store friend pointer instead of peer identifier.
* Routing table entry .
*/
struct RoutingTrail
/**
* The peer to which this request should be passed to.
*/
- struct GNUNET_PeerIdentity next_hop;
+ struct GNUNET_PeerIdentity next_hop;
/**
* Peer just before next hop in the trail.
*/
- struct GNUNET_PeerIdentity prev_hop;
+ struct GNUNET_PeerIdentity prev_hop;
};
/**
static struct GNUNET_CONTAINER_MultiHashMap *routing_table;
/**
- * Update the prev. hop of the trail. Call made by trail teardown where
+ * Update the prev. hop of the trail. Call made by trail compression where
* if you are the first friend now in the trail then you need to update
* your prev. hop.
* @param trail_id
return GNUNET_OK;
}
+/**
+ * Update the next hop of the trail. Call made by trail compression where
+ * if you are source of the trail and now you have a new first friend, then
+ * you should update the trail.
+ * @param trail_id
+ * @return #GNUNET_OK success
+ * #GNUNET_SYSERR in case no matching entry found in routing table.
+ */
+int
+GDS_ROUTING_update_trail_next_hop (const struct GNUNET_HashCode trail_id,
+ struct GNUNET_PeerIdentity next_hop)
+{
+ struct RoutingTrail *trail;
+
+ trail = GNUNET_CONTAINER_multihashmap_get (routing_table, &trail_id);
+ if (NULL == trail)
+
+ return GNUNET_SYSERR;
+
+ trail->next_hop = next_hop;
+ return GNUNET_OK;
+}
/**
* Get the next hop for trail corresponding to trail_id
struct RoutingTrail *trail;
trail = GNUNET_CONTAINER_multihashmap_get (routing_table, &trail_id);
-
if (NULL == trail)
+ {
+ /* If a friend got disconnected and we removed all the entry from the
+ routing table, then trail will be deleted and my identity will not know
+ and when it tries to reach to that finger it fails. thats why
+ assertion always fails in*/
return NULL;
-
+ }
switch (trail_direction)
{
case GDS_ROUTING_SRC_TO_DEST:
struct RoutingTrail *remove_entry;
remove_entry = GNUNET_CONTAINER_multihashmap_get (routing_table, &remove_trail_id);
-
if (NULL == remove_entry)
return GNUNET_NO;
GNUNET_free (remove_entry);
return GNUNET_YES;
}
+
return GNUNET_NO;
}
/**
* Iterate over routing table and remove entries with value as part of any trail.
- *
+ *
* @param cls closure
* @param key current public key
* @param value value in the hash map
struct GNUNET_PeerIdentity *disconnected_peer = cls;
struct GNUNET_HashCode trail_id = *key;
struct GNUNET_PeerIdentity my_identity;
-
+
/* If disconnected_peer is next_hop, then send a trail teardown message through
* prev_hop in direction from destination to source. */
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&remove_trail->next_hop,
- disconnected_peer))
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&remove_trail->next_hop,
+ disconnected_peer))
{
my_identity = GDS_NEIGHBOURS_get_my_id ();
- if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
&remove_trail->prev_hop))
{
- GDS_NEIGHBOURS_send_trail_teardown (trail_id,
+ GDS_NEIGHBOURS_send_trail_teardown (&trail_id,
GDS_ROUTING_DEST_TO_SRC,
&remove_trail->prev_hop);
}
}
-
+
/* If disconnected_peer is prev_hop, then send a trail teardown through
* next_hop in direction from Source to Destination. */
- if (0 == GNUNET_CRYPTO_cmp_peer_identity (&remove_trail->prev_hop,
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&remove_trail->prev_hop,
disconnected_peer))
{
my_identity = GDS_NEIGHBOURS_get_my_id ();
- if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
+
+ if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
&remove_trail->next_hop))
{
- GDS_NEIGHBOURS_send_trail_teardown (trail_id,
+ GDS_NEIGHBOURS_send_trail_teardown (&trail_id,
GDS_ROUTING_SRC_TO_DEST,
&remove_trail->next_hop);
}
}
-
+
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (routing_table,
&trail_id,
#if 0
/**
* TEST FUNCTION
- * Remove after using.
+ * Remove after using.
*/
-void
+void
GDS_ROUTING_test_print (void)
{
struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
struct GNUNET_PeerIdentity print_peer;
struct GNUNET_HashCode key_ret;
int i;
-
- FPRINTF (stderr,_("\nSUPU ***PRINTING ROUTING TABLE *****"));
+
+ struct GNUNET_PeerIdentity my_identity = GDS_NEIGHBOURS_get_my_id();
+ print_peer = my_identity;
+ FPRINTF (stderr,_("\nSUPU ***PRINTING ROUTING TABLE ***** of =%s"),GNUNET_i2s(&print_peer));
iter =GNUNET_CONTAINER_multihashmap_iterator_create (routing_table);
for (i = 0; i < GNUNET_CONTAINER_multihashmap_size(routing_table); i++)
{
}
}
#endif
+
/**
- * Remove every trail where peer is either next_hop or prev_hop. Also send a
+ * Remove every trail where peer is either next_hop or prev_hop. Also send a
* trail teardown message in direction of hop which is not disconnected.
* @param peer Peer identity. Trail containing this peer should be removed.
*/
-void
+int
GDS_ROUTING_remove_trail_by_peer (const struct GNUNET_PeerIdentity *peer)
{
- GNUNET_assert (GNUNET_CONTAINER_multihashmap_size(routing_table) > 0);
- GNUNET_CONTAINER_multihashmap_iterate (routing_table, &remove_matching_trails,
- (void *)peer);
+ int ret;
+
+
+ /* No entries in my routing table. */
+ if (0 == GNUNET_CONTAINER_multihashmap_size(routing_table))
+ return GNUNET_YES;
+
+ ret = GNUNET_CONTAINER_multihashmap_iterate (routing_table,
+ &remove_matching_trails,
+ (void *)peer);
+ return ret;
}
{
struct RoutingTrail *new_entry;
- new_entry = GNUNET_malloc (sizeof (struct RoutingTrail));
+ new_entry = GNUNET_new (struct RoutingTrail);
new_entry->trail_id = new_trail_id;
new_entry->next_hop = next_hop;
new_entry->prev_hop = prev_hop;
-
+
+
return GNUNET_CONTAINER_multihashmap_put (routing_table,
&new_trail_id, new_entry,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+
}
projects / oweals / gnunet.git / blobdiff