From 3d6a5bd9e7b390ffca28dc4fa324a720ca130af2 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 2 Dec 2010 16:17:28 +0000
Subject: [PATCH] fix extension messages
---
apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java | 1 +
.../i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java | 5 ++---
apps/i2psnark/java/src/org/klomp/snark/PeerState.java | 5 ++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
index d0abe06efd..43bb9a7122 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java
@@ -178,6 +178,7 @@ class PeerConnectionIn implements Runnable
ps.extensionMessage(id, payload);
if (_log.shouldLog(Log.DEBUG))
_log.debug("Received extension message from " + peer + " on " + peer.metainfo.getName());
+ break;
default:
byte[] bs = new byte[i-1];
din.readFully(bs);
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
index 66399aa340..38cb29e3b4 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
@@ -543,9 +543,8 @@ class PeerConnectionOut implements Runnable
m.type = Message.EXTENSION;
m.piece = id;
m.data = bytes;
- m.begin = 0;
- m.length = bytes.length;
+ m.off = 0;
+ m.len = bytes.length;
addMessage(m);
-
}
}
diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
index 4db84ad686..0c3c9eee88 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerState.java
@@ -493,7 +493,10 @@ class PeerState implements DataLoader
Map map = bev.getMap();
if (_log.shouldLog(Log.DEBUG))
_log.debug("Got extension handshake message " + bev.toString());
- } catch (Exception e) {}
+ } catch (Exception e) {
+ if (_log.shouldLog(Log.DEBUG))
+ _log.debug("Failed extension decode", e);
+ }
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Got extended message type: " + id + " length: " + bs.length);
--
GitLab