I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Verified Commit 121cb2c9 authored by zzz's avatar zzz
Browse files

NTCP: Fix reported NPE in debug logging on java 16

parent ea7183ee
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ package net.i2p.router.transport.ntcp; ...@@ -2,6 +2,7 @@ package net.i2p.router.transport.ntcp;
import java.io.Closeable; import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.SelectionKey; import java.nio.channels.SelectionKey;
...@@ -1759,9 +1760,16 @@ public class NTCPConnection implements Closeable { ...@@ -1759,9 +1760,16 @@ public class NTCPConnection implements Closeable {
@Override @Override
public String toString() { public String toString() {
String fromIP;
if (_isInbound) {
InetAddress addr = _chan.socket().getInetAddress();
fromIP = addr != null ? addr.getHostAddress() : "unknown";
} else {
fromIP = null;
}
return "NTCP" + _version + " conn " + return "NTCP" + _version + " conn " +
_connID + _connID +
(_isInbound ? (" from " + _chan.socket().getInetAddress() + " port " + _chan.socket().getPort() + ' ') (_isInbound ? (" from " + fromIP + " port " + _chan.socket().getPort() + ' ')
: (" to " + _remAddr.getHost() + " port " + _remAddr.getPort() + ' ')) + : (" to " + _remAddr.getHost() + " port " + _remAddr.getPort() + ' ')) +
(_remotePeer == null ? "unknown" : _remotePeer.calculateHash().toBase64().substring(0,6)) + (_remotePeer == null ? "unknown" : _remotePeer.calculateHash().toBase64().substring(0,6)) +
(isEstablished() ? "" : " not established") + (isEstablished() ? "" : " not established") +
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment