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

NetDB: More floodfill checks

Browse Source
This commit is contained in:
zzz
2018-03-07 21:24:54 +00:00
parent 7433eeb5c0
commit c5b6a4ee17
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
View File

@@ -11,6 +11,8 @@ import net.i2p.router.JobImpl;
import net.i2p.router.Router; import net.i2p.router.Router;
import net.i2p.router.RouterContext; import net.i2p.router.RouterContext;
import net.i2p.router.peermanager.PeerProfile; import net.i2p.router.peermanager.PeerProfile;
import net.i2p.router.transport.TransportManager;
import net.i2p.router.transport.TransportUtil;
import net.i2p.router.transport.udp.UDPTransport; import net.i2p.router.transport.udp.UDPTransport;
import net.i2p.router.util.EventLog; import net.i2p.router.util.EventLog;
import net.i2p.stat.Rate; import net.i2p.stat.Rate;
@@ -109,6 +111,16 @@ class FloodfillMonitorJob extends JobImpl {
if (getContext().getBooleanProperty(UDPTransport.PROP_LAPTOP_MODE)) if (getContext().getBooleanProperty(UDPTransport.PROP_LAPTOP_MODE))
return false; return false;
// need IPv4 - The setting is the same for both SSU and NTCP, so just take the SSU one
if (TransportUtil.getIPv6Config(getContext(), "SSU") == TransportUtil.IPv6Config.IPV6_ONLY)
return false;
// need both transports
if (!TransportManager.isNTCPEnabled(getContext()))
return false;
if (!getContext().getBooleanPropertyDefaultTrue(TransportManager.PROP_ENABLE_UDP))
return false;
if (getContext().commSystem().isInBadCountry()) if (getContext().commSystem().isInBadCountry())
return false; return false;
String country = getContext().commSystem().getOurCountry(); String country = getContext().commSystem().getOurCountry();