diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index 5d0494510e2db2cd1b1b0181880d956b4636d588..d248494e2b329b57e87df6ff939b0515c788808c 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -1062,7 +1062,7 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad if (routerInfo.getNetworkId() != _networkID){ _context.banlist().banlistRouterForever(key, "Not in our network: " + routerInfo.getNetworkId()); if (_log.shouldLog(Log.WARN)) - _log.warn("Bad network: " + routerInfo); + _log.warn("Not in our network: " + routerInfo, new Exception()); return "Not in our network"; } FamilyKeyCrypto fkc = _context.router().getFamilyKeyCrypto(); diff --git a/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java b/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java index 067ecad53e7ccb2291b18c7c5f9442ba14f71485..b7d0d6f990092d40b12e758e3f430cc6289370f4 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java @@ -591,7 +591,7 @@ class InboundEstablishState extends EstablishBase implements NTCP2Payload.Payloa if (!rv) { Hash aliceHash = alice.getHash(); if (_log.shouldLog(Log.WARN)) - _log.warn("Dropping inbound connection from wrong network: " + aliceID + ' ' + aliceHash); + _log.warn("Not in our network: " + alice, new Exception()); // So next time we will not accept the con from this IP, // rather than doing the whole handshake InetAddress addr = _con.getChannel().socket().getInetAddress(); diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index d56c59c7e19eec3ba008fd5573b5a70a7552c6d7..b8bc674fd8b8949a4e8b2bf55b10712309756779 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -531,6 +531,8 @@ public class NTCPTransport extends TransportImpl { } if (toAddress.getNetworkId() != _networkID) { _context.banlist().banlistRouterForever(peer, "Not in our network: " + toAddress.getNetworkId()); + if (_log.shouldWarn()) + _log.warn("Not in our network: " + toAddress, new Exception()); markUnreachable(peer); return null; } diff --git a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java index 59f410df95eb57803f05f1261e26839bd8ff810a..1393eb7f4a0ce9ae58f558d353f81685a77c36ac 100644 --- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java +++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java @@ -253,8 +253,10 @@ class EstablishmentManager { Hash toHash = toIdentity.calculateHash(); if (toRouterInfo.getNetworkId() != _networkID) { _context.banlist().banlistRouterForever(toHash, "Not in our network: " + toRouterInfo.getNetworkId()); + if (_log.shouldWarn()) + _log.warn("Not in our network: " + toRouterInfo, new Exception()); _transport.markUnreachable(toHash); - _transport.failed(msg, "Remote peer is on the wrong network, cannot establish"); + _transport.failed(msg, "Not in our network"); return; } UDPAddress addr = new UDPAddress(ra); diff --git a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java index fd6f04ceebd9631bddc7e602af5c33c3b7f17e59..3f5a619d9223677c506eceb7003c8f2242531964 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java @@ -393,8 +393,8 @@ class PeerTestManager { if (test.getReceiveBobTime() > 0) testComplete(true); } catch (UnknownHostException uhe) { - if (_log.shouldLog(Log.ERROR)) - _log.error("Charlie @ " + from + " said we were an invalid IP address: " + uhe.getMessage(), uhe); + if (_log.shouldWarn()) + _log.warn("Charlie @ " + from + " said we were an invalid IP address: " + uhe.getMessage(), uhe); _context.statManager().addRateData("udp.testBadIP", 1); } } else { diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java index b8e8496fef896f0e02b31ff08dad3e9bb2e14381..abc40021bfde09bc8fe9f527d498643f0e9f2c35 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -1542,9 +1542,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority //_context.banlist().banlistRouter(peerHash, "Part of the wrong network", STYLE); if (peer != null) sendDestroy(peer); - dropPeer(peerHash, false, "wrong network"); + dropPeer(peerHash, false, "Not in our network"); if (_log.shouldLog(Log.WARN)) - _log.warn("Dropping the peer " + peerHash + " because they are in the wrong net: " + entry); + _log.warn("Not in our network: " + entry, new Exception()); return; } else { if (entry.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) {