[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34106 - gnunet/src/dht
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34106 - gnunet/src/dht |
Date: |
Mon, 4 Aug 2014 16:18:11 +0200 |
Author: supriti
Date: 2014-08-04 16:18:10 +0200 (Mon, 04 Aug 2014)
New Revision: 34106
Modified:
gnunet/src/dht/gnunet-service-xdht_clients.c
gnunet/src/dht/gnunet-service-xdht_datacache.c
gnunet/src/dht/gnunet-service-xdht_neighbours.c
Log:
xvine:fixes
Modified: gnunet/src/dht/gnunet-service-xdht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht_clients.c 2014-08-04 13:55:10 UTC
(rev 34105)
+++ gnunet/src/dht/gnunet-service-xdht_clients.c 2014-08-04 14:18:10 UTC
(rev 34106)
@@ -967,6 +967,7 @@
memset(&best_known_destination, 0 , sizeof (struct GNUNET_PeerIdentity));
memset(&intermediate_trail_id, 0, sizeof (struct GNUNET_HashCode));
+
GDS_NEIGHBOURS_send_put (&put_msg->key,
ntohl (put_msg->type), ntohl (put_msg->options),
ntohl (put_msg->desired_replication_level),
Modified: gnunet/src/dht/gnunet-service-xdht_datacache.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht_datacache.c 2014-08-04 13:55:10 UTC
(rev 34105)
+++ gnunet/src/dht/gnunet-service-xdht_datacache.c 2014-08-04 14:18:10 UTC
(rev 34106)
@@ -228,7 +228,6 @@
i++;
iterator = iterator->next;
}
-
GDS_NEIGHBOURS_send_get_result (key,type,
&(ctx->next_hop),&(ctx->source_peer),
put_path_length, put_path,
ctx->get_path_length,
get_path, exp, data, size );
Modified: gnunet/src/dht/gnunet-service-xdht_neighbours.c
===================================================================
--- gnunet/src/dht/gnunet-service-xdht_neighbours.c 2014-08-04 13:55:10 UTC
(rev 34105)
+++ gnunet/src/dht/gnunet-service-xdht_neighbours.c 2014-08-04 14:18:10 UTC
(rev 34106)
@@ -71,7 +71,7 @@
/**
* How long to wait before sending another verify successor message.
*/
-#define DHT_SEND_VERIFY_SUCCESSOR_INTERVAL GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 1)
+#define DHT_SEND_VERIFY_SUCCESSOR_INTERVAL GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 1)
/**
* How long at most to wait for transmission of a request to a friend ?
@@ -93,7 +93,7 @@
/**
* Maximum number of trails stored per finger.
*/
-#define MAXIMUM_TRAILS_PER_FINGER 1
+#define MAXIMUM_TRAILS_PER_FINGER 4
/**
* Finger map index for predecessor entry in finger table.
@@ -971,10 +971,13 @@
struct P2PPendingMessage *pending;
if (NULL == (pending = peer->head))
+ {
return;
+ }
if (NULL != peer->th)
+ {
return;
-
+ }
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop
("# Bytes of bandwidth requested from core"),
@@ -1762,6 +1765,8 @@
}
}
+
+
/**
* This is a test function, to print all the entries of finger table.
*/
@@ -2152,7 +2157,7 @@
{
/* I am the destination. */
GDS_DATACACHE_handle_put (expiration_time, key, 0, NULL,
- ntohl (block_type),data_size,data);
+ block_type,data_size,data);
return;
}
else
@@ -2189,7 +2194,6 @@
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);
@@ -3270,7 +3274,6 @@
diff = ultimate_destination_finger_value - my_id64;
finger_table_index = find_set_bit (diff);
}
-
return finger_table_index;
}
@@ -3367,6 +3370,14 @@
current_search_finger_index = 0;
return;
}
+ struct FingerInfo *prev_finger;
+ prev_finger = &finger_table[finger_table_index - 1];
+ if (0 == GNUNET_CRYPTO_cmp_peer_identity (&finger_identity,
+ &prev_finger->finger_identity))
+ {
+ current_search_finger_index--;
+ return;
+ }
}
existing_finger = &finger_table[finger_table_index];
@@ -4000,7 +4011,7 @@
target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap, peer);
else
target_friend = GNUNET_CONTAINER_multipeermap_get (friend_peermap,
&source);
- if (NULL != target_friend)
+ if (NULL == target_friend)
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34106 - gnunet/src/dht,
gnunet <=