This commit is contained in:
zzz
2012-08-05 16:55:39 +00:00
parent 280a708afe
commit 67f16b0de4
6 changed files with 11 additions and 6 deletions

View File

@ -778,7 +778,6 @@ public class KBucketSet<T extends SimpleDataStructure> {
* To always discard a newer entry, always return false. * To always discard a newer entry, always return false.
* *
* @param kbucket the kbucket that is now too big * @param kbucket the kbucket that is now too big
* @param justAdded the entry that was just added, causing it to be too big
* @return true to actually add the entry. * @return true to actually add the entry.
*/ */
public boolean trim(KBucket<K> kbucket, K toAdd); public boolean trim(KBucket<K> kbucket, K toAdd);

View File

@ -0,0 +1,6 @@
<html><body><p>
This is a major rewrite of KBucket, KBucketSet, and KBucketImpl from net.i2p.router.networkdb.kademlia.
The classes are now generic to support SHA1. SHA256, or other key lengths.
The long-term goal is to prove out this new implementation in i2psnark,
then move it to core, then convert the network database to use it.
</p></body></html>

View File

@ -194,10 +194,10 @@ interface PeerListener
* *
* @param peer the Peer that got the message. * @param peer the Peer that got the message.
* @param port the query port * @param port the query port
* @param port the response port * @param rport the response port
* @since 0.8.4 * @since 0.8.4
*/ */
void gotPort(Peer peer, int port, int qport); void gotPort(Peer peer, int port, int rport);
/** /**
* Called when peers are received via PEX * Called when peers are received via PEX

View File

@ -98,7 +98,7 @@ class DHTNodes {
/** /**
* DHT * DHT
* @param sha1 either a InfoHash or a NID * @param h either a InfoHash or a NID
*/ */
public List<NodeInfo> findClosest(SHA1Hash h, int numWant) { public List<NodeInfo> findClosest(SHA1Hash h, int numWant) {
NID key; NID key;

View File

@ -383,7 +383,7 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
* Non-blocking. * Non-blocking.
* *
* @param ih the Info Hash (torrent) * @param ih the Info Hash (torrent)
* @param peer the peer's Hash * @param peerHash the peer's Hash
*/ */
public void announce(byte[] ih, byte[] peerHash) { public void announce(byte[] ih, byte[] peerHash) {
InfoHash iHash = new InfoHash(ih); InfoHash iHash = new InfoHash(ih);

View File

@ -422,7 +422,7 @@
<group title="BOB Bridge" packages="net.i2p.BOB" /> <group title="BOB Bridge" packages="net.i2p.BOB" />
<group title="BOB Demos" packages="net.i2p.BOB.Demos.echo.echoclient:net.i2p.BOB.Demos.echo.echoserver" /> <group title="BOB Demos" packages="net.i2p.BOB.Demos.echo.echoclient:net.i2p.BOB.Demos.echo.echoserver" />
<group title="Desktopgui Application" packages="net.i2p.desktopgui:net.i2p.desktopgui.*" /> <group title="Desktopgui Application" packages="net.i2p.desktopgui:net.i2p.desktopgui.*" />
<group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*" /> <group title="I2PSnark Application" packages="org.klomp.snark:org.klomp.snark.*:net.i2p.kademlia" />
<group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" /> <group title="I2PTunnel Application" packages="net.i2p.i2ptunnel:net.i2p.i2ptunnel.*" />
<group title="Jetty Logging" packages="net.i2p.jetty" /> <group title="Jetty Logging" packages="net.i2p.jetty" />
<group title="SAM Bridge" packages="net.i2p.sam" /> <group title="SAM Bridge" packages="net.i2p.sam" />