diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java
index c3beba3c86097da8ba552cec94888324109f219f..2830e019738450460190c24a247807341118cbba 100644
--- a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java
+++ b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java
@@ -136,11 +136,11 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
// probably don't need again
_token = token;
_handshakeState.start();
- if (_log.shouldDebug())
- _log.debug("State after start: " + _handshakeState);
+ //if (_log.shouldDebug())
+ // _log.debug("State after start: " + _handshakeState);
_handshakeState.mixHash(data, off, LONG_HEADER_SIZE);
- if (_log.shouldDebug())
- _log.debug("State after mixHash 1: " + _handshakeState);
+ //if (_log.shouldDebug())
+ // _log.debug("State after mixHash 1: " + _handshakeState);
// decrypt in-place
try {
@@ -150,8 +150,8 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
_log.debug("Session request error, State at failure: " + _handshakeState + '\n' + net.i2p.util.HexDump.dump(data, off, len), gse);
throw gse;
}
- if (_log.shouldDebug())
- _log.debug("State after sess req: " + _handshakeState);
+ //if (_log.shouldDebug())
+ // _log.debug("State after sess req: " + _handshakeState);
processPayload(data, off + LONG_HEADER_SIZE, len - (LONG_HEADER_SIZE + KEY_LEN + MAC_LEN), true);
_sendHeaderEncryptKey2 = SSU2Util.hkdf(_context, _handshakeState.getChainingKey(), "SessCreateHeader");
_currentState = InboundState.IB_STATE_REQUEST_RECEIVED;
@@ -407,14 +407,6 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
_transport.getEstablisher().receiveSessionDestroy(_remoteHostId);
}
- public void gotUnknown(int type, int len) {
- if (_log.shouldDebug())
- _log.debug("Got UNKNOWN block, type: " + type + " len: " + len);
- }
-
- public void gotPadding(int paddingLength, int frameLength) {
- }
-
/////////////////////////////////////////////////////////
// end payload callbacks
/////////////////////////////////////////////////////////
@@ -495,8 +487,8 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
throw new GeneralSecurityException("Token mismatch: 1: " + _token + " 2: " + token);
_handshakeState.start();
_handshakeState.mixHash(data, off, 32);
- if (_log.shouldDebug())
- _log.debug("State after mixHash 1: " + _handshakeState);
+ //if (_log.shouldDebug())
+ // _log.debug("State after mixHash 1: " + _handshakeState);
// decrypt in-place
try {
@@ -506,8 +498,8 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
_log.debug("Session Request error, State at failure: " + _handshakeState + '\n' + net.i2p.util.HexDump.dump(data, off, len), gse);
throw gse;
}
- if (_log.shouldDebug())
- _log.debug("State after sess req: " + _handshakeState);
+ //if (_log.shouldDebug())
+ // _log.debug("State after sess req: " + _handshakeState);
_timeReceived = 0;
processPayload(data, off + LONG_HEADER_SIZE, len - (LONG_HEADER_SIZE + KEY_LEN + MAC_LEN), true);
packetReceived();
@@ -545,8 +537,8 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
if (rid != _rcvConnID)
throw new GeneralSecurityException("Conn ID mismatch: req: " + _rcvConnID + " conf: " + rid);
_handshakeState.mixHash(data, off, 16);
- if (_log.shouldDebug())
- _log.debug("State after mixHash 3: " + _handshakeState);
+ //if (_log.shouldDebug())
+ // _log.debug("State after mixHash 3: " + _handshakeState);
// decrypt in-place
try {
@@ -556,8 +548,8 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
_log.debug("Session Confirmed error, State at failure: " + _handshakeState + '\n' + net.i2p.util.HexDump.dump(data, off, len), gse);
throw gse;
}
- if (_log.shouldDebug())
- _log.debug("State after sess conf: " + _handshakeState);
+ //if (_log.shouldDebug())
+ // _log.debug("State after sess conf: " + _handshakeState);
processPayload(data, off + SHORT_HEADER_SIZE, len - (SHORT_HEADER_SIZE + KEY_LEN + MAC_LEN + MAC_LEN), false);
packetReceived();
if (_currentState == InboundState.IB_STATE_FAILED) {
diff --git a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState2.java b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState2.java
index a430b03858593ccb64c7e6a91b35fd7a3892daee..4b53cff3ec5518051a50095b5dd7360a54e2bdc9 100644
--- a/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState2.java
+++ b/router/java/src/net/i2p/router/transport/udp/OutboundEstablishState2.java
@@ -270,14 +270,6 @@ class OutboundEstablishState2 extends OutboundEstablishState implements SSU2Payl
_transport.getEstablisher().receiveSessionDestroy(_remoteHostId, this);
}
- public void gotUnknown(int type, int len) {
- if (_log.shouldDebug())
- _log.debug("Got UNKNOWN block, type: " + type + " len: " + len);
- }
-
- public void gotPadding(int paddingLength, int frameLength) {
- }
-
/////////////////////////////////////////////////////////
// end payload callbacks
/////////////////////////////////////////////////////////
diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState2.java b/router/java/src/net/i2p/router/transport/udp/PeerState2.java
index 94fc7211f2ecea326f044023fc117a6b3ba1bb6b..9aff6ac0758ea673dcad2394a102bf99366f9391 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerState2.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerState2.java
@@ -512,14 +512,6 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback
_transport.getEstablisher().receiveSessionDestroy(_remoteHostId, this);
}
- public void gotUnknown(int type, int len) {
- if (_log.shouldDebug())
- _log.debug("Got UNKNOWN block, type: " + type + " len: " + len);
- }
-
- public void gotPadding(int paddingLength, int frameLength) {
- }
-
/////////////////////////////////////////////////////////
// end payload callbacks
/////////////////////////////////////////////////////////
diff --git a/router/java/src/net/i2p/router/transport/udp/SSU2Payload.java b/router/java/src/net/i2p/router/transport/udp/SSU2Payload.java
index 69a3243de52b958bab44583326ea529d7264f078..4dfdafad392f3a0a5ec174c3759370a188ea8613 100644
--- a/router/java/src/net/i2p/router/transport/udp/SSU2Payload.java
+++ b/router/java/src/net/i2p/router/transport/udp/SSU2Payload.java
@@ -13,6 +13,7 @@ import net.i2p.data.i2np.I2NPMessage;
import net.i2p.data.i2np.I2NPMessageException;
import net.i2p.data.i2np.I2NPMessageImpl;
import net.i2p.data.router.RouterInfo;
+import net.i2p.util.Log;
/**
*
@@ -125,15 +126,6 @@ class SSU2Payload {
* @param lastReceived in theory could wrap around to negative, but very unlikely
*/
public void gotTermination(int reason, long lastReceived);
-
- /**
- * For stats.
- * @param paddingLength the number of padding bytes, not including the 3-byte block header
- * @param frameLength the total size of the frame, including all blocks and block headers
- */
- public void gotPadding(int paddingLength, int frameLength);
-
- public void gotUnknown(int type, int len);
}
/**
@@ -364,13 +356,12 @@ class SSU2Payload {
case BLOCK_PADDING:
gotPadding = true;
- cb.gotPadding(len, length);
break;
default:
- if (isHandshake)
- throw new IOException("Illegal block in handshake: " + type);
- cb.gotUnknown(type, len);
+ Log log = ctx.logManager().getLog(SSU2Payload.class);
+ if (log.shouldWarn())
+ log.warn("Got UNKNOWN block, type: " + type + " len: " + len + " on " + cb);
break;
}