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

Fix NPE

Browse Source
This commit is contained in:
zzz
2021-12-18 09:40:01 -05:00
parent 6204d0afa6
commit 3fa4be2889
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java
View File

@@ -205,7 +205,7 @@ public class NTCPConnection implements Closeable {
DELAY_DEFAULT, DELAY_DEFAULT); DELAY_DEFAULT, DELAY_DEFAULT);
private static final int MIN_PADDING_RANGE = 16; private static final int MIN_PADDING_RANGE = 16;
private static final int MAX_PADDING_RANGE = 128; private static final int MAX_PADDING_RANGE = 128;
private NTCP2Options _paddingConfig; private NTCP2Options _paddingConfig = OUR_PADDING;
private int _version; private int _version;
private CipherState _sender; private CipherState _sender;
private long _sendSipk1, _sendSipk2; private long _sendSipk1, _sendSipk2;
@@ -1346,7 +1346,6 @@ public class NTCPConnection implements Closeable {
synchronized void finishOutboundEstablishment(CipherState sender, CipherState receiver, synchronized void finishOutboundEstablishment(CipherState sender, CipherState receiver,
byte[] sip_ab, byte[] sip_ba, long clockSkew) { byte[] sip_ab, byte[] sip_ba, long clockSkew) {
finishEstablishment(sender, receiver, sip_ab, sip_ba, clockSkew); finishEstablishment(sender, receiver, sip_ab, sip_ba, clockSkew);
_paddingConfig = OUR_PADDING;
_transport.markReachable(getRemotePeer().calculateHash(), false); _transport.markReachable(getRemotePeer().calculateHash(), false);
if (!_outbound.isEmpty()) if (!_outbound.isEmpty())
_transport.getWriter().wantsWrite(this, "outbound established"); _transport.getWriter().wantsWrite(this, "outbound established");
@@ -1378,8 +1377,6 @@ public class NTCPConnection implements Closeable {
"\nhis padding options: " + hisPadding + "\nhis padding options: " + hisPadding +
"\nour padding options: " + OUR_PADDING + "\nour padding options: " + OUR_PADDING +
"\nmerged config is: " + _paddingConfig); "\nmerged config is: " + _paddingConfig);
} else {
_paddingConfig = OUR_PADDING;
} }
NTCPConnection toClose = _transport.inboundEstablished(this); NTCPConnection toClose = _transport.inboundEstablished(this);
if (toClose != null && toClose != this) { if (toClose != null && toClose != this) {