lbt/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NetDB: Increase min ff version to 0.9.38

Browse Source 
previously was .38 for LS2 stores/lookups only
This commit is contained in:
zzz
2021-07-20 10:26:17 -04:00
parent 4c5823ecb7
commit 3bf3a4ff9d
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java
View File

@ -304,9 +304,11 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad
if (peer.equals(_context.routerHash()))
return false;
// min version checks
/*
if (type != DatabaseEntry.KEY_TYPE_ROUTERINFO && type != DatabaseEntry.KEY_TYPE_LEASESET &&
!StoreJob.shouldStoreLS2To(target))
return false;
*/
if ((type == DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 ||
lsSigType == SigType.RedDSA_SHA512_Ed25519) &&
!StoreJob.shouldStoreEncLS2To(target))

4
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillVerifyStoreJob.java
View File

@ -268,8 +268,8 @@ class FloodfillVerifyStoreJob extends JobImpl {
RouterInfo ri = _facade.lookupRouterInfoLocally(peer);
//if (ri != null && StoreJob.supportsCert(ri, keyCert)) {
if (ri != null && StoreJob.shouldStoreTo(ri) &&
(!_isLS2 || (StoreJob.shouldStoreLS2To(ri) &&
(_type != DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 || StoreJob.shouldStoreEncLS2To(ri))))) {
//(!_isLS2 || (StoreJob.shouldStoreLS2To(ri) &&
(_type != DatabaseEntry.KEY_TYPE_ENCRYPTED_LS2 || StoreJob.shouldStoreEncLS2To(ri))) {
Set<String> peerIPs = new MaskedIPSet(getContext(), ri, IP_CLOSE_BYTES);
if (!_ipSet.containsAny(peerIPs)) {
_ipSet.addAll(peerIPs);

3
router/java/src/net/i2p/router/networkdb/kademlia/IterativeSearchJob.java
View File

@ -321,8 +321,7 @@ public class IterativeSearchJob extends FloodSearchJob {
// querying old floodfills that don't know about those sig types.
// This is also more recent than the version that supports encrypted replies,
// so we won't request unencrypted replies anymore either.
if (!StoreJob.shouldStoreTo(ri) ||
(_isLease && !StoreJob.shouldStoreLS2To(ri))) {
if (!StoreJob.shouldStoreTo(ri)) {
failed(peer, false);
if (_log.shouldInfo())
_log.info(getJobId() + ": not sending query to old router: " + ri);

5
router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
View File

@ -215,12 +215,15 @@ abstract class StoreJob extends JobImpl {
_log.info(getJobId() + ": Skipping router that doesn't support EncLS2/RedDSA " + peer);
_state.addSkipped(peer);
skipped++;
/*
// same as shouldStoreTo() now
} else if (isls2 &&
!shouldStoreLS2To((RouterInfo)ds)) {
if (_log.shouldLog(Log.INFO))
_log.info(getJobId() + ": Skipping router that doesn't support LS2 " + peer);
_state.addSkipped(peer);
skipped++;
*/
} else {
int peerTimeout = _facade.getPeerTimeout(peer);
@ -641,7 +644,7 @@ abstract class StoreJob extends JobImpl {
}
/** @since 0.9.28 */
public static final String MIN_STORE_VERSION = "0.9.28";
public static final String MIN_STORE_VERSION = "0.9.38";
/**
* Is it new enough?