I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

prevent NPE

Browse Source
This commit is contained in:
zzz
2009-04-06 19:43:54 +00:00
parent 3dd5950bd1
commit 9e7dd238a4
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
router/java/src/net/i2p/router/transport/ntcp/EstablishState.java
View File

@ -462,7 +462,6 @@ public class EstablishState {
if (!_verified) { if (!_verified) {
_context.statManager().addRateData("ntcp.invalidSignature", 1, 0); _context.statManager().addRateData("ntcp.invalidSignature", 1, 0);
fail("Signature was invalid - attempt to spoof " + _con.getRemotePeer().calculateHash().toBase64() + "?"); fail("Signature was invalid - attempt to spoof " + _con.getRemotePeer().calculateHash().toBase64() + "?");
return;
} else { } else {
if (_log.shouldLog(Log.DEBUG)) if (_log.shouldLog(Log.DEBUG))
_log.debug(prefix() + "signature verified from Bob. done!"); _log.debug(prefix() + "signature verified from Bob. done!");
@ -472,10 +471,12 @@ public class EstablishState {
byte nextReadIV[] = new byte[16]; byte nextReadIV[] = new byte[16];
System.arraycopy(_e_bobSig, _e_bobSig.length-16, nextReadIV, 0, nextReadIV.length); System.arraycopy(_e_bobSig, _e_bobSig.length-16, nextReadIV, 0, nextReadIV.length);
_con.finishOutboundEstablishment(_dh.getSessionKey(), (_tsA-_tsB), nextWriteIV, nextReadIV); // skew in seconds _con.finishOutboundEstablishment(_dh.getSessionKey(), (_tsA-_tsB), nextWriteIV, nextReadIV); // skew in seconds
_transport.setIP(_con.getRemotePeer().calculateHash(), // if socket gets closed this will be null - prevent NPE
_con.getChannel().socket().getInetAddress().getAddress()); InetAddress ia = _con.getChannel().socket().getInetAddress();
return; if (ia != null)
_transport.setIP(_con.getRemotePeer().calculateHash(), ia.getAddress());
} }
return;
} }
} }
} }