echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final compact response format

Browse Source
This commit is contained in:
zzz
2010-07-11 14:45:12 +00:00
parent 05ac2594b6
commit 0634154b28
1 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
apps/i2psnark/java/src/org/klomp/snark/TrackerInfo.java
View File

@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.HashSet; import java.util.HashSet;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -36,8 +35,8 @@ import org.klomp.snark.bencode.InvalidBEncodingException;
/** /**
* The data structure for the tracker response. * The data structure for the tracker response.
* Handles both traditional and compact formats. * Handles both traditional and compact formats.
* Compact format 1 - a list of hashes - implemented * Compact format 1 - a list of hashes - early format for testing
* Compact format 2 - One big string of concatenated hashes - unimplemented * Compact format 2 - One big string of concatenated hashes - official format
*/ */
public class TrackerInfo public class TrackerInfo
{ {
@ -79,11 +78,19 @@ public class TrackerInfo
interval = beInterval.getInt(); interval = beInterval.getInt();
BEValue bePeers = (BEValue)m.get("peers"); BEValue bePeers = (BEValue)m.get("peers");
if (bePeers == null) if (bePeers == null) {
peers = Collections.EMPTY_SET; peers = Collections.EMPTY_SET;
else } else {
// if compact is going to be one big string instead, try/catch here Set<Peer> p;
peers = getPeers(bePeers.getList(), my_id, metainfo); try {
// One big string (the official compact format)
p = getPeers(bePeers.getBytes(), my_id, metainfo);
} catch (InvalidBEncodingException ibe) {
// List of Dictionaries or List of Strings
p = getPeers(bePeers.getList(), my_id, metainfo);
}
peers = p;
}
BEValue bev = (BEValue)m.get("complete"); BEValue bev = (BEValue)m.get("complete");
if (bev != null) try { if (bev != null) try {
@ -115,6 +122,7 @@ public class TrackerInfo
} }
******/ ******/
/** List of Dictionaries or List of Strings */
private static Set<Peer> getPeers(List<BEValue> l, byte[] my_id, MetaInfo metainfo) private static Set<Peer> getPeers(List<BEValue> l, byte[] my_id, MetaInfo metainfo)
throws IOException throws IOException
{ {
@ -128,6 +136,7 @@ public class TrackerInfo
} catch (InvalidBEncodingException ibe) { } catch (InvalidBEncodingException ibe) {
try { try {
// Case 2 - compact - A list of 32-byte binary strings (hashes) // Case 2 - compact - A list of 32-byte binary strings (hashes)
// This was just for testing and is not the official format
peerID = new PeerID(bev.getBytes()); peerID = new PeerID(bev.getBytes());
} catch (InvalidBEncodingException ibe2) { } catch (InvalidBEncodingException ibe2) {
// don't let one bad entry spoil the whole list // don't let one bad entry spoil the whole list
@ -141,6 +150,34 @@ public class TrackerInfo
return peers; return peers;
} }
private static final int HASH_LENGTH = 32;
/**
* One big string of concatenated 32-byte hashes
* @since 0.8.1
*/
private static Set<Peer> getPeers(byte[] l, byte[] my_id, MetaInfo metainfo)
throws IOException
{
int count = l.length / HASH_LENGTH;
Set<Peer> peers = new HashSet(count);
for (int i = 0; i < count; i++) {
PeerID peerID;
byte[] hash = new byte[HASH_LENGTH];
System.arraycopy(l, i * HASH_LENGTH, hash, 0, HASH_LENGTH);
try {
peerID = new PeerID(hash);
} catch (InvalidBEncodingException ibe) {
// won't happen
continue;
}
peers.add(new Peer(peerID, my_id, metainfo));
}
return peers;
}
public Set<Peer> getPeers() public Set<Peer> getPeers()
{ {
return peers; return peers;