[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35562 - gnunet/src/dht
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r35562 - gnunet/src/dht |
|
Date: |
Mon, 27 Apr 2015 15:00:54 +0200 |
Author: grothoff
Date: 2015-04-27 15:00:54 +0200 (Mon, 27 Apr 2015)
New Revision: 35562
Removed:
gnunet/src/dht/gnunet-service-wdht_routing.c
gnunet/src/dht/gnunet-service-wdht_routing.h
Modified:
gnunet/src/dht/Makefile.am
gnunet/src/dht/gnunet-service-wdht.c
gnunet/src/dht/gnunet-service-wdht_neighbours.c
gnunet/src/dht/gnunet-service-xdht.c
Log:
-also don't need xdht routing subsystem for wdht
Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am 2015-04-27 12:53:35 UTC (rev 35561)
+++ gnunet/src/dht/Makefile.am 2015-04-27 13:00:54 UTC (rev 35562)
@@ -85,6 +85,7 @@
gnunet-service-xdht_nse.c gnunet-service-xdht_nse.h \
gnunet-service-xdht_neighbours.c gnunet-service-xdht_neighbours.h \
gnunet-service-xdht_routing.c gnunet-service-xdht_routing.h
+
gnunet_service_dht_xvine_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/core/libgnunetcore.la \
@@ -103,8 +104,7 @@
gnunet-service-wdht_clients.c gnunet-service-wdht_clients.h \
gnunet-service-wdht_datacache.c gnunet-service-wdht_datacache.h \
gnunet-service-wdht_nse.c gnunet-service-wdht_nse.h \
- gnunet-service-wdht_neighbours.c gnunet-service-wdht_neighbours.h \
- gnunet-service-wdht_routing.c gnunet-service-wdht_routing.h
+ gnunet-service-wdht_neighbours.c gnunet-service-wdht_neighbours.h
gnunet_service_dht_whanau_LDADD = \
$(top_builddir)/src/statistics/libgnunetstatistics.la \
$(top_builddir)/src/core/libgnunetcore.la \
Modified: gnunet/src/dht/gnunet-service-wdht.c
===================================================================
--- gnunet/src/dht/gnunet-service-wdht.c 2015-04-27 12:53:35 UTC (rev
35561)
+++ gnunet/src/dht/gnunet-service-wdht.c 2015-04-27 13:00:54 UTC (rev
35562)
@@ -35,10 +35,8 @@
#include "gnunet-service-wdht.h"
#include "gnunet-service-wdht_clients.h"
#include "gnunet-service-wdht_datacache.h"
-#include "gnunet-service-wdht_hello.h"
#include "gnunet-service-wdht_neighbours.h"
#include "gnunet-service-wdht_nse.h"
-#include "gnunet-service-wdht_routing.h"
@@ -69,7 +67,6 @@
{
GDS_NEIGHBOURS_done ();
GDS_DATACACHE_done ();
- GDS_ROUTING_done ();
GDS_NSE_done ();
if (GDS_block_context != NULL)
{
@@ -100,7 +97,6 @@
GDS_cfg = c;
GDS_block_context = GNUNET_BLOCK_context_create (GDS_cfg);
GDS_stats = GNUNET_STATISTICS_create ("dht", GDS_cfg);
- GDS_ROUTING_init ();
GDS_NSE_init ();
GDS_DATACACHE_init ();
GDS_CLIENTS_init (server);
Modified: gnunet/src/dht/gnunet-service-wdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-wdht_neighbours.c 2015-04-27 12:53:35 UTC
(rev 35561)
+++ gnunet/src/dht/gnunet-service-wdht_neighbours.c 2015-04-27 13:00:54 UTC
(rev 35562)
@@ -40,7 +40,6 @@
#include "gnunet-service-wdht_clients.h"
#include "gnunet-service-wdht_datacache.h"
#include "gnunet-service-wdht_neighbours.h"
-#include "gnunet-service-wdht_routing.h"
#include <fenv.h>
#include "dht.h"
Deleted: gnunet/src/dht/gnunet-service-wdht_routing.c
===================================================================
--- gnunet/src/dht/gnunet-service-wdht_routing.c 2015-04-27 12:53:35 UTC
(rev 35561)
+++ gnunet/src/dht/gnunet-service-wdht_routing.c 2015-04-27 13:00:54 UTC
(rev 35562)
@@ -1,363 +0,0 @@
-/*
- This file is part of GNUnet.
- Copyright (C) 2011 - 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
-*/
-
-/**
- * @file dht/gnunet-service-xdht_routing.c
- * @brief GNUnet DHT tracking of requests for routing replies
- * @author Supriti Singh
- */
-#include "platform.h"
-#include "gnunet-service-wdht_neighbours.h"
-#include "gnunet-service-wdht_routing.h"
-#include "gnunet-service-wdht.h"
-
-
-/**
- * FIXME: Check if its better to store pointer to friend rather than storing
- * 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
- * source know what is the desination finger ? It will whenevr contact a trail
- * 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.
- */
-/**
- * Maximum number of entries in routing table.
- */
-#define ROUTING_TABLE_THRESHOLD 80000
-
-/**
- * FIXME: Store friend pointer instead of peer identifier.
- * Routing table entry .
- */
-struct RoutingTrail
-{
- /**
- * Global Unique identifier of the trail.
- */
- struct GNUNET_HashCode trail_id;
-
- /**
- * The peer to which this request should be passed to.
- */
- struct GNUNET_PeerIdentity next_hop;
-
- /**
- * Peer just before next hop in the trail.
- */
- struct GNUNET_PeerIdentity prev_hop;
-};
-
-/**
- * Routing table of the peer
- */
-static struct GNUNET_CONTAINER_MultiHashMap *routing_table;
-
-/**
- * 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 success
- * #GNUNET_SYSERR in case no matching entry found in routing table.
- */
-int
-GDS_ROUTING_update_trail_prev_hop (const struct GNUNET_HashCode trail_id,
- struct GNUNET_PeerIdentity prev_hop)
-{
- struct RoutingTrail *trail;
-
- trail = GNUNET_CONTAINER_multihashmap_get (routing_table, &trail_id);
-
- if (NULL == trail)
- return GNUNET_SYSERR;
-
- trail->prev_hop = prev_hop;
- 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
- * @param trail_id Trail id to be searched.
- * @return Next_hop if found
- * NULL If next hop not found.
- */
-struct GNUNET_PeerIdentity *
-GDS_ROUTING_get_next_hop (const struct GNUNET_HashCode trail_id,
- enum GDS_ROUTING_trail_direction trail_direction)
-{
- 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:
- return &(trail->next_hop);
- case GDS_ROUTING_DEST_TO_SRC:
- return &(trail->prev_hop);
- }
- return NULL;
-}
-
-
-/**
- * Remove trail with trail_id
- * @param trail_id Trail id to be removed
- * @return #GNUNET_YES success
- * #GNUNET_NO if entry not found.
- */
-int
-GDS_ROUTING_remove_trail (const struct GNUNET_HashCode remove_trail_id)
-{
- struct RoutingTrail *remove_entry;
-
- remove_entry = GNUNET_CONTAINER_multihashmap_get (routing_table,
&remove_trail_id);
- if (NULL == remove_entry)
- return GNUNET_NO;
-
- if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove (routing_table,
- &remove_trail_id,
- remove_entry))
- {
- 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
- * @return #GNUNET_YES if we should continue to iterate,
- * #GNUNET_NO if not.
- */
-static int remove_matching_trails (void *cls,
- const struct GNUNET_HashCode *key,
- void *value)
-{
- struct RoutingTrail *remove_trail = value;
- 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))
- {
- my_identity = GDS_NEIGHBOURS_get_my_id ();
- if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
- &remove_trail->prev_hop))
- {
- 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,
- disconnected_peer))
- {
- my_identity = GDS_NEIGHBOURS_get_my_id ();
-
- if (0 != GNUNET_CRYPTO_cmp_peer_identity (&my_identity,
- &remove_trail->next_hop))
- {
- 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,
- remove_trail));
- GNUNET_free (remove_trail);
- return GNUNET_YES;
-}
-
-#if 0
-/**
- * TEST FUNCTION
- * Remove after using.
- */
-void
-GDS_ROUTING_test_print (void)
-{
- struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
- struct RoutingTrail *trail;
- struct GNUNET_PeerIdentity print_peer;
- struct GNUNET_HashCode key_ret;
- int i;
-
- 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++)
- {
- if(GNUNET_YES == GNUNET_CONTAINER_multihashmap_iterator_next (iter,
- &key_ret,
- (const void
**)&trail))
- {
- FPRINTF (stderr,_("\nSUPU %s, %s, %d, trail->trail_id = %s"),
- __FILE__, __func__,__LINE__, GNUNET_h2s(&trail->trail_id));
- memcpy (&print_peer, &trail->next_hop, sizeof (struct
GNUNET_PeerIdentity));
- FPRINTF (stderr,_("\nSUPU %s, %s, %d, trail->next_hop = %s"),
- __FILE__, __func__,__LINE__, GNUNET_i2s(&print_peer));
- memcpy (&print_peer, &trail->prev_hop, sizeof (struct
GNUNET_PeerIdentity));
- FPRINTF (stderr,_("\nSUPU %s, %s, %d, trail->prev_hop = %s"),
- __FILE__, __func__,__LINE__, GNUNET_i2s(&print_peer));
- }
- }
-}
-#endif
-
-/**
- * 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.
- */
-int
-GDS_ROUTING_remove_trail_by_peer (const struct GNUNET_PeerIdentity *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;
-}
-
-
-/**
- * Add a new entry in routing table
- * @param new_trail_id
- * @param prev_hop
- * @param next_hop
- * @return #GNUNET_OK success
- * #GNUNET_SYSERR in case new_trail_id already exists in the network
- * but with different prev_hop/next_hop
- */
-int
-GDS_ROUTING_add (struct GNUNET_HashCode new_trail_id,
- struct GNUNET_PeerIdentity prev_hop,
- struct GNUNET_PeerIdentity next_hop)
-{
- struct RoutingTrail *new_entry;
-
- 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);
-
-}
-
-
-/**
- * Check if the size of routing table has crossed ROUTING_TABLE_THRESHOLD.
- * It means that I don't have any more space in my routing table and I can not
- * be part of any more trails till there is free space in my routing table.
- * @return #GNUNET_YES, if threshold crossed else #GNUNET_NO.
- */
-int
-GDS_ROUTING_threshold_reached (void)
-{
- return (GNUNET_CONTAINER_multihashmap_size(routing_table) >
- ROUTING_TABLE_THRESHOLD) ? GNUNET_YES:GNUNET_NO;
-}
-
-
-/**
- * Initialize routing subsystem.
- */
-void
-GDS_ROUTING_init (void)
-{
- routing_table = GNUNET_CONTAINER_multihashmap_create
(ROUTING_TABLE_THRESHOLD * 4 / 3,
- GNUNET_NO);
-}
-
-
-/**
- * Shutdown routing subsystem.
- */
-void
-GDS_ROUTING_done (void)
-{
- GNUNET_assert (0 == GNUNET_CONTAINER_multihashmap_size (routing_table));
- GNUNET_CONTAINER_multihashmap_destroy (routing_table);
-}
-
-/* end of gnunet-service-xdht_routing.c */
Deleted: gnunet/src/dht/gnunet-service-wdht_routing.h
===================================================================
--- gnunet/src/dht/gnunet-service-wdht_routing.h 2015-04-27 12:53:35 UTC
(rev 35561)
+++ gnunet/src/dht/gnunet-service-wdht_routing.h 2015-04-27 13:00:54 UTC
(rev 35562)
@@ -1,138 +0,0 @@
-/*
- This file is part of GNUnet.
- Copyright (C) 2011 - 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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.
-*/
-
-/**
- * @file dht/gnunet-service-xdht_routing.h
- * @brief GNUnet DHT tracking of requests for routing replies
- * @author Christian Grothoff
- */
-#ifndef GNUNET_SERVICE_XDHT_ROUTING_H
-#define GNUNET_SERVICE_XDHT_ROUTING_H
-
-#include "gnunet_util_lib.h"
-#include "gnunet_block_lib.h"
-#include "gnunet_dht_service.h"
-
-/**
- * To understand the direction in which trial should be read.
- */
-enum GDS_ROUTING_trail_direction
-{
- GDS_ROUTING_SRC_TO_DEST,
- GDS_ROUTING_DEST_TO_SRC
-};
-
-
-/**
- * Update the prev. hop of the trail. Call made by trail teardown 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 success
- * #GNUNET_SYSERR in case no matching entry found in routing table.
- */
-int
-GDS_ROUTING_update_trail_prev_hop (struct GNUNET_HashCode trail_id,
- struct GNUNET_PeerIdentity prev_hop);
-
-
-/**
- * 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);
-
-/**
- * Get the next hop for trail corresponding to trail_id
- * @param trail_id Trail id to be searched.
- * @return Next_hop if found
- * NULL If next hop not found.
- */
-struct GNUNET_PeerIdentity *
-GDS_ROUTING_get_next_hop (struct GNUNET_HashCode trail_id,
- enum GDS_ROUTING_trail_direction trail_direction);
-
-
-/**
- * Remove every trail where peer is either next_hop or prev_hop
- * @param peer Peer to be searched.
- */
-int
-GDS_ROUTING_remove_trail_by_peer (const struct GNUNET_PeerIdentity *peer);
-/**
- * Remove trail with trail_id
- * @param trail_id Trail id to be removed
- * @return #GNUNET_YES success
- * #GNUNET_NO if entry not found.
- */
-int
-GDS_ROUTING_remove_trail (struct GNUNET_HashCode remove_trail_id);
-
-
-/**
- * Add a new entry in routing table
- * @param new_trail_id
- * @param prev_hop
- * @param next_hop
- * @return #GNUNET_OK success
- * #GNUNET_SYSERR in case new_trail_id already exists in the network
- * but with different prev_hop/next_hop
- */
-int
-GDS_ROUTING_add (struct GNUNET_HashCode new_trail_id,
- struct GNUNET_PeerIdentity prev_hop,
- struct GNUNET_PeerIdentity next_hop);
-
-
-/**
- * Check if the size of routing table has crossed threshold.
- * @return #GNUNET_YES, if threshold crossed
- * #GNUNET_NO, if size is within threshold
- */
-int
-GDS_ROUTING_threshold_reached (void);
-
-#if 0
-/**
- * Test function. Remove afterwards.
- */
-void
-GDS_ROUTING_test_print (void);
-#endif
-
-/**
- * Initialize routing subsystem.
- */
-void
-GDS_ROUTING_init (void);
-
-/**
- * Shutdown routing subsystem.
- */
-void
-GDS_ROUTING_done (void);
-
-#endif
\ No newline at end of file
Modified: gnunet/src/dht/gnunet-service-xdht.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht.c 2015-04-27 12:53:35 UTC (rev
35561)
+++ gnunet/src/dht/gnunet-service-xdht.c 2015-04-27 13:00:54 UTC (rev
35562)
@@ -35,7 +35,6 @@
#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"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35562 - gnunet/src/dht,
gnunet <=