diff --git a/apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/RouterInfoHandler.java b/apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/RouterInfoHandler.java index 2bd0d688d..eb6b7a112 100644 --- a/apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/RouterInfoHandler.java +++ b/apps/i2pcontrol/java/net/i2p/i2pcontrol/servlets/jsonrpc2handlers/RouterInfoHandler.java @@ -125,7 +125,7 @@ public class RouterInfoHandler implements RequestHandler { if (inParams.containsKey("i2p.router.netdb.knownpeers")) { // Why max(-1, 0) is used I don't know, it is the implementation used in the router console. - outParams.put("i2p.router.netdb.knownpeers", Math.max(_context.mainNetDb().getKnownRouters() - 1, 0)); + outParams.put("i2p.router.netdb.knownpeers", Math.max(_context.netDb().getKnownRouters() - 1, 0)); } if (inParams.containsKey("i2p.router.netdb.activepeers")) { @@ -200,7 +200,7 @@ public class RouterInfoHandler implements RequestHandler { case CommSystemFacade.STATUS_IPV4_DISABLED_IPV6_FIREWALLED: if (_context.router().getRouterInfo().getTargetAddress("NTCP2") != null) return NETWORK_STATUS.WARN_FIREWALLED_WITH_INBOUND_TCP; - if (_context.mainNetDb().floodfillEnabled()) + if (_context.netDb().floodfillEnabled()) return NETWORK_STATUS.WARN_FIREWALLED_AND_FLOODFILL; if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0) return NETWORK_STATUS.WARN_FIREWALLED_AND_FAST; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java index 54f76ff7f..6fa1ce9ce 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHandler.java @@ -106,7 +106,7 @@ public class ConfigAdvancedHandler extends FormHandler { private void saveFF() { boolean saved = _context.router().saveConfig(ConfigAdvancedHelper.PROP_FLOODFILL_PARTICIPANT, _ff); if (_ff.equals("false") || _ff.equals("true")) { - FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.mainNetDb(); + FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb(); boolean isFF = _ff.equals("true"); // this will rebuild the RI, log in the event log, etc. fndf.setFloodfillEnabled(isFF); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHelper.java index 9c173b240..918423632 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigAdvancedHelper.java @@ -66,6 +66,6 @@ public class ConfigAdvancedHelper extends HelperBase { /** @since 0.9.21 */ public boolean isFloodfill() { - return _context.mainNetDb().floodfillEnabled(); + return _context.netDb().floodfillEnabled(); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java index 29894c78f..83c775e17 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigFamilyHandler.java @@ -45,7 +45,7 @@ public class ConfigFamilyHandler extends FormHandler { if (ks.exists()) { addFormError("Keystore for family " + family + " already exists! Delete or rename it first: " + ks); } else { - for (RouterInfo ri : _context.mainNetDb().getRouters()) { + for (RouterInfo ri : _context.netDb().getRouters()) { if (family.equals(ri.getOption("family"))) { addFormError("The family name \"" + family + "\" is already in use by another router. Please select a different family name."); return; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java index bf304bb15..17aa06ece 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHandler.java @@ -194,7 +194,7 @@ public class ConfigKeyringHandler extends FormHandler { BlindData bd = Blinding.decode(_context, p); if (bd != null) { SigningPublicKey spk = bd.getUnblindedPubKey(); - removed = _context.mainNetDb().removeBlindData(spk); + removed = _context.netDb().removeBlindData(spk); } } catch (IllegalArgumentException iae) {} } else { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java index 841bf63d9..63712288a 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigKeyringHelper.java @@ -82,7 +82,7 @@ public class ConfigKeyringHelper extends HelperBase { buf.append(""); buf.append(b32); buf.append(""); - Destination dest = _context.mainNetDb().lookupDestinationLocally(h); + Destination dest = _context.netDb().lookupDestinationLocally(h); if (dest != null && local) { TunnelPoolSettings in = _context.tunnelManager().getInboundSettings(h); if (in != null && in.getDestinationNickname() != null) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java index da5fe6864..5f3dc0917 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigReseedHandler.java @@ -24,7 +24,7 @@ public class ConfigReseedHandler extends FormHandler { @Override protected void processForm() { - ReseedChecker checker = _context.mainNetDb().reseedChecker(); + ReseedChecker checker = _context.netDb().reseedChecker(); if (_action.equals(_t("Save changes and reseed now"))) { saveChanges(); if (!checker.requestReseed()) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java index 085419e4b..fc107cdcc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java @@ -130,14 +130,14 @@ class NetDbRenderer { String tr, int cost, int icount, String client, boolean allClients) throws IOException { StringBuilder buf = new StringBuilder(4*1024); List sybils = sybil != null ? new ArrayList(128) : null; - FloodfillNetworkDatabaseFacade netdb = _context.mainNetDb(); + FloodfillNetworkDatabaseFacade netdb = _context.netDb(); if (allClients) { - netdb = _context.mainNetDb(); + netdb = _context.netDb(); }else{ if (client != null) netdb = _context.clientNetDb(client); else - netdb = _context.mainNetDb(); + netdb = _context.netDb(); } if (".".equals(routerPrefix)) { @@ -234,7 +234,7 @@ class NetDbRenderer { routers.addAll(_context.netDbSegmentor().getRoutersKnownToClients()); } else { if (client == null) - routers.addAll(_context.mainNetDb().getRouters()); + routers.addAll(_context.netDb().getRouters()); else routers.addAll(_context.clientNetDb(client).getRouters()); @@ -617,12 +617,12 @@ class NetDbRenderer { DecimalFormat fmt; FloodfillNetworkDatabaseFacade netdb = null; if (clientsOnly){ - netdb = _context.mainNetDb(); + netdb = _context.netDb(); }else{ if (client != null) netdb = _context.clientNetDb(client); else - netdb = _context.mainNetDb(); + netdb = _context.netDb(); } if (debug) { ourRKey = _context.routerHash(); @@ -747,17 +747,17 @@ class NetDbRenderer { buf.append(hostname); buf.append(""); } else { - LeaseSet ls = _context.mainNetDb().lookupLeaseSetLocally(hash); + LeaseSet ls = _context.netDb().lookupLeaseSetLocally(hash); if (ls == null) { // remote lookup LookupWaiter lw = new LookupWaiter(); // use-case for the exploratory netDb here? - _context.mainNetDb().lookupLeaseSetRemotely(hash, lw, lw, 8*1000, null); + _context.netDb().lookupLeaseSetRemotely(hash, lw, lw, 8*1000, null); // just wait right here in the middle of the rendering, sure synchronized(lw) { try { lw.wait(9*1000); } catch (InterruptedException ie) {} } - ls = _context.mainNetDb().lookupLeaseSetLocally(hash); + ls = _context.netDb().lookupLeaseSetLocally(hash); } if (ls != null) { BigInteger dist = HashDistance.getDistance(_context.routerHash(), ls.getRoutingKey()); @@ -952,7 +952,7 @@ class NetDbRenderer { * mode 3: Same as 0 but sort countries by count */ public void renderStatusHTML(Writer out, int pageSize, int page, int mode, String client, boolean clientsOnly) throws IOException { - if (!_context.mainNetDb().isInitialized()) { + if (!_context.netDb().isInitialized()) { out.write("
"); out.write(_t("Not initialized")); out.write("
"); @@ -973,7 +973,7 @@ class NetDbRenderer { } else if (clientsOnly) { routers.addAll(_context.netDbSegmentor().getRoutersKnownToClients()); } else { - routers.addAll(_context.mainNetDb().getRouters()); + routers.addAll(_context.netDb().getRouters()); } int toSkip = pageSize * page; boolean nextpg = routers.size() > toSkip + pageSize; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java index 47bba2c4b..d21a53fbc 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ProfileOrganizerRenderer.java @@ -55,7 +55,7 @@ class ProfileOrganizerRenderer { if (prof == null) continue; if (mode == 2) { - RouterInfo info = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(peer); + RouterInfo info = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(peer); if (info != null && info.getCapabilities().indexOf('f') >= 0) order.add(prof); continue; @@ -145,7 +145,7 @@ class ProfileOrganizerRenderer { buf.append(", "); buf.append(_t("Integrated")); } - RouterInfo info = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(peer); + RouterInfo info = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(peer); if (info != null) { // prevent HTML injection in the caps and version buf.append("").append(DataHelper.stripHTML(info.getCapabilities())); @@ -244,7 +244,7 @@ class ProfileOrganizerRenderer { buf.append(""); buf.append(_context.commSystem().renderPeerHTML(peer)); buf.append(""); - RouterInfo info = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(peer); + RouterInfo info = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(peer); if (info != null) buf.append("").append(DataHelper.stripHTML(info.getCapabilities())).append(""); else diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedHandler.java index d9cc71727..42b56cc78 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ReseedHandler.java @@ -24,6 +24,6 @@ public class ReseedHandler extends HelperBase { } private void requestReseed() { - _context.mainNetDb().reseedChecker().requestReseed(); + _context.netDb().reseedChecker().requestReseed(); } } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java index ea8f17357..998073179 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryHelper.java @@ -162,13 +162,13 @@ public class SummaryHelper extends HelperBase { /** allowReseed */ public boolean allowReseed() { - return _context.mainNetDb().isInitialized() && - (_context.mainNetDb().getKnownRouters() < ReseedChecker.MINIMUM) || + return _context.netDb().isInitialized() && + (_context.netDb().getKnownRouters() < ReseedChecker.MINIMUM) || _context.getBooleanProperty("i2p.alwaysAllowReseed"); } /** subtract one for ourselves, so if we know no other peers it displays zero */ - public int getAllPeers() { return Math.max(_context.mainNetDb().getKnownRouters() - 1, 0); } + public int getAllPeers() { return Math.max(_context.netDb().getKnownRouters() - 1, 0); } public enum NetworkState { HIDDEN, @@ -286,7 +286,7 @@ public class SummaryHelper extends HelperBase { // fall through... case IPV4_FIREWALLED_IPV6_OK: case IPV4_FIREWALLED_IPV6_UNKNOWN: - if ((_context.mainNetDb()).floodfillEnabled()) + if ((_context.netDb()).floodfillEnabled()) return new NetworkStateMessage(NetworkState.WARN, fixup(_t("WARN-Firewalled and Floodfill"))); //if (_context.router().getRouterInfo().getCapabilities().indexOf('O') >= 0) // return new NetworkStateMessage(NetworkState.WARN, _t("WARN-Firewalled and Fast")); @@ -411,11 +411,11 @@ public class SummaryHelper extends HelperBase { */ public boolean showFirewallWarning() { return _context != null && - _context.mainNetDb().isInitialized() && + _context.netDb().isInitialized() && _context.router().getUptime() > 2*60*1000 && (!_context.commSystem().isDummy()) && _context.commSystem().countActivePeers() <= 0 && - _context.mainNetDb().getKnownRouters() > 5; + _context.netDb().getKnownRouters() > 5; } /** @@ -985,7 +985,7 @@ public class SummaryHelper extends HelperBase { .append(""); } - ReseedChecker checker = _context.mainNetDb().reseedChecker(); + ReseedChecker checker = _context.netDb().reseedChecker(); String status = checker.getStatus(); if (status.length() > 0) { // Show status message even if not running, timer in ReseedChecker should remove after 20 minutes diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java index b80e515fd..f3ae3a6e5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SybilRenderer.java @@ -493,7 +493,7 @@ public class SybilRenderer { Hash client = iter.next(); if (!_context.clientManager().isLocal(client) || !_context.clientManager().shouldPublishLeaseSet(client) || - _context.mainNetDb().lookupLeaseSetLocally(client) == null) { + _context.netDb().lookupLeaseSetLocally(client) == null) { iter.remove(); } } @@ -503,7 +503,7 @@ public class SybilRenderer { return; } for (Hash client : destinations) { - LeaseSet ls = _context.mainNetDb().lookupLeaseSetLocally(client); + LeaseSet ls = _context.netDb().lookupLeaseSetLocally(client); if (ls == null) continue; Hash rkey = ls.getRoutingKey(); @@ -553,7 +553,7 @@ public class SybilRenderer { buf.append("
  • ").append(s, 0, c+1).append("").append(s, c+1, s.length()).append("
    • "); } buf.append(""); - RouterInfo ri = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(h); + RouterInfo ri = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(h); if (ri != null) { renderRouterInfo(buf, ri, null, false, false); } else { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java index ec10a45ea..708f66ad9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/TunnelRenderer.java @@ -559,7 +559,7 @@ class TunnelRenderer { /** @return cap char or ' ' */ private char getCapacity(Hash peer) { - RouterInfo info = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(peer); + RouterInfo info = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(peer); if (info != null) { String caps = info.getCapabilities(); for (int i = 0; i < RouterInfo.BW_CAPABILITY_CHARS.length(); i++) { diff --git a/router/java/src/net/i2p/router/Banlist.java b/router/java/src/net/i2p/router/Banlist.java index 7003a0298..88ef083e9 100644 --- a/router/java/src/net/i2p/router/Banlist.java +++ b/router/java/src/net/i2p/router/Banlist.java @@ -269,7 +269,7 @@ public class Banlist { if (transport == null) { // we hate the peer on *any* transport - _context.mainNetDb().fail(peer); + _context.netDb().fail(peer); _context.tunnelManager().fail(peer); } //_context.tunnelManager().peerFailed(peer); diff --git a/router/java/src/net/i2p/router/Blocklist.java b/router/java/src/net/i2p/router/Blocklist.java index a4e6e930e..b9cb438c9 100644 --- a/router/java/src/net/i2p/router/Blocklist.java +++ b/router/java/src/net/i2p/router/Blocklist.java @@ -942,7 +942,7 @@ public class Blocklist { * Will not contain duplicates. */ private List getAddresses(Hash peer) { - RouterInfo pinfo = _context.mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo pinfo = _context.netDb().lookupRouterInfoLocally(peer); if (pinfo == null) return Collections.emptyList(); return getAddresses(pinfo); diff --git a/router/java/src/net/i2p/router/MultiRouter.java b/router/java/src/net/i2p/router/MultiRouter.java index 4e9519c93..814163b48 100644 --- a/router/java/src/net/i2p/router/MultiRouter.java +++ b/router/java/src/net/i2p/router/MultiRouter.java @@ -144,7 +144,7 @@ public class MultiRouter { } for(Router r : _routers) { for(RouterInfo ri : riSet){ - r.getContext().mainNetDb().publish(ri); + r.getContext().netDb().publish(ri); } } _out.println(riSet.size() + " RouterInfos were reseeded"); diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index f4b6aa76b..78a1da398 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -924,7 +924,7 @@ public class Router implements RouterClock.ClockShiftListener { changed = true; } } - if (_context.mainNetDb().isInitialized()) { + if (_context.netDb().isInitialized()) { if (_log.shouldWarn()) _log.warn("NetDB ready, publishing RI"); // any previous calls to netdb().publish() did not @@ -1188,7 +1188,7 @@ public class Router implements RouterClock.ClockShiftListener { // rv.append(CAPABILITY_BW256); // if prop set to true, don't tell people we are ff even if we are - if (_context.mainNetDb().floodfillEnabled() && + if (_context.netDb().floodfillEnabled() && !_context.getBooleanProperty("router.hideFloodfillParticipant")) rv.append(FloodfillNetworkDatabaseFacade.CAPABILITY_FLOODFILL); diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index b178321d7..bffbd269a 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -374,7 +374,6 @@ public class RouterContext extends I2PAppContext { */ public SegmentedNetworkDatabaseFacade netDbSegmentor() { return _netDb; } public FloodfillNetworkDatabaseFacade netDb() { return _netDb.mainNetDB(); } - public FloodfillNetworkDatabaseFacade mainNetDb() { return _netDb.mainNetDB(); } public FloodfillNetworkDatabaseFacade multihomeNetDb() { return _netDb.multiHomeNetDB(); } public FloodfillNetworkDatabaseFacade clientNetDb(String id) { return _netDb.clientNetDB(id); } public FloodfillNetworkDatabaseFacade clientNetDb(Hash id) { return _netDb.clientNetDB(id); } diff --git a/router/java/src/net/i2p/router/StatisticsManager.java b/router/java/src/net/i2p/router/StatisticsManager.java index f153413ae..cfb688adc 100644 --- a/router/java/src/net/i2p/router/StatisticsManager.java +++ b/router/java/src/net/i2p/router/StatisticsManager.java @@ -148,11 +148,11 @@ public class StatisticsManager { //stats.setProperty("stat_uptime", "90m"); if (caps.indexOf(FloodfillNetworkDatabaseFacade.CAPABILITY_FLOODFILL) >= 0) { int ri = _context.router().getUptime() > 30*60*1000 ? - _context.mainNetDb().getKnownRouters() : + _context.netDb().getKnownRouters() : 3000 + _context.random().nextInt(1000); // so it isn't obvious we restarted stats.setProperty("netdb.knownRouters", String.valueOf(ri)); int ls = _context.router().getUptime() > 30*60*1000 ? - _context.mainNetDb().getKnownLeaseSets() : + _context.netDb().getKnownLeaseSets() : 30 + _context.random().nextInt(40); // so it isn't obvious we restarted stats.setProperty("netdb.knownLeaseSets", String.valueOf(ls)); } diff --git a/router/java/src/net/i2p/router/client/LookupDestJob.java b/router/java/src/net/i2p/router/client/LookupDestJob.java index ad6bd3c8e..90000b53f 100644 --- a/router/java/src/net/i2p/router/client/LookupDestJob.java +++ b/router/java/src/net/i2p/router/client/LookupDestJob.java @@ -93,7 +93,7 @@ class LookupDestJob extends JobImpl { SigningPublicKey spk = bd.getUnblindedPubKey(); BlindData bd2; if (_fromLocalDest == null) - bd2 = getContext().mainNetDb().getBlindData(spk); + bd2 = getContext().netDb().getBlindData(spk); else bd2 = getContext().clientNetDb(_fromLocalDest).getBlindData(spk); if (bd2 != null) { diff --git a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java index ae4064013..3667650bb 100644 --- a/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java +++ b/router/java/src/net/i2p/router/message/OutboundClientMessageOneShotJob.java @@ -550,7 +550,7 @@ public class OutboundClientMessageOneShotJob extends JobImpl { *** unfortunately the "U" is rarely seen. if (!getContext().commSystem().wasUnreachable(l.getGateway())) { ***/ - RouterInfo ri = getContext().mainNetDb().lookupRouterInfoLocally(l.getGateway()); + RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(l.getGateway()); if (ri == null || ri.getCapabilities().indexOf(Router.CAPABILITY_UNREACHABLE) < 0) { _lease = l; break; diff --git a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java index 788fe254d..18f85f24f 100644 --- a/router/java/src/net/i2p/router/message/SendMessageDirectJob.java +++ b/router/java/src/net/i2p/router/message/SendMessageDirectJob.java @@ -134,7 +134,7 @@ public class SendMessageDirectJob extends JobImpl { _log.debug("Router specified, sending"); send(); } else { - _router = getContext().mainNetDb().lookupRouterInfoLocally(_targetHash); + _router = getContext().netDb().lookupRouterInfoLocally(_targetHash); if (_router != null) { if (_log.shouldLog(Log.DEBUG)) _log.debug("Router not specified but lookup found it"); @@ -143,7 +143,7 @@ public class SendMessageDirectJob extends JobImpl { if (!_alreadySearched) { if (_log.shouldLog(Log.DEBUG)) _log.debug("Router not specified, so we're looking for it..."); - getContext().mainNetDb().lookupRouterInfo(_targetHash, this, this, + getContext().netDb().lookupRouterInfo(_targetHash, this, this, _expiration - getContext().clock().now()); _searchOn = getContext().clock().now(); _alreadySearched = true; diff --git a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java index 212595c39..0e8365b16 100644 --- a/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/HandleDatabaseLookupMessageJob.java @@ -110,7 +110,7 @@ public class HandleDatabaseLookupMessageJob extends JobImpl { DatabaseLookupMessage.Type lookupType = _message.getSearchType(); // only lookup once, then cast to correct type - DatabaseEntry dbe = getContext().mainNetDb().lookupLocally(searchKey); + DatabaseEntry dbe = getContext().netDb().lookupLocally(searchKey); int type = dbe != null ? dbe.getType() : -1; if (DatabaseEntry.isLeaseSet(type) && (lookupType == DatabaseLookupMessage.Type.ANY || lookupType == DatabaseLookupMessage.Type.LS)) { @@ -148,7 +148,7 @@ public class HandleDatabaseLookupMessageJob extends JobImpl { // For this, we do NOT use their dontInclude list as it can't be trusted // (i.e. it could mess up the closeness calculation) LeaseSet possibleMultihomed = getContext().multihomeNetDb().lookupLeaseSetLocally(searchKey); - Set closestHashes = getContext().mainNetDb().findNearestRouters(searchKey, + Set closestHashes = getContext().netDb().findNearestRouters(searchKey, CLOSENESS_THRESHOLD, null); if (weAreClosest(closestHashes)) { // It's in our keyspace, so give it to them @@ -274,7 +274,7 @@ public class HandleDatabaseLookupMessageJob extends JobImpl { // Honor flag to exclude all floodfills //if (dontInclude.contains(Hash.FAKE_HASH)) { // This is handled in FloodfillPeerSelector - return getContext().mainNetDb().findNearestRouters(_message.getSearchKey(), + return getContext().netDb().findNearestRouters(_message.getSearchKey(), MAX_ROUTERS_RETURNED, dontInclude); } @@ -326,7 +326,7 @@ public class HandleDatabaseLookupMessageJob extends JobImpl { _log.debug("Sending reply directly to " + toPeer); Job send = new SendMessageDirectJob(getContext(), message, toPeer, REPLY_TIMEOUT, MESSAGE_PRIORITY, _msgIDBloomXor); send.runJob(); - //getContext().mainNetDb().lookupRouterInfo(toPeer, send, null, REPLY_TIMEOUT); + //getContext().netDb().lookupRouterInfo(toPeer, send, null, REPLY_TIMEOUT); } } diff --git a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java index 96ec1c18c..ca1e285da 100644 --- a/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java +++ b/router/java/src/net/i2p/router/networkdb/PublishLocalRouterInfoJob.java @@ -76,7 +76,7 @@ public class PublishLocalRouterInfoJob extends JobImpl { requeue(100); return; } - long last = getContext().mainNetDb().getLastRouterInfoPublishTime(); + long last = getContext().netDb().getLastRouterInfoPublishTime(); long now = getContext().clock().now(); if (last + MIN_PUBLISH_DELAY > now) { long delay = getDelay(); @@ -141,7 +141,7 @@ public class PublishLocalRouterInfoJob extends JobImpl { + new Date(ri.getPublished())); try { // This won't really publish until the netdb is initialized. - getContext().mainNetDb().publish(ri); + getContext().netDb().publish(ri); } catch (IllegalArgumentException iae) { _log.log(Log.CRIT, "Error publishing our identity - corrupt? Restart required", iae); getContext().router().rebuildNewIdentity(); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseLookupMessageHandler.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseLookupMessageHandler.java index 2d83e62d2..1c1fd7e5a 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseLookupMessageHandler.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillDatabaseLookupMessageHandler.java @@ -73,7 +73,7 @@ public class FloodfillDatabaseLookupMessageHandler implements HandlerJobBuilder return null; } boolean ourRI = dlm.getSearchKey() != null && dlm.getSearchKey().equals(_context.routerHash()); - if (!_context.mainNetDb().floodfillEnabled() && (dlm.getReplyTunnel() == null && !ourRI)) { + if (!_context.netDb().floodfillEnabled() && (dlm.getReplyTunnel() == null && !ourRI)) { if (_log.shouldLog(Log.WARN)) _log.warn("[dbid: " + _facade._dbid + "] Dropping " + dlm.getSearchType() diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index f10bfeeef..01c8953fe 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -483,7 +483,7 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad @Override public boolean floodfillEnabled() { if (isMultihomeDb()) - return _context.mainNetDb().floodfillEnabled(); + return _context.netDb().floodfillEnabled(); return _floodfillEnabled; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java index 6496e3fe5..967e63970 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillPeerSelector.java @@ -248,7 +248,7 @@ class FloodfillPeerSelector extends PeerSelector { if (entry == null) break; // shouldn't happen // put anybody in the same /16 at the end - RouterInfo info = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(entry); + RouterInfo info = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(entry); MaskedIPSet entryIPs = new MaskedIPSet(_context, entry, info, 2); boolean sameIP = false; for (String ip : entryIPs) { @@ -373,7 +373,7 @@ class FloodfillPeerSelector extends PeerSelector { // ... unless they are really bad if (_context.banlist().isBanlistedHard(entry)) return; - RouterInfo info = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(entry); + RouterInfo info = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(entry); //if (info == null) // return; @@ -419,7 +419,7 @@ class FloodfillPeerSelector extends PeerSelector { // (Forever banlisted ones are excluded in add() above) for (Iterator iter = new RandomIterator(_floodfillMatches); (found < howMany) && iter.hasNext(); ) { Hash entry = iter.next(); - RouterInfo info = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(entry); + RouterInfo info = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(entry); if (info != null && now - info.getPublished() > 3*60*60*1000) { badff.add(entry); if (_log.shouldLog(Log.DEBUG)) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java index feaf5bfb3..9ac4f7391 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java @@ -50,7 +50,7 @@ class FloodfillRouterInfoFloodJob extends JobImpl { dsm = new DatabaseStoreMessage(getContext()); dsm.setMessageExpiration(getContext().clock().now() + 10*1000); dsm.setEntry(getContext().router().getRouterInfo()); - nextPeerInfo = getContext().mainNetDb().lookupRouterInfoLocally(ri); + nextPeerInfo = getContext().netDb().lookupRouterInfoLocally(ri); if(nextPeerInfo == null) { continue; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java index b3815d306..3b9dcead8 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java @@ -463,7 +463,7 @@ class FloodfillVerifyStoreJob extends JobImpl { DatabaseEntry ds = getContext().netDbSegmentor().getSubNetDB(_facade._dbid).lookupLocally(_key); if ((ds == null) && _facade.isClientDb() && _isRouterInfo) // It's safe to check the floodfill netDb for RI - ds = getContext().mainNetDb().lookupLocally(_key); + ds = getContext().netDb().lookupLocally(_key); if (ds != null) { // By the time we get here, a minute or more after the store started, // we may have already started a new store diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java index f092fffc2..1fbca44a7 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/HandleFloodfillDatabaseLookupMessageJob.java @@ -38,7 +38,7 @@ public class HandleFloodfillDatabaseLookupMessageJob extends HandleDatabaseLooku */ @Override protected boolean answerAllQueries() { - if (!getContext().mainNetDb().floodfillEnabled()) return false; + if (!getContext().netDb().floodfillEnabled()) return false; return FloodfillNetworkDatabaseFacade.isFloodfill(getContext().router().getRouterInfo()); } @@ -52,7 +52,7 @@ public class HandleFloodfillDatabaseLookupMessageJob extends HandleDatabaseLooku super.sendClosest(key, routerInfoSet, toPeer, replyTunnel); // go away, you got the wrong guy, send our RI back unsolicited - if (!getContext().mainNetDb().floodfillEnabled()) { + if (!getContext().netDb().floodfillEnabled()) { // We could just call sendData(myhash, myri, toPeer, replyTunnel) but // that would increment the netDb.lookupsHandled and netDb.lookupsMatched stats DatabaseStoreMessage msg = new DatabaseStoreMessage(getContext()); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java index 3754bb08f..41b237636 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeLookupJob.java @@ -66,7 +66,7 @@ class IterativeLookupJob extends JobImpl { oldPeers++; continue; } - RouterInfo ri = getContext().mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer); if (ri == null) { // Take it on faith that it's ff to speed things up, we don't need the RI // to query it. diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java index 489b23c1f..3b9f88b5c 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java @@ -321,7 +321,7 @@ public class IterativeSearchJob extends FloodSearchJob { private void sendQuery(Hash peer, int previouslyTried) { final RouterContext ctx = getContext(); TunnelManagerFacade tm = ctx.tunnelManager(); - RouterInfo ri = ctx.mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo ri = ctx.netDb().lookupRouterInfoLocally(peer); if (ri != null) { // Now that most of the netdb is Ed RIs and EC LSs, don't even bother // querying old floodfills that don't know about those sig types. @@ -599,7 +599,7 @@ public class IterativeSearchJob extends FloodSearchJob { _log.info(getJobId() + ": banlisted peer from DSRM " + peer); return; } - RouterInfo ri = getContext().mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer); if (ri != null && !FloodfillNetworkDatabaseFacade.isFloodfill(ri)) { if (_log.shouldLog(Log.INFO)) _log.info(getJobId() + ": non-ff peer from DSRM " + peer); @@ -717,7 +717,7 @@ public class IterativeSearchJob extends FloodSearchJob { // Confirm success by checking for the Lease Set in local storage if (_isLease) { - dest = getContext().mainNetDb().lookupDestinationLocally(_key); + dest = getContext().netDb().lookupDestinationLocally(_key); if ((dest == null) && (_log.shouldLog(Log.WARN))) _log.warn("Warning! Lease Set not found in persistent data store for key = " + _key); } 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 e1a9401c4..59064aac8 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -776,7 +776,7 @@ public abstract class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacad if (!_initialized) return null; // Client netDb shouldn't have RI, search for RI in the floodfill netDb. if (isClientDb()) - return _context.mainNetDb().lookupRouterInfoLocally(key); + return _context.netDb().lookupRouterInfoLocally(key); DatabaseEntry ds = _ds.get(key); if (ds != null) { if (ds.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) { diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java index 672b59818..9e9803447 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/PeerSelector.java @@ -127,7 +127,7 @@ abstract class PeerSelector { // return; if (_toIgnore.contains(entry)) return; - RouterInfo info = _context.mainNetDb().lookupRouterInfoLocally(entry); + RouterInfo info = _context.netDb().lookupRouterInfoLocally(entry); if (info == null) return; if (info.isHidden()) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java index 9a76366cb..718cc31bb 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/RepublishLeaseSetJob.java @@ -105,7 +105,7 @@ class RepublishLeaseSetJob extends JobImpl { if (_dest != null) ls = getContext().clientNetDb(_dest).lookupLeaseSetLocally(_ls.getHash()); else - getContext().mainNetDb().lookupLeaseSetLocally(_ls.getHash()); + getContext().netDb().lookupLeaseSetLocally(_ls.getHash()); // ^ _dest should never be null here, right? So maybe instead we return immediately? if (ls != null && ls.getEarliestLeaseDate() == _ls.getEarliestLeaseDate()) { requeueRepublish(); diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java index 9baf130bb..2c5a56acf 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java @@ -143,7 +143,7 @@ class SearchJob extends JobImpl { // The other two places this was called (one below and one in FNDF) // have been commented out. // Returning false essentially enables kademlia as a backup to floodfill for search responses. - if (ctx.mainNetDb().floodfillEnabled()) + if (ctx.netDb().floodfillEnabled()) return false; return ctx.getProperty("netDb.floodfillOnly", DEFAULT_FLOODFILL_ONLY); } @@ -315,7 +315,7 @@ class SearchJob extends JobImpl { _log.info("(dbid: " + _facade._dbid + ") Next closest peer " + peer + " was only recently referred to us, sending a search for them"); - getContext().mainNetDb().lookupRouterInfo(peer, null, null, _timeoutMs); + getContext().netDb().lookupRouterInfo(peer, null, null, _timeoutMs); } else if (!(ds.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO)) { if (_log.shouldLog(Log.WARN)) _log.warn(getJobId() + " (dbid: " + _facade._dbid @@ -391,7 +391,7 @@ class SearchJob extends JobImpl { if (_log.shouldLog(Log.DEBUG)) _log.debug(getJobId() + ": Current routing key for " + key + ": " + rkey); if (_facade.isClientDb()) - return getContext().mainNetDb().getPeerSelector().selectNearestExplicit(rkey, numClosest, alreadyChecked, _facade.getKBuckets()); + return getContext().netDb().getPeerSelector().selectNearestExplicit(rkey, numClosest, alreadyChecked, _facade.getKBuckets()); else return _peerSelector.selectNearestExplicit(rkey, numClosest, alreadyChecked, _facade.getKBuckets()); } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchReplyJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchReplyJob.java index 1f4fdb201..84fca4fdd 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchReplyJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchReplyJob.java @@ -71,7 +71,7 @@ class SearchReplyJob extends JobImpl { boolean shouldAdd = false; - RouterInfo info = getContext().mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo info = getContext().netDb().lookupRouterInfoLocally(peer); if (info == null) { // if the peer is giving us lots of bad peer references, // dont try to fetch them. @@ -88,7 +88,7 @@ class SearchReplyJob extends JobImpl { // _log.info("Not looking for a banlisted peer..."); // getContext().statManager().addRateData("netDb.searchReplyValidationSkipped", 1, 0); } else { - //getContext().mainNetDb().lookupRouterInfo(peer, new ReplyVerifiedJob(getContext(), peer), new ReplyNotVerifiedJob(getContext(), peer), _timeoutMs); + //getContext().netDb().lookupRouterInfo(peer, new ReplyVerifiedJob(getContext(), peer), new ReplyNotVerifiedJob(getContext(), peer), _timeoutMs); //_repliesPendingVerification++; shouldAdd = true; } diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java index ace5cee2a..b7fd6161e 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/SingleLookupJob.java @@ -44,7 +44,7 @@ class SingleLookupJob extends JobImpl { continue; if (peer.equals(from)) // unusual? continue; - RouterInfo ri = getContext().mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(peer); if (ri == null) getContext().jobQueue().addJob(new SingleSearchJob(getContext(), peer, from)); else if (ri.getPublished() < getContext().clock().now() - 60*60*1000 || diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java index 642ee0319..3e537fc4c 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java @@ -207,7 +207,7 @@ abstract class StoreJob extends JobImpl { for (Hash peer : closestHashes) { DatabaseEntry ds; if (_facade.isClientDb()) - ds = getContext().mainNetDb().getDataStore().get(peer); + ds = getContext().netDb().getDataStore().get(peer); else ds = _facade.getDataStore().get(peer); if ( (ds == null) || !(ds.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) ) { @@ -325,7 +325,7 @@ abstract class StoreJob extends JobImpl { if (_log.shouldLog(Log.DEBUG)) _log.debug(getJobId() + "(dbid: " + _facade._dbid + "): Selecting Floodfill Participants"); if (_facade.isClientDb()) { - FloodfillPeerSelector ffNetDbPS = (FloodfillPeerSelector)getContext().mainNetDb().getPeerSelector(); + FloodfillPeerSelector ffNetDbPS = (FloodfillPeerSelector)getContext().netDb().getPeerSelector(); rv = ffNetDbPS.selectFloodfillParticipants(rkey, numClosest, alreadyChecked, ks); } else { rv = ((FloodfillPeerSelector)_peerSelector).selectFloodfillParticipants(rkey, numClosest, alreadyChecked, ks); diff --git a/router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java b/router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java index d1c5bf52f..4d96e108a 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/ReseedBundler.java @@ -68,7 +68,7 @@ public class ReseedBundler { int routerCount = 0; int copied = 0; long tooOld = System.currentTimeMillis() - 7*24*60*60*1000L; - List infos = new ArrayList(_context.mainNetDb().getRouters()); + List infos = new ArrayList(_context.netDb().getRouters()); // IP to router hash Map ipMap = new HashMap(count); List toWrite = new ArrayList(count); diff --git a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java index 560ef1dcc..9457992ec 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java @@ -728,7 +728,7 @@ public class Reseeder { System.err.println("Reseed got " + fetched + " router infos " + s + " with " + errors + " errors"); if (fetched > 0) - _context.mainNetDb().rescan(); + _context.netDb().rescan(); return fetched; } catch (Throwable t) { if (_log.shouldWarn()) @@ -937,7 +937,7 @@ public class Reseeder { } if (fetched > 0) - _context.mainNetDb().rescan(); + _context.netDb().rescan(); int[] rv = new int[2]; rv[0] = fetched; rv[1] = errors; diff --git a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java index 168696940..88fee3fa9 100644 --- a/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java +++ b/router/java/src/net/i2p/router/peermanager/CapacityCalculator.java @@ -117,7 +117,7 @@ class CapacityCalculator { // credit non-floodfill to reduce conn limit issues at floodfills // TODO only if we aren't floodfill ourselves? // null for tests - NetworkDatabaseFacade ndb = context.mainNetDb(); + NetworkDatabaseFacade ndb = context.netDb(); if (ndb != null) { RouterInfo ri = (RouterInfo) ndb.lookupLocallyWithoutValidation(profile.getPeer()); if (ri != null) { diff --git a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java index 4628ecae1..96335aecd 100644 --- a/router/java/src/net/i2p/router/peermanager/PeerTestJob.java +++ b/router/java/src/net/i2p/router/peermanager/PeerTestJob.java @@ -97,7 +97,7 @@ class PeerTestJob extends JobImpl { Set peers = new HashSet(peerHashes.size()); for (Hash peer : peerHashes) { - RouterInfo peerInfo = getContext().mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo peerInfo = getContext().netDb().lookupRouterInfoLocally(peer); if (peerInfo != null) { peers.add(peerInfo); } else { @@ -121,7 +121,7 @@ class PeerTestJob extends JobImpl { } TunnelId inTunnelId = inTunnel.getReceiveTunnelId(0); - RouterInfo inGateway = getContext().mainNetDb().lookupRouterInfoLocally(inTunnel.getPeer(0)); + RouterInfo inGateway = getContext().netDb().lookupRouterInfoLocally(inTunnel.getPeer(0)); if (inGateway == null) { if (_log.shouldLog(Log.WARN)) _log.warn("We can't find the gateway to our inbound tunnel?! Impossible?"); diff --git a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java index 1171e48cd..a6b126d97 100644 --- a/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java +++ b/router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java @@ -1330,7 +1330,7 @@ public class ProfileOrganizer { } public boolean isSelectable(Hash peer) { - NetworkDatabaseFacade netDb = _context.mainNetDb(); + NetworkDatabaseFacade netDb = _context.netDb(); // the CLI shouldn't depend upon the netDb if (netDb == null) return true; if (_context.router() == null) return true; @@ -1340,7 +1340,7 @@ public class ProfileOrganizer { return false; // never select a banlisted peer } - RouterInfo info = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(peer); + RouterInfo info = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(peer); if (null != info) { if (info.isHidden()) { if (_log.shouldLog(Log.WARN)) diff --git a/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java b/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java index d99428b89..e512f9ea3 100644 --- a/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java +++ b/router/java/src/net/i2p/router/startup/BootNetworkDbJob.java @@ -21,6 +21,6 @@ class BootNetworkDbJob extends JobImpl { public String getName() { return "Boot Network Database"; } public void runJob() { - getContext().mainNetDb().startup(); + getContext().netDb().startup(); } } diff --git a/router/java/src/net/i2p/router/sybil/Analysis.java b/router/java/src/net/i2p/router/sybil/Analysis.java index 4e32daab8..7043f980b 100644 --- a/router/java/src/net/i2p/router/sybil/Analysis.java +++ b/router/java/src/net/i2p/router/sybil/Analysis.java @@ -332,7 +332,7 @@ public class Analysis extends JobImpl implements RouterApp, Runnable { for (Hash ff : ffs) { if (ff.equals(us)) continue; - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(ff); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(ff); if (ri != null) ris.add(ri); } @@ -344,7 +344,7 @@ public class Analysis extends JobImpl implements RouterApp, Runnable { * @since 0.9.41 */ public List getAllRouters(Hash us) { - Set set = _context.mainNetDb().getRouters(); + Set set = _context.netDb().getRouters(); List ris = new ArrayList(set.size()); for (RouterInfo ri : set) { if (!ri.getIdentity().getHash().equals(us)) @@ -429,7 +429,7 @@ public class Analysis extends JobImpl implements RouterApp, Runnable { continue; if (! _context.clientManager().shouldPublishLeaseSet(client)) continue; - LeaseSet ls = _context.mainNetDb().lookupLeaseSetLocally(client); + LeaseSet ls = _context.netDb().lookupLeaseSetLocally(client); if (ls == null) continue; Hash rkey = ls.getRoutingKey(); @@ -479,7 +479,7 @@ public class Analysis extends JobImpl implements RouterApp, Runnable { if (p >= threshold) { Hash h = e.getKey(); blocks.add(h.toBase64()); - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(h); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(h); if (ri != null) { for (RouterAddress ra : ri.getAddresses()) { byte[] ip = ra.getIP(); diff --git a/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java b/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java index a279700a3..053d98128 100644 --- a/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java +++ b/router/java/src/net/i2p/router/tasks/CoalesceStatsEvent.java @@ -69,7 +69,7 @@ public class CoalesceStatsEvent implements SimpleTimer.TimedEvent { int integrated = _ctx.peerManager().countPeersByCapability(FloodfillNetworkDatabaseFacade.CAPABILITY_FLOODFILL); sm.addRateData("router.integratedPeers", integrated); - sm.addRateData("router.knownPeers", _ctx.mainNetDb().getKnownRouters()); + sm.addRateData("router.knownPeers", _ctx.netDb().getKnownRouters()); sm.addRateData("bw.sendRate", (long)_ctx.bandwidthLimiter().getSendBps()); sm.addRateData("bw.recvRate", (long)_ctx.bandwidthLimiter().getReceiveBps()); diff --git a/router/java/src/net/i2p/router/tasks/Republish.java b/router/java/src/net/i2p/router/tasks/Republish.java index 8b7e5ed7b..cfd24766e 100644 --- a/router/java/src/net/i2p/router/tasks/Republish.java +++ b/router/java/src/net/i2p/router/tasks/Republish.java @@ -32,7 +32,7 @@ public class Republish implements SimpleTimer.TimedEvent { try { ri = _context.router().getRouterInfo(); if (ri != null) - _context.mainNetDb().publish(ri); + _context.netDb().publish(ri); } catch (IllegalArgumentException iae) { Log log = _context.logManager().getLog(Router.class); // clock skew / shift race? diff --git a/router/java/src/net/i2p/router/tasks/UpdateRoutingKeyModifierJob.java b/router/java/src/net/i2p/router/tasks/UpdateRoutingKeyModifierJob.java index dfda4a1d0..4cf60b0c4 100644 --- a/router/java/src/net/i2p/router/tasks/UpdateRoutingKeyModifierJob.java +++ b/router/java/src/net/i2p/router/tasks/UpdateRoutingKeyModifierJob.java @@ -39,7 +39,7 @@ public class UpdateRoutingKeyModifierJob extends JobImpl { // tell netdb if mod data changed boolean changed = gen.generateDateBasedModData(); if (changed) - getContext().mainNetDb().routingKeyChanged(); + getContext().netDb().routingKeyChanged(); requeue(delay); } } diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java index f723b4070..ca3e43f82 100644 --- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java +++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java @@ -374,7 +374,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { public void exemptIncoming(Hash peer) { if (_manager.isEstablished(peer)) return; - RouterInfo ri = (RouterInfo) _context.mainNetDb().lookupLocallyWithoutValidation(peer); + RouterInfo ri = (RouterInfo) _context.netDb().lookupLocallyWithoutValidation(peer); if (ri == null) return; Collection addrs = ri.getAddresses(); @@ -504,8 +504,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade { */ private class QueueAll implements SimpleTimer.TimedEvent { public void timeReached() { - for (Hash h : _context.mainNetDb().getAllRouters()) { - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(h); + for (Hash h : _context.netDb().getAllRouters()) { + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(h); if (ri == null) continue; byte[] ip = getIP(ri); @@ -614,7 +614,7 @@ public class CommSystemFacadeImpl extends CommSystemFacade { //if (ip != null && ip.length == 4) if (ip != null) return _geoIP.get(ip); - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(peer); if (ri == null) return null; ip = getValidIP(ri); diff --git a/router/java/src/net/i2p/router/transport/GeoIP.java b/router/java/src/net/i2p/router/transport/GeoIP.java index 9a808cf87..d4c9191e6 100644 --- a/router/java/src/net/i2p/router/transport/GeoIP.java +++ b/router/java/src/net/i2p/router/transport/GeoIP.java @@ -755,7 +755,7 @@ public class GeoIP { * @since 0.9.48 */ private static void banCountry(RouterContext ctx, String country) { - for (Hash h : ctx.mainNetDb().getAllRouters()) { + for (Hash h : ctx.netDb().getAllRouters()) { String hisCountry = ctx.commSystem().getCountry(h); if (country.equals(hisCountry)) { ctx.banlist().banlistRouterHard(h, "In our country"); diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java index fec52f03a..04b24b16d 100644 --- a/router/java/src/net/i2p/router/transport/TransportImpl.java +++ b/router/java/src/net/i2p/router/transport/TransportImpl.java @@ -199,7 +199,7 @@ public abstract class TransportImpl implements Transport { break; } - if (_context.mainNetDb().floodfillEnabled()) { + if (_context.netDb().floodfillEnabled()) { // && !SystemVersion.isWindows()) { def *= 17; def /= 10; } @@ -1002,7 +1002,7 @@ public abstract class TransportImpl implements Transport { } } /* - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(peer); if (ri == null) return false; String alt = getAltStyle(); 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 d332428dc..a11afdbb0 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java +++ b/router/java/src/net/i2p/router/transport/ntcp/InboundEstablishState.java @@ -689,9 +689,9 @@ class InboundEstablishState extends EstablishBase implements NTCP2Payload.Payloa } try { - RouterInfo old = _context.mainNetDb().store(h, ri); + RouterInfo old = _context.netDb().store(h, ri); if (flood && !ri.equals(old)) { - FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.mainNetDb(); + FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb(); if (fndf.floodConditional(ri)) { if (_log.shouldDebug()) _log.debug("Flooded the RI: " + h); diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java index e1639736e..936f0edd0 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -1668,9 +1668,9 @@ public class NTCPConnection implements Closeable { try { if (h.equals(_context.routerHash())) return; - RouterInfo old = _context.mainNetDb().store(h, ri); + RouterInfo old = _context.netDb().store(h, ri); if (flood && !ri.equals(old)) { - FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.mainNetDb(); + FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb(); if ((old == null || ri.getPublished() > old.getPublished()) && fndf.floodConditional(ri)) { if (_log.shouldDebug()) 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 8f5757508..ef4ac9a3f 100644 --- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java +++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java @@ -1177,7 +1177,7 @@ class EstablishmentManager { // Lookup the peer's MTU from the netdb, since it isn't included in the protocol setup (yet) // TODO if we don't have RI then we will get it shortly, but too late. // Perhaps netdb should notify transport when it gets a new RI... - RouterInfo info = _context.mainNetDb().lookupRouterInfoLocally(remote.calculateHash()); + RouterInfo info = _context.netDb().lookupRouterInfoLocally(remote.calculateHash()); if (info != null) { RouterAddress addr = _transport.getTargetAddress(info); if (addr != null) { @@ -1603,7 +1603,7 @@ class EstablishmentManager { case INTRO_STATE_INIT: case INTRO_STATE_LOOKUP_SENT: case INTRO_STATE_HAS_RI: - bob = _context.mainNetDb().lookupRouterInfoLocally(h); + bob = _context.netDb().lookupRouterInfoLocally(h); if (bob != null) istate = INTRO_STATE_HAS_RI; break; @@ -1665,7 +1665,7 @@ class EstablishmentManager { istate = INTRO_STATE_LOOKUP_SENT; state2.setIntroState(h, istate); // TODO on success job - _context.mainNetDb().lookupRouterInfo(h, null, null, 10*1000); + _context.netDb().lookupRouterInfo(h, null, null, 10*1000); sent = true; } } @@ -1830,8 +1830,8 @@ class EstablishmentManager { } Hash bobHash = bob.getRemotePeer(); Hash charlieHash = charlie.getRemoteIdentity().getHash(); - RouterInfo bobRI = _context.mainNetDb().lookupRouterInfoLocally(bobHash); - RouterInfo charlieRI = _context.mainNetDb().lookupRouterInfoLocally(charlieHash); + RouterInfo bobRI = _context.netDb().lookupRouterInfoLocally(bobHash); + RouterInfo charlieRI = _context.netDb().lookupRouterInfoLocally(charlieHash); Hash signer; OutboundEstablishState2.IntroState istate; if (code > 0 && code < 64) { @@ -1844,7 +1844,7 @@ class EstablishmentManager { else istate = INTRO_STATE_CHARLIE_REJECT; } - RouterInfo signerRI = _context.mainNetDb().lookupRouterInfoLocally(signer); + RouterInfo signerRI = _context.netDb().lookupRouterInfoLocally(signer); if (signerRI != null) { // validate signed data SigningPublicKey spk = signerRI.getIdentity().getSigningPublicKey(); @@ -2073,7 +2073,7 @@ class EstablishmentManager { return; OutboundEstablishState2 state2 = (OutboundEstablishState2) state; Hash charlieHash = state.getRemoteIdentity().getHash(); - RouterInfo charlieRI = _context.mainNetDb().lookupRouterInfoLocally(charlieHash); + RouterInfo charlieRI = _context.netDb().lookupRouterInfoLocally(charlieHash); if (charlieRI != null) { // validate signed data, but we don't necessarily know which Bob SigningPublicKey spk = charlieRI.getIdentity().getSigningPublicKey(); diff --git a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java index 4bea8ca62..65e3b8fb0 100644 --- a/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java +++ b/router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java @@ -374,9 +374,9 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa _mtu = mtu; try { - RouterInfo old = _context.mainNetDb().store(h, ri); + RouterInfo old = _context.netDb().store(h, ri); if (flood && !ri.equals(old)) { - FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.mainNetDb(); + FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb(); if (fndf.floodConditional(ri)) { if (_log.shouldDebug()) _log.debug("Flooded the RI: " + h); diff --git a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java index 42f245451..4dae9fd65 100644 --- a/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java +++ b/router/java/src/net/i2p/router/transport/udp/IntroductionManager.java @@ -279,7 +279,7 @@ class IntroductionManager { if (_builder != null && ssu2count >= 2) continue; } - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(hash); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(hash); if (ri == null) { if (_log.shouldLog(Log.INFO)) _log.info("Picked peer has no local routerInfo: " + cur); @@ -836,7 +836,7 @@ class IntroductionManager { // add a code for this? rcode = SSU2Util.RELAY_REJECT_BOB_NO_TAG; } else { - aliceRI = _context.mainNetDb().lookupRouterInfoLocally(alice.getRemotePeer()); + aliceRI = _context.netDb().lookupRouterInfoLocally(alice.getRemotePeer()); if (aliceRI != null) { // validate signed data SigningPublicKey spk = aliceRI.getIdentity().getSigningPublicKey(); @@ -967,9 +967,9 @@ class IntroductionManager { RouterInfo aliceRI = null; if (retryCount >= 5) { // last chance - aliceRI = _context.mainNetDb().lookupRouterInfoLocally(alice); + aliceRI = _context.netDb().lookupRouterInfoLocally(alice); } else if (!_context.banlist().isBanlisted(alice)) { - aliceRI = _context.mainNetDb().lookupRouterInfoLocally(alice); + aliceRI = _context.netDb().lookupRouterInfoLocally(alice); if (aliceRI == null) { if (_log.shouldInfo()) _log.info("Delay after " + retryCount + " retries, no RI for " + alice.toBase64()); @@ -1200,7 +1200,7 @@ class IntroductionManager { // We are Bob, send to Alice // Debug, check the signature, but send it along even if failed if (true) { - RouterInfo charlie = _context.mainNetDb().lookupRouterInfoLocally(peer.getRemotePeer()); + RouterInfo charlie = _context.netDb().lookupRouterInfoLocally(peer.getRemotePeer()); if (charlie != null) { byte[] signedData; if (status == 0) diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState2.java b/router/java/src/net/i2p/router/transport/udp/PeerState2.java index 649774938..608c147f3 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerState2.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerState2.java @@ -632,9 +632,9 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback Hash h = ri.getHash(); if (h.equals(_context.routerHash())) return; - RouterInfo old = _context.mainNetDb().store(h, ri); + RouterInfo old = _context.netDb().store(h, ri); if (flood && !ri.equals(old)) { - FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.mainNetDb(); + FloodfillNetworkDatabaseFacade fndf = (FloodfillNetworkDatabaseFacade) _context.netDb(); if ((old == null || ri.getPublished() > old.getPublished()) && fndf.floodConditional(ri)) { if (_log.shouldDebug()) 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 14774fa6e..9ddf763a7 100644 --- a/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java +++ b/router/java/src/net/i2p/router/transport/udp/PeerTestManager.java @@ -519,7 +519,7 @@ class PeerTestManager { // Check Bob version, drop if >= 0.9.52 fromPeer = test.getBob(); Hash bob = fromPeer.getRemotePeer(); - RouterInfo bobRI = _context.mainNetDb().lookupRouterInfoLocally(bob); + RouterInfo bobRI = _context.netDb().lookupRouterInfoLocally(bob); if (bobRI == null || VersionComparator.comp(bobRI.getVersion(), "0.9.52") >= 0) { if (_log.shouldInfo()) _log.info("Bob replied to us (Alice) with intro key " + fromPeer); @@ -1106,7 +1106,7 @@ class PeerTestManager { */ private boolean receiveTest(RemoteHostId from, PeerState2 fromPeer, int msg, Hash h, byte[] data, int retryCount) { if (retryCount < 5) { - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(h); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(h); if (ri == null) { if (_log.shouldInfo()) _log.info("Delay after " + retryCount + " retries, no RI for " + h.toBase64()); @@ -1356,7 +1356,7 @@ class PeerTestManager { return; } Hash alice = fromPeer.getRemotePeer(); - RouterInfo aliceRI = _context.mainNetDb().lookupRouterInfoLocally(alice); + RouterInfo aliceRI = _context.netDb().lookupRouterInfoLocally(alice); if (aliceRI == null) { if (_log.shouldLog(Log.WARN)) _log.warn("No alice RI"); @@ -1454,7 +1454,7 @@ class PeerTestManager { } else { // bob should have sent it to us. Don't bother to lookup // remotely if he didn't, or it was out-of-order or lost. - aliceRI = _context.mainNetDb().lookupRouterInfoLocally(h); + aliceRI = _context.netDb().lookupRouterInfoLocally(h); if (aliceRI != null) { // validate signed data SigningPublicKey spk = aliceRI.getIdentity().getSigningPublicKey(); @@ -1537,7 +1537,7 @@ class PeerTestManager { PeerState charlie = _transport.pickTestPeer(CHARLIE, 2, isIPv6, from); if (charlie != null && charlie != fromPeer && !prev.contains(charlie.getRemotePeer())) { Hash alice = state.getAlice().getRemotePeer(); - RouterInfo aliceRI = _context.mainNetDb().lookupRouterInfoLocally(alice); + RouterInfo aliceRI = _context.netDb().lookupRouterInfoLocally(alice); if (aliceRI != null) { try { state.setCharlie(charlie.getRemoteIPAddress(), charlie.getRemotePort(), charlie.getRemotePeer()); @@ -1558,7 +1558,7 @@ class PeerTestManager { state.setLastSendTime(now); PeerState2 alice = state.getAlice(); Hash charlie = fromPeer.getRemotePeer(); - RouterInfo charlieRI = (status == SSU2Util.TEST_ACCEPT) ? _context.mainNetDb().lookupRouterInfoLocally(charlie) : null; + RouterInfo charlieRI = (status == SSU2Util.TEST_ACCEPT) ? _context.netDb().lookupRouterInfoLocally(charlie) : null; if (charlieRI != null) { // send charlie RI to alice, only if ACCEPT. // Alice would need it to verify sig, but not worth the bandwidth @@ -1629,7 +1629,7 @@ class PeerTestManager { } else { // bob should have sent it to us. Don't bother to lookup // remotely if he didn't, or it was out-of-order or lost. - charlieRI = _context.mainNetDb().lookupRouterInfoLocally(h); + charlieRI = _context.netDb().lookupRouterInfoLocally(h); if (charlieRI != null) { // validate signed data SigningPublicKey spk = charlieRI.getIdentity().getSigningPublicKey(); @@ -2219,7 +2219,7 @@ class PeerTestManager { _log.warn("Unable to pick a charlie (no peer), IPv6? " + isIPv6); return; } - charlieInfo = _context.mainNetDb().lookupRouterInfoLocally(charlie.getRemotePeer()); + charlieInfo = _context.netDb().lookupRouterInfoLocally(charlie.getRemotePeer()); if (charlieInfo == null) { if (_log.shouldLog(Log.WARN)) _log.warn("Unable to pick a charlie (no RI), IPv6? " + isIPv6); @@ -2568,7 +2568,7 @@ class PeerTestManager { Hash h = ri.getHash(); if (h.equals(_context.routerHash())) return; - _context.mainNetDb().store(h, ri); + _context.netDb().store(h, ri); // ignore flood request } catch (IllegalArgumentException iae) { if (_log.shouldWarn()) 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 1675ce4ab..0604125fc 100644 --- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java +++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java @@ -3459,7 +3459,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority (!_context.router().isHidden()) && (!introducersRequired(ipv6)) && haveCapacity() && - (!_context.mainNetDb().floodfillEnabled()) && + (!_context.netDb().floodfillEnabled()) && (!ipv6 || _haveIPv6Address) && ((!ipv6 && getIPv6Config() != IPV6_ONLY) || (ipv6 && getIPv6Config() != IPV6_DISABLED)) && @@ -3849,7 +3849,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority boolean shouldPingFirewall = !STATUS_OK.contains(_reachabilityStatus); int currentListenPort = getListenPort(false); boolean pingOneOnly = shouldPingFirewall && getExternalPort(false) == currentListenPort; - boolean shortLoop = shouldPingFirewall || !haveCap || _context.mainNetDb().floodfillEnabled(); + boolean shortLoop = shouldPingFirewall || !haveCap || _context.netDb().floodfillEnabled(); long loopTime = shortLoop ? SHORT_LOOP_TIME : LONG_LOOP_TIME; _lastLoopShort = shortLoop; _expireBuffer.clear(); @@ -4212,7 +4212,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority } } // enforce IPv4/v6 advertised for all - RouterInfo peerInfo = _context.mainNetDb().lookupRouterInfoLocally(peer.getRemotePeer()); + RouterInfo peerInfo = _context.netDb().lookupRouterInfoLocally(peer.getRemotePeer()); if (peerInfo == null) continue; if (isIPv6) { diff --git a/router/java/src/net/i2p/router/tunnel/InboundGatewayReceiver.java b/router/java/src/net/i2p/router/tunnel/InboundGatewayReceiver.java index c95f52892..53183dc1b 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundGatewayReceiver.java +++ b/router/java/src/net/i2p/router/tunnel/InboundGatewayReceiver.java @@ -33,7 +33,7 @@ class InboundGatewayReceiver implements TunnelGateway.Receiver { if (!alreadySearched) _config.incrementProcessedMessages(); if (_target == null) { - _target = _context.mainNetDb().lookupRouterInfoLocally(_config.getSendTo()); + _target = _context.netDb().lookupRouterInfoLocally(_config.getSendTo()); if (_target == null) { // It should be rare to forget the router info for the next peer ReceiveJob j = null; @@ -41,7 +41,7 @@ class InboundGatewayReceiver implements TunnelGateway.Receiver { _context.statManager().addRateData("tunnel.inboundLookupSuccess", 0); else j = new ReceiveJob(_context, encrypted); - _context.mainNetDb().lookupRouterInfo(_config.getSendTo(), j, j, MAX_LOOKUP_TIME); + _context.netDb().lookupRouterInfo(_config.getSendTo(), j, j, MAX_LOOKUP_TIME); return -1; } } diff --git a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java index 1586bd004..3edb6fbf3 100644 --- a/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/InboundMessageDistributor.java @@ -142,7 +142,7 @@ class InboundMessageDistributor implements GarlicMessageReceiver.CloveReceiver { if (_client != null) oldri = _context.clientNetDb(_client).lookupRouterInfoLocally(key); else - oldri = _context.mainNetDb().lookupRouterInfoLocally(key); + oldri = _context.netDb().lookupRouterInfoLocally(key); // only update if RI is newer and non-ff if (oldri != null && oldri.getPublished() < ri.getPublished() && !FloodfillNetworkDatabaseFacade.isFloodfill(ri)) { diff --git a/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java b/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java index d92740026..44c6ec13a 100644 --- a/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java +++ b/router/java/src/net/i2p/router/tunnel/OutboundMessageDistributor.java @@ -59,7 +59,7 @@ class OutboundMessageDistributor { _log.warn("Drop msg at OBEP (new conn throttle) to " + target + ' ' + msg); return; } - RouterInfo info = _context.mainNetDb().lookupRouterInfoLocally(target); + RouterInfo info = _context.netDb().lookupRouterInfoLocally(target); if (info == null) { if (_log.shouldLog(Log.INFO)) _log.info("outbound distributor to " + target @@ -67,7 +67,7 @@ class OutboundMessageDistributor { + ": no info locally, searching..."); // TODO - should we set the search timeout based on the message timeout, // or is that a bad idea due to clock skews? - _context.mainNetDb().lookupRouterInfo(target, new DistributeJob(_context, msg, target, tunnel), null, MAX_DISTRIBUTE_TIME); + _context.netDb().lookupRouterInfo(target, new DistributeJob(_context, msg, target, tunnel), null, MAX_DISTRIBUTE_TIME); return; } else { distribute(msg, info, tunnel); @@ -139,7 +139,7 @@ class OutboundMessageDistributor { public String getName() { return "OBEP distribute after lookup"; } public void runJob() { - RouterInfo info = getContext().mainNetDb().lookupRouterInfoLocally(_target); + RouterInfo info = getContext().netDb().lookupRouterInfoLocally(_target); int stat; if (info != null) { if (_log.shouldLog(Log.DEBUG)) diff --git a/router/java/src/net/i2p/router/tunnel/OutboundReceiver.java b/router/java/src/net/i2p/router/tunnel/OutboundReceiver.java index c79dfeec8..a168733cb 100644 --- a/router/java/src/net/i2p/router/tunnel/OutboundReceiver.java +++ b/router/java/src/net/i2p/router/tunnel/OutboundReceiver.java @@ -32,7 +32,7 @@ class OutboundReceiver implements TunnelGateway.Receiver { _context = ctx; _log = ctx.logManager().getLog(OutboundReceiver.class); _config = cfg; - _nextHopCache = _context.mainNetDb().lookupRouterInfoLocally(_config.getPeer(1)); + _nextHopCache = _context.netDb().lookupRouterInfoLocally(_config.getPeer(1)); _priority = PRIORITY + cfg.getPriority(); _sendFailJob = new SendFailedJob(ctx); // all createRateStat() in TunnelDispatcher @@ -47,7 +47,7 @@ class OutboundReceiver implements TunnelGateway.Receiver { _log.debug("received encrypted, sending out " + _config + ": " + msg); RouterInfo ri = _nextHopCache; if (ri == null) { - ri = _context.mainNetDb().lookupRouterInfoLocally(_config.getPeer(1)); + ri = _context.netDb().lookupRouterInfoLocally(_config.getPeer(1)); _nextHopCache = ri; } if (ri != null) { @@ -58,7 +58,7 @@ class OutboundReceiver implements TunnelGateway.Receiver { if (_log.shouldLog(Log.WARN)) _log.warn("lookup of " + _config.getPeer(1) + " required for " + msg); - _context.mainNetDb().lookupRouterInfo(_config.getPeer(1), new SendJob(_context, msg), + _context.netDb().lookupRouterInfo(_config.getPeer(1), new SendJob(_context, msg), new LookupFailedJob(_context), MAX_LOOKUP_TIME); return -1; } @@ -94,7 +94,7 @@ class OutboundReceiver implements TunnelGateway.Receiver { public String getName() { return "OBGW send after lookup"; } public void runJob() { - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(_config.getPeer(1)); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(_config.getPeer(1)); if (_log.shouldLog(Log.DEBUG)) _log.debug("lookup of " + _config.getPeer(1) + " successful? " + (ri != null)); diff --git a/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java b/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java index 66987e023..da3dc5527 100644 --- a/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java +++ b/router/java/src/net/i2p/router/tunnel/TunnelParticipant.java @@ -64,9 +64,9 @@ class TunnelParticipant { _inboundDistributor = null; // final if ( (_config != null) && (_config.getSendTo() != null) ) { - _nextHopCache = _context.mainNetDb().lookupRouterInfoLocally(_config.getSendTo()); + _nextHopCache = _context.netDb().lookupRouterInfoLocally(_config.getSendTo()); if (_nextHopCache == null) - _context.mainNetDb().lookupRouterInfo(_config.getSendTo(), new Found(_context), null, LONG_MAX_LOOKUP_TIME); + _context.netDb().lookupRouterInfo(_config.getSendTo(), new Found(_context), null, LONG_MAX_LOOKUP_TIME); } // all createRateStat() in TunnelDispatcher } @@ -76,7 +76,7 @@ class TunnelParticipant { public String getName() { return "Next hop info found"; } public void runJob() { if (_nextHopCache == null) { - _nextHopCache = _context.mainNetDb().lookupRouterInfoLocally(_config.getSendTo()); + _nextHopCache = _context.netDb().lookupRouterInfoLocally(_config.getSendTo()); // nothing for failure since fail job is null _context.statManager().addRateData("tunnel.participantLookupSuccess", 1); } @@ -104,7 +104,7 @@ class TunnelParticipant { _config.incrementProcessedMessages(); RouterInfo ri = _nextHopCache; if (ri == null) - ri = _context.mainNetDb().lookupRouterInfoLocally(_config.getSendTo()); + ri = _context.netDb().lookupRouterInfoLocally(_config.getSendTo()); if (ri != null) { if (_log.shouldLog(Log.DEBUG)) _log.debug("Send off to nextHop directly (" + _config.getSendTo() @@ -118,7 +118,7 @@ class TunnelParticipant { if (_log.shouldLog(Log.WARN)) _log.warn("Lookup the nextHop (" + _config.getSendTo() + " for " + msg); - _context.mainNetDb().lookupRouterInfo(_config.getSendTo(), new SendJob(_context, msg), + _context.netDb().lookupRouterInfo(_config.getSendTo(), new SendJob(_context, msg), new TimeoutJob(_context, msg), MAX_LOOKUP_TIME); } } else { @@ -229,7 +229,7 @@ class TunnelParticipant { if (_nextHopCache != null) { send(_config, _msg, _nextHopCache); } else { - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(_config.getSendTo()); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(_config.getSendTo()); int stat; if (ri != null) { _nextHopCache = ri; @@ -260,7 +260,7 @@ class TunnelParticipant { if (_nextHopCache != null) return; - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(_config.getSendTo()); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(_config.getSendTo()); if (ri != null) { _nextHopCache = ri; if (_log.shouldLog(Log.WARN)) diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java index 226d5396e..31167e736 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildExecutor.java @@ -195,7 +195,7 @@ class BuildExecutor implements Runnable { if (peer.equals(_context.routerHash())) continue; // Look up routerInfo - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(peer); // Default and detect bandwidth tier String bwTier = "Unknown"; if (ri != null) bwTier = ri.getBandwidthTier(); // Returns "Unknown" if none recognized diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java index 776c439d6..c0d47edf6 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java @@ -342,7 +342,7 @@ class BuildHandler implements Runnable { int howBad = statuses[record]; // Look up routerInfo - RouterInfo ri = _context.mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo ri = _context.netDb().lookupRouterInfoLocally(peer); // Default and detect bandwidth tier String bwTier = "Unknown"; if (ri != null) bwTier = ri.getBandwidthTier(); // Returns "Unknown" if none recognized @@ -483,7 +483,7 @@ class BuildHandler implements Runnable { _context.statManager().addRateData("tunnel.dropTunnelFromCongestionCapability", 1); if (_log.shouldLog(Log.WARN)) _log.warn("Drop request, we are denying tunnels due to congestion: " + from); - RouterInfo fromRI = _context.mainNetDb().lookupRouterInfoLocally(from); + RouterInfo fromRI = _context.netDb().lookupRouterInfoLocally(from); if (fromRI != null){ String fromVersion = fromRI.getVersion(); // if fromVersion is greater than 0.9.58, then then ban the router due to it disrespecting our @@ -560,7 +560,7 @@ class BuildHandler implements Runnable { _context.commSystem().mayDisconnect(from); return -1; } - RouterInfo nextPeerInfo = _context.mainNetDb().lookupRouterInfoLocally(nextPeer); + RouterInfo nextPeerInfo = _context.netDb().lookupRouterInfoLocally(nextPeer); if (nextPeerInfo == null) { // limit concurrent next-hop lookups to prevent job queue overload attacks int numTunnels = _context.tunnelManager().getParticipatingCount(); @@ -581,7 +581,7 @@ class BuildHandler implements Runnable { + " ID: " + state.msg.getUniqueId() + " handled, lookup next peer " + nextPeer + " lookups: " + current + '/' + limit); - _context.mainNetDb().lookupRouterInfo(nextPeer, new HandleReq(_context, state, req, nextPeer), + _context.netDb().lookupRouterInfo(nextPeer, new HandleReq(_context, state, req, nextPeer), new TimeoutReq(_context, state, req, nextPeer), NEXT_HOP_LOOKUP_TIMEOUT); } else { _currentLookups.decrementAndGet(); @@ -648,7 +648,7 @@ class BuildHandler implements Runnable { if (_log.shouldLog(Log.DEBUG)) _log.debug("Request " + _state.msg.getUniqueId() + " handled with a successful deferred lookup: " + _req); - RouterInfo ri = getContext().mainNetDb().lookupRouterInfoLocally(_nextPeer); + RouterInfo ri = getContext().netDb().lookupRouterInfoLocally(_nextPeer); if (ri != null) { handleReq(ri, _state, _req, _nextPeer); getContext().statManager().addRateData("tunnel.buildLookupSuccess", 1); diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index 1bbf43d78..245a302a8 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -257,7 +257,7 @@ abstract class BuildRequestor { if (msg.getType() == ShortTunnelBuildMessage.MESSAGE_TYPE && !ibgw.equals(pairedTunnel.getEndpoint())) { // STBM is garlic encrypted to the IBGW, to hide it from the OBEP - RouterInfo peer = ctx.mainNetDb().lookupRouterInfoLocally(ibgw); + RouterInfo peer = ctx.netDb().lookupRouterInfoLocally(ibgw); if (peer != null) { I2NPMessage enc = MessageWrapper.wrap(ctx, msg, peer); if (enc != null) { @@ -293,7 +293,7 @@ abstract class BuildRequestor { msg.setMessageExpiration(ctx.clock().now() + BUILD_MSG_TIMEOUT + ctx.random().nextLong(20*1000)); // We set the OutNetMessage expiration much shorter, so that the // TunnelBuildFirstHopFailJob fires before the 13s build expiration. - RouterInfo peer = ctx.mainNetDb().lookupRouterInfoLocally(cfg.getPeer(1)); + RouterInfo peer = ctx.netDb().lookupRouterInfoLocally(cfg.getPeer(1)); if (peer == null) { if (log.shouldLog(Log.WARN)) log.warn("Could not find the next hop to send the outbound request to: " + cfg); @@ -334,7 +334,7 @@ abstract class BuildRequestor { * @since 0.9.51 */ private static boolean supportsShortTBM(RouterContext ctx, Hash h) { - RouterInfo ri = ctx.mainNetDb().lookupRouterInfoLocally(h); + RouterInfo ri = ctx.netDb().lookupRouterInfoLocally(h); if (ri == null) return false; if (ri.getIdentity().getPublicKey().getType() != EncType.ECIES_X25519) @@ -481,7 +481,7 @@ abstract class BuildRequestor { // erm, blank } else { Hash peer = cfg.getPeer(hop); - RouterInfo peerInfo = ctx.mainNetDb().lookupRouterInfoLocally(peer); + RouterInfo peerInfo = ctx.netDb().lookupRouterInfoLocally(peer); if (peerInfo == null) { if (log.shouldLog(Log.WARN)) log.warn("Peer selected for hop " + i + "/" + hop + " was not found locally: " diff --git a/router/java/src/net/i2p/router/tunnel/pool/ConnectChecker.java b/router/java/src/net/i2p/router/tunnel/pool/ConnectChecker.java index 61adf7840..a56091b5b 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/ConnectChecker.java +++ b/router/java/src/net/i2p/router/tunnel/pool/ConnectChecker.java @@ -84,10 +84,10 @@ public class ConnectChecker { boolean ust = to.equals(us); if (ust && ctx.commSystem().isEstablished(from)) return true; - RouterInfo rt = (RouterInfo) ctx.mainNetDb().lookupLocallyWithoutValidation(to); + RouterInfo rt = (RouterInfo) ctx.netDb().lookupLocallyWithoutValidation(to); if (rt == null) return true; - RouterInfo rf = (RouterInfo) ctx.mainNetDb().lookupLocallyWithoutValidation(from); + RouterInfo rf = (RouterInfo) ctx.netDb().lookupLocallyWithoutValidation(from); if (rf == null) return true; int ct; diff --git a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java index e7e36d291..165d935cd 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java @@ -280,7 +280,7 @@ class ExploratoryPeerSelector extends TunnelPeerSelector { } else { // If well connected or ff, don't pick from high cap // even during congestion, because congestion starts from the top - if (active > 500 || ctx.mainNetDb().floodfillEnabled()) + if (active > 500 || ctx.netDb().floodfillEnabled()) return false; failPct = getExploratoryFailPercentage(); diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java index d587d3f68..1fea52233 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPeerSelector.java @@ -227,7 +227,7 @@ public abstract class TunnelPeerSelector extends ConnectChecker { if (ctx.commSystem().wasUnreachable(h)) return true; - RouterInfo info = (RouterInfo) ctx.mainNetDb().lookupLocallyWithoutValidation(h); + RouterInfo info = (RouterInfo) ctx.netDb().lookupLocallyWithoutValidation(h); if (info == null) return true; @@ -267,7 +267,7 @@ public abstract class TunnelPeerSelector extends ConnectChecker { * @since 0.9.34, protected since 0.9.58 for ClientPeerSelector */ protected boolean allowAsOBEP(Hash h) { - RouterInfo ri = (RouterInfo) ctx.mainNetDb().lookupLocallyWithoutValidation(h); + RouterInfo ri = (RouterInfo) ctx.netDb().lookupLocallyWithoutValidation(h); if (ri == null) return true; return canConnect(ri, ANY_V4); @@ -284,7 +284,7 @@ public abstract class TunnelPeerSelector extends ConnectChecker { * @since 0.9.34, protected since 0.9.58 for ClientPeerSelector */ protected boolean allowAsIBGW(Hash h) { - RouterInfo ri = (RouterInfo) ctx.mainNetDb().lookupLocallyWithoutValidation(h); + RouterInfo ri = (RouterInfo) ctx.netDb().lookupLocallyWithoutValidation(h); if (ri == null) return true; if (ri.getCapabilities().indexOf(Router.CAPABILITY_REACHABLE) < 0) @@ -684,7 +684,7 @@ public abstract class TunnelPeerSelector extends ConnectChecker { if (ctx.commSystem().isEstablished(h)) return false; boolean canConnect; - RouterInfo peer = (RouterInfo) ctx.mainNetDb().lookupLocallyWithoutValidation(h); + RouterInfo peer = (RouterInfo) ctx.netDb().lookupLocallyWithoutValidation(h); if (peer == null) { canConnect = false; } else if (isIn) { diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java index db3ab8994..aa77ac482 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java @@ -357,7 +357,7 @@ public class TunnelPool { return rv; } // TODO high-bw non-ff also - if (_context.mainNetDb().floodfillEnabled() && + if (_context.netDb().floodfillEnabled() && _context.router().getUptime() > 5*60*1000) { rv += 2; } diff --git a/router/java/src/net/i2p/router/util/MaskedIPSet.java b/router/java/src/net/i2p/router/util/MaskedIPSet.java index 2158ca206..cfaa2fb67 100644 --- a/router/java/src/net/i2p/router/util/MaskedIPSet.java +++ b/router/java/src/net/i2p/router/util/MaskedIPSet.java @@ -51,7 +51,7 @@ public class MaskedIPSet extends HashSet { * @since 0.9.38 */ private static RouterInfo lookupRILocally(RouterContext ctx, Hash peer) { - DatabaseEntry ds = ctx.mainNetDb().lookupLocallyWithoutValidation(peer); + DatabaseEntry ds = ctx.netDb().lookupLocallyWithoutValidation(peer); if (ds != null) { if (ds.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) return (RouterInfo) ds;