ChronosXYZ/KademliaDHT
1
0
Fork 0
mirror of https://github.com/ChronosX88/KademliaDHT.git synced 2024-11-22 10:12:19 +00:00
Code Issues Projects Releases Wiki Activity

Setup the get bucket ID computation in one method.

Browse Source 
Added Javadoc
This commit is contained in:
Joshua Kissoon 2014-03-22 12:55:19 +05:30
parent 104f20775f
commit 6fdff97429
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/dist/

1
src/kademlia/core/KadServer.java
View File

@ -209,7 +209,6 @@ public class KadServer
/* If there is a reciever in the receivers to handle this */ /* If there is a reciever in the receivers to handle this */
synchronized (this) synchronized (this)
{ {
this.printReceivers();
receiver = this.receivers.remove(comm); receiver = this.receivers.remove(comm);
TimerTask task = (TimerTask) tasks.remove(comm); TimerTask task = (TimerTask) tasks.remove(comm);
task.cancel(); task.cancel();

30
src/kademlia/routing/RoutingTable.java
View File

@ -49,28 +49,23 @@ public class RoutingTable
} }
/** /**
* Adds a new node to the routing table * Adds a new node to the routing table based on how far it is from the LocalNode.
* *
* @param n The contact to add * @param n The contact to add
*/ */
public final void insert(Node n) public final void insert(Node n)
{ {
/* bucketId is the distance between these nodes */ this.buckets[this.getBucketId(n.getNodeId())].insert(n);
int bucketId = this.localNode.getNodeId().getDistance(n.getNodeId());
/* Put this contact to the bucket that stores contacts prefixLength distance away */
this.buckets[bucketId].insert(n);
} }
/** /**
* Remove a node from the routing table * Remove a node from the routing table.
* *
* @param n The node to remove * @param n The node to remove
*/ */
public final void remove(Node n) public final void remove(Node n)
{ {
/* Find the first set bit: how far this node is away from the contact node */ int bucketId = this.getBucketId(n.getNodeId());
int bucketId = this.localNode.getNodeId().getDistance(n.getNodeId());
/* If the bucket has the contact, remove it */ /* If the bucket has the contact, remove it */
if (this.buckets[bucketId].containNode(n)) if (this.buckets[bucketId].containNode(n))
@ -79,6 +74,21 @@ public class RoutingTable
} }
} }
/**
* Compute the bucket ID in which a given node should be placed; the bucketId is computed based on how far the node is away from the Local Node.
*
* @param nid The NodeId for which we want to find which bucket it belong to
*
* @return Integer The bucket ID in which the given node should be placed.
*/
public final int getBucketId(NodeId nid)
{
int bId = this.localNode.getNodeId().getDistance(nid) - 1;
/* If we are trying to insert a node into it's own routing table, then the bucket ID will be -1, so let's just keep it in bucket 0 */
return bId < 0 ? 0 : bId;
}
/** /**
* Find the closest set of contacts to a given NodeId * Find the closest set of contacts to a given NodeId
* *
@ -92,7 +102,7 @@ public class RoutingTable
List<Node> closest = new ArrayList<>(num); List<Node> closest = new ArrayList<>(num);
/* Get the bucket index to search for closest from */ /* Get the bucket index to search for closest from */
int bucketIndex = this.localNode.getNodeId().getDistance(target) - 1; int bucketIndex = this.getBucketId(target);
/* Add the contacts from this bucket to the return contacts */ /* Add the contacts from this bucket to the return contacts */
for (Node c : this.buckets[bucketIndex].getNodes()) for (Node c : this.buckets[bucketIndex].getNodes())