From f77a3c7f5663d2446fc2864e36ab98780554644e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 17 Apr 2014 18:54:58 +0000
Subject: [PATCH] NTCP: Log tweaks to help on ticket #996
---
core/java/src/net/i2p/crypto/CryptixAESEngine.java | 10 ++++++++--
.../java/src/net/i2p/router/transport/ntcp/Writer.java | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/core/java/src/net/i2p/crypto/CryptixAESEngine.java b/core/java/src/net/i2p/crypto/CryptixAESEngine.java
index 35a2d37e61..a5af3c2082 100644
--- a/core/java/src/net/i2p/crypto/CryptixAESEngine.java
+++ b/core/java/src/net/i2p/crypto/CryptixAESEngine.java
@@ -81,8 +81,14 @@ public class CryptixAESEngine extends AESEngine {
*/
@Override
public void encrypt(byte payload[], int payloadIndex, byte out[], int outIndex, SessionKey sessionKey, byte iv[], int ivOffset, int length) {
- if ( (payload == null) || (out == null) || (sessionKey == null) || (iv == null) )
- throw new NullPointerException("invalid args to aes");
+ if (payload == null)
+ throw new NullPointerException("invalid args to aes - payload");
+ if (out == null)
+ throw new NullPointerException("invalid args to aes - out");
+ if (sessionKey == null)
+ throw new NullPointerException("invalid args to aes - sessionKey");
+ if (iv == null)
+ throw new NullPointerException("invalid args to aes - iv");
if (payload.length < payloadIndex + length)
throw new IllegalArgumentException("Payload is too short");
if (out.length < outIndex + length)
diff --git a/router/java/src/net/i2p/router/transport/ntcp/Writer.java b/router/java/src/net/i2p/router/transport/ntcp/Writer.java
index 3d01bfc9dd..8ec823e56e 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/Writer.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/Writer.java
@@ -128,7 +128,7 @@ class Writer {
_prepBuffer.init();
con.prepareNextWrite(_prepBuffer);
} catch (RuntimeException re) {
- _log.log(Log.CRIT, "Error in the ntcp writer", re);
+ _log.log(Log.CRIT, "Error in the ntcp writer on " + con, re);
}
}
}
--
GitLab