From f0886c5f6ee881a39bb6cdda75216b03624d6254 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 5 Jun 2013 16:29:49 +0000
Subject: [PATCH] drop unused netdb classes
---
.../DatabaseLookupMessageHandler.java | 39 -----
.../DatabaseStoreMessageHandler.java | 31 ----
.../HandleDatabaseStoreMessageJob.java | 140 ------------------
.../KademliaNetworkDatabaseFacade.java | 7 +-
4 files changed, 3 insertions(+), 214 deletions(-)
delete mode 100644 router/java/src/net/i2p/router/networkdb/DatabaseLookupMessageHandler.java
delete mode 100644 router/java/src/net/i2p/router/networkdb/DatabaseStoreMessageHandler.java
delete mode 100644 router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
diff --git a/router/java/src/net/i2p/router/networkdb/DatabaseLookupMessageHandler.java b/router/java/src/net/i2p/router/networkdb/DatabaseLookupMessageHandler.java
deleted file mode 100644
index 94f16f635a..0000000000
--- a/router/java/src/net/i2p/router/networkdb/DatabaseLookupMessageHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package net.i2p.router.networkdb;
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain
- * with no warranty of any kind, either expressed or implied.
- * It probably won't make your computer catch on fire, or eat
- * your children, but it might. Use at your own risk.
- *
- */
-
-import net.i2p.data.Hash;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.i2np.DatabaseLookupMessage;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.router.HandlerJobBuilder;
-import net.i2p.router.Job;
-import net.i2p.router.RouterContext;
-import net.i2p.util.Log;
-
-/**
- * Build a HandleDatabaseLookupMessageJob whenever a DatabaseLookupMessage arrives
- * Unused - see kademlia/ for replacement
- */
-public class DatabaseLookupMessageHandler implements HandlerJobBuilder {
- private RouterContext _context;
- private Log _log;
- public DatabaseLookupMessageHandler(RouterContext context) {
- _context = context;
- _log = context.logManager().getLog(DatabaseLookupMessageHandler.class);
- _context.statManager().createRateStat("netDb.lookupsReceived", "How many netDb lookups have we received?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
- // FIXME: is netDb.lookupsDropped actually used elsewhere?
- _context.statManager().createRateStat("netDb.lookupsDropped", "How many netDb lookups did we drop due to throttling?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
- }
-
- public Job createJob(I2NPMessage receivedMessage, RouterIdentity from, Hash fromHash) {
- _context.statManager().addRateData("netDb.lookupsReceived", 1, 0);
- return new HandleDatabaseLookupMessageJob(_context, (DatabaseLookupMessage)receivedMessage, from, fromHash);
- }
-}
diff --git a/router/java/src/net/i2p/router/networkdb/DatabaseStoreMessageHandler.java b/router/java/src/net/i2p/router/networkdb/DatabaseStoreMessageHandler.java
deleted file mode 100644
index 5a2e6b1013..0000000000
--- a/router/java/src/net/i2p/router/networkdb/DatabaseStoreMessageHandler.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package net.i2p.router.networkdb;
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain
- * with no warranty of any kind, either expressed or implied.
- * It probably won't make your computer catch on fire, or eat
- * your children, but it might. Use at your own risk.
- *
- */
-
-import net.i2p.data.Hash;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.i2np.DatabaseStoreMessage;
-import net.i2p.data.i2np.I2NPMessage;
-import net.i2p.router.HandlerJobBuilder;
-import net.i2p.router.Job;
-import net.i2p.router.RouterContext;
-
-/**
- * Create a HandleDatabaseStoreMessageJob whenever a DatabaseStoreMessage arrives
- * Unused - see kademlia/ for replacement
- */
-public class DatabaseStoreMessageHandler implements HandlerJobBuilder {
- private RouterContext _context;
- public DatabaseStoreMessageHandler(RouterContext context) {
- _context = context;
- }
- public Job createJob(I2NPMessage receivedMessage, RouterIdentity from, Hash fromHash) {
- return new HandleDatabaseStoreMessageJob(_context, (DatabaseStoreMessage)receivedMessage, from, fromHash);
- }
-}
diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
deleted file mode 100644
index ce4d078017..0000000000
--- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseStoreMessageJob.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package net.i2p.router.networkdb;
-/*
- * free (adj.): unencumbered; not under the control of others
- * Written by jrandom in 2003 and released into the public domain
- * with no warranty of any kind, either expressed or implied.
- * It probably won't make your computer catch on fire, or eat
- * your children, but it might. Use at your own risk.
- *
- */
-
-import java.util.Date;
-
-import net.i2p.data.DatabaseEntry;
-import net.i2p.data.Hash;
-import net.i2p.data.LeaseSet;
-import net.i2p.data.RouterIdentity;
-import net.i2p.data.RouterInfo;
-import net.i2p.data.i2np.DatabaseStoreMessage;
-import net.i2p.data.i2np.DeliveryStatusMessage;
-import net.i2p.router.JobImpl;
-import net.i2p.router.RouterContext;
-import net.i2p.router.TunnelInfo;
-import net.i2p.util.Log;
-
-/**
- * Receive DatabaseStoreMessage data and store it in the local net db
- * Unused - see kademlia/ for replacement
- */
-public class HandleDatabaseStoreMessageJob extends JobImpl {
- private Log _log;
- private DatabaseStoreMessage _message;
- private RouterIdentity _from;
- private Hash _fromHash;
-
- public HandleDatabaseStoreMessageJob(RouterContext ctx, DatabaseStoreMessage receivedMessage, RouterIdentity from, Hash fromHash) {
- super(ctx);
- _log = ctx.logManager().getLog(HandleDatabaseStoreMessageJob.class);
- ctx.statManager().createRateStat("netDb.storeHandled", "How many netDb store messages have we handled?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
- ctx.statManager().createRateStat("netDb.storeLeaseSetHandled", "How many leaseSet store messages have we handled?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
- ctx.statManager().createRateStat("netDb.storeRouterInfoHandled", "How many routerInfo store messages have we handled?", "NetworkDatabase", new long[] { 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
- _message = receivedMessage;
- _from = from;
- _fromHash = fromHash;
- }
-
- public void runJob() {
- if (_log.shouldLog(Log.DEBUG))
- _log.debug("Handling database store message");
-
- // ERR: see comments regarding hidden mode in HandleDatabaseLookupMessageJob.
- // // If we are a hidden peer, log and return
- // if (getContext().router().getRouterInfo().isHidden()) {
- // if (_log.shouldLog(Log.ERROR)) {
- // _log.error("Uninvited dbStore received (tunnel " + _message.getReplyTunnel() + ")");
- // }
- // return;
- // }
-
- String invalidMessage = null;
- boolean wasNew = false;
- DatabaseEntry entry = _message.getEntry();
- if (entry.getType() == DatabaseEntry.KEY_TYPE_LEASESET) {
- getContext().statManager().addRateData("netDb.storeLeaseSetHandled", 1, 0);
-
- try {
- LeaseSet ls = (LeaseSet) entry;
- // mark it as something we received, so we'll answer queries
- // for it. this flag does NOT get set on entries that we
- // receive in response to our own lookups.
- ls.setReceivedAsPublished(true);
- LeaseSet match = getContext().netDb().store(_message.getKey(), ls);
- if (match == null) {
- wasNew = true;
- } else {
- wasNew = false;
- match.setReceivedAsPublished(true);
- }
- } catch (IllegalArgumentException iae) {
- invalidMessage = iae.getMessage();
- }
- } else if (entry.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) {
- RouterInfo ri = (RouterInfo) entry;
- getContext().statManager().addRateData("netDb.storeRouterInfoHandled", 1, 0);
- if (_log.shouldLog(Log.INFO))
- _log.info("Handling dbStore of router " + _message.getKey() + " with publishDate of "
- + new Date(ri.getPublished()));
- try {
- Object match = getContext().netDb().store(_message.getKey(), ri);
- wasNew = (null == match);
- getContext().profileManager().heardAbout(_message.getKey());
- } catch (IllegalArgumentException iae) {
- invalidMessage = iae.getMessage();
- }
- } else {
- if (_log.shouldLog(Log.ERROR))
- _log.error("Invalid DatabaseStoreMessage data type - " + entry.getType()
- + ": " + _message);
- }
-
- if (_message.getReplyToken() > 0)
- sendAck();
-
- if (_from != null)
- _fromHash = _from.getHash();
- if (_fromHash != null) {
- if (invalidMessage == null) {
- getContext().profileManager().dbStoreReceived(_fromHash, wasNew);
- getContext().statManager().addRateData("netDb.storeHandled", 1, 0);
- } else {
- if (_log.shouldLog(Log.WARN))
- _log.warn("Peer " + _fromHash.toBase64() + " sent bad data: " + invalidMessage);
- }
- }
- }
-
- private void sendAck() {
- DeliveryStatusMessage msg = new DeliveryStatusMessage(getContext());
- msg.setMessageId(_message.getReplyToken());
- msg.setArrival(getContext().clock().now());
- TunnelInfo outTunnel = selectOutboundTunnel();
- if (outTunnel == null) {
- if (_log.shouldLog(Log.WARN))
- _log.warn("No outbound tunnel could be found");
- return;
- } else {
- getContext().tunnelDispatcher().dispatchOutbound(msg, outTunnel.getSendTunnelId(0), _message.getReplyTunnel(), _message.getReplyGateway());
- }
- }
-
- private TunnelInfo selectOutboundTunnel() {
- return getContext().tunnelManager().selectOutboundTunnel();
- }
-
- public String getName() { return "Handle Database Store Message"; }
-
- @Override
- public void dropped() {
- getContext().messageHistory().messageProcessingError(_message.getUniqueId(), _message.getClass().getName(), "Dropped due to overload");
- }
-}
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 9dcd923180..00ea5c3b89 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -29,8 +29,6 @@ import net.i2p.router.Job;
import net.i2p.router.NetworkDatabaseFacade;
import net.i2p.router.Router;
import net.i2p.router.RouterContext;
-import net.i2p.router.networkdb.DatabaseLookupMessageHandler;
-import net.i2p.router.networkdb.DatabaseStoreMessageHandler;
import net.i2p.router.networkdb.PublishLocalRouterInfoJob;
import net.i2p.router.networkdb.reseed.ReseedChecker;
import net.i2p.router.peermanager.PeerProfile;
@@ -326,9 +324,10 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
//}
}
+ /** unused, see override */
protected void createHandlers() {
- _context.inNetMessagePool().registerHandlerJobBuilder(DatabaseLookupMessage.MESSAGE_TYPE, new DatabaseLookupMessageHandler(_context));
- _context.inNetMessagePool().registerHandlerJobBuilder(DatabaseStoreMessage.MESSAGE_TYPE, new DatabaseStoreMessageHandler(_context));
+ //_context.inNetMessagePool().registerHandlerJobBuilder(DatabaseLookupMessage.MESSAGE_TYPE, new DatabaseLookupMessageHandler(_context));
+ //_context.inNetMessagePool().registerHandlerJobBuilder(DatabaseStoreMessage.MESSAGE_TYPE, new DatabaseStoreMessageHandler(_context));
}
/**
--
GitLab