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

i2psnark: Fix total_size in metadata message (ticket #1618)

Browse Source
This commit is contained in:
zzz
2015-07-25 13:15:56 +00:00
parent 1681598dec
commit fea6b8aec3
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/i2psnark/java/src/org/klomp/snark/ExtensionHandler.java
View File

@@ -207,30 +207,31 @@ abstract class ExtensionHandler {
if (log.shouldLog(Log.DEBUG)) if (log.shouldLog(Log.DEBUG))
log.debug("Got request for " + piece + " from: " + peer); log.debug("Got request for " + piece + " from: " + peer);
byte[] pc; byte[] pc;
int totalSize;
synchronized(state) { synchronized(state) {
pc = state.getChunk(piece); pc = state.getChunk(piece);
totalSize = state.getSize();
} }
sendPiece(peer, piece, pc); sendPiece(peer, piece, pc, totalSize);
// Do this here because PeerConnectionOut only reports for PIECE messages // Do this here because PeerConnectionOut only reports for PIECE messages
peer.uploaded(pc.length); peer.uploaded(pc.length);
listener.uploaded(peer, pc.length); listener.uploaded(peer, pc.length);
} else if (type == TYPE_DATA) { } else if (type == TYPE_DATA) {
int size = map.get("total_size").getInt(); // On close reading of BEP 9, this is the total metadata size.
if (log.shouldLog(Log.DEBUG)) // Prior to 0.9.21, we sent the piece size, so we can't count on it.
log.debug("Got data for " + piece + " length " + size + " from: " + peer); // just ignore it. The actual length will be verified in saveChunk()
//int size = map.get("total_size").getInt();
//if (log.shouldLog(Log.DEBUG))
// log.debug("Got data for " + piece + " length " + size + " from: " + peer);
boolean done; boolean done;
int chk = -1; int chk = -1;
synchronized(state) { synchronized(state) {
if (state.isComplete()) if (state.isComplete())
return; return;
int len = is.available(); int len = is.available();
if (len != size) {
// probably fatal
if (log.shouldLog(Log.WARN))
log.warn("total_size " + size + " but avail data " + len);
}
peer.downloaded(len); peer.downloaded(len);
listener.downloaded(peer, len); listener.downloaded(peer, len);
// this checks the size
done = state.saveChunk(piece, bs, bs.length - len, len); done = state.saveChunk(piece, bs, bs.length - len, len);
if (log.shouldLog(Log.INFO)) if (log.shouldLog(Log.INFO))
log.info("Got chunk " + piece + " from " + peer); log.info("Got chunk " + piece + " from " + peer);
@@ -293,11 +294,15 @@ abstract class ExtensionHandler {
} }
} }
private static void sendPiece(Peer peer, int piece, byte[] data) { private static void sendPiece(Peer peer, int piece, byte[] data, int totalSize) {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("msg_type", Integer.valueOf(TYPE_DATA)); map.put("msg_type", Integer.valueOf(TYPE_DATA));
map.put("piece", Integer.valueOf(piece)); map.put("piece", Integer.valueOf(piece));
map.put("total_size", Integer.valueOf(data.length)); // BEP 9
// "This key has the same semantics as the 'metadata_size' in the extension header"
// which apparently means the same value. Fixed in 0.9.21.
//map.put("total_size", Integer.valueOf(data.length));
map.put("total_size", Integer.valueOf(totalSize));
byte[] dict = BEncoder.bencode(map); byte[] dict = BEncoder.bencode(map);
byte[] payload = new byte[dict.length + data.length]; byte[] payload = new byte[dict.length + data.length];
System.arraycopy(dict, 0, payload, 0, dict.length); System.arraycopy(dict, 0, payload, 0, dict.length);