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

i2psnark: Log tweaks and cleanups after testing

Browse Source
This commit is contained in:
zzz
2015-05-19 21:56:21 +00:00
parent de4d47de95
commit 65ff2c0afe
5 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,17 +90,20 @@ abstract class ExtensionHandler {
peer.setHandshakeMap(map); peer.setHandshakeMap(map);
Map<String, BEValue> msgmap = map.get("m").getMap(); Map<String, BEValue> msgmap = map.get("m").getMap();
if (msgmap.get(TYPE_PEX) != null) {
if (log.shouldLog(Log.DEBUG)) if (log.shouldLog(Log.DEBUG))
log.debug("Peer supports PEX extension: " + peer); log.debug("Peer " + peer + " supports extensions: " + msgmap.keySet());
// peer state calls peer listener calls sendPEX()
}
if (msgmap.get(TYPE_DHT) != null) { //if (msgmap.get(TYPE_PEX) != null) {
if (log.shouldLog(Log.DEBUG)) // if (log.shouldLog(Log.DEBUG))
log.debug("Peer supports DHT extension: " + peer); // log.debug("Peer supports PEX extension: " + peer);
// peer state calls peer listener calls sendDHT() // // peer state calls peer listener calls sendPEX()
} //}
//if (msgmap.get(TYPE_DHT) != null) {
// if (log.shouldLog(Log.DEBUG))
// log.debug("Peer supports DHT extension: " + peer);
// // peer state calls peer listener calls sendDHT()
//}
MagnetState state = peer.getMagnetState(); MagnetState state = peer.getMagnetState();

6
apps/i2psnark/java/src/org/klomp/snark/Peer.java
View File

@ -82,12 +82,12 @@ public class Peer implements Comparable<Peer>
// bytes per bt spec: 0011223344556677 // bytes per bt spec: 0011223344556677
private static final long OPTION_EXTENSION = 0x0000000000100000l; private static final long OPTION_EXTENSION = 0x0000000000100000l;
private static final long OPTION_FAST = 0x0000000000000004l; private static final long OPTION_FAST = 0x0000000000000004l;
private static final long OPTION_DHT = 0x0000000000000001l; //private static final long OPTION_DHT = 0x0000000000000001l;
/** we use a different bit since the compact format is different */ /** we use a different bit since the compact format is different */
/* no, let's use an extension message /* no, let's use an extension message
static final long OPTION_I2P_DHT = 0x0000000040000000l; static final long OPTION_I2P_DHT = 0x0000000040000000l;
*/ */
private static final long OPTION_AZMP = 0x1000000000000000l; //private static final long OPTION_AZMP = 0x1000000000000000l;
private long options; private long options;
/** /**
@ -388,7 +388,7 @@ public class Peer implements Comparable<Peer>
if (options != 0) { if (options != 0) {
// send them something in runConnection() above // send them something in runConnection() above
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug("Peer supports options 0x" + Long.toString(options, 16) + ": " + toString()); _log.debug("Peer supports options 0x" + Long.toHexString(options) + ": " + toString());
} }
return bs; return bs;

2
apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
View File

@ -98,8 +98,6 @@ class PeerConnectionIn implements Runnable
} }
byte b = din.readByte(); byte b = din.readByte();
Message m = new Message();
m.type = b;
switch (b) switch (b)
{ {
case Message.CHOKE: case Message.CHOKE:

14
apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
View File

@ -286,6 +286,8 @@ class PeerConnectionOut implements Runnable
r.piece = m.piece; r.piece = m.piece;
r.begin = m.begin; r.begin = m.begin;
r.length = m.length; r.length = m.length;
if (_log.shouldLog(Log.DEBUG))
_log.debug("Send " + peer + ": " + r);
try { try {
r.sendMessage(dout); r.sendMessage(dout);
} catch (IOException ioe) {} } catch (IOException ioe) {}
@ -525,7 +527,8 @@ class PeerConnectionOut implements Runnable
} }
/** /**
* Remove all Request messages from the queue * Remove all Request messages from the queue.
* Does not send a cancel message.
* @since 0.8.2 * @since 0.8.2
*/ */
void cancelRequestMessages() { void cancelRequestMessages() {
@ -537,9 +540,12 @@ class PeerConnectionOut implements Runnable
} }
} }
// Called by the PeerState when the other side doesn't want this /**
// request to be handled anymore. Removes any pending Piece Message * Called by the PeerState when the other side doesn't want this
// from out send queue. * request to be handled anymore. Removes any pending Piece Message
* from out send queue.
* Does not send a cancel message.
*/
void cancelRequest(int piece, int begin, int length) void cancelRequest(int piece, int begin, int length)
{ {
synchronized (sendQueue) synchronized (sendQueue)

10
apps/i2psnark/java/src/org/klomp/snark/PeerState.java
View File

@ -165,9 +165,15 @@ class PeerState implements DataLoader
* @since 0.9.21 * @since 0.9.21
*/ */
private void bitfieldMessage(byte[] bitmap, boolean isAll) { private void bitfieldMessage(byte[] bitmap, boolean isAll) {
if (_log.shouldLog(Log.DEBUG)) {
if (bitmap != null)
_log.debug(peer + " rcv bitfield bytes: " + bitmap.length);
else if (isAll)
_log.debug(peer + " rcv bitfield HAVE_ALL");
else
_log.debug(peer + " rcv bitfield HAVE_NONE");
}
synchronized(this) { synchronized(this) {
if (_log.shouldLog(Log.DEBUG))
_log.debug(peer + " rcv bitfield");
if (bitfield != null) if (bitfield != null)
{ {
// XXX - Be liberal in what you accept? // XXX - Be liberal in what you accept?