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

Util: Add Addresses.getConnectedAddressTypes()

Browse Source 
method to efficiently get all types in one pass
This commit is contained in:
zzz
2022-03-01 07:25:49 -05:00
parent ce53714ba1
commit 5ef93f11a9
4 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java
View File

@@ -4,11 +4,13 @@ import java.io.File;
import java.io.InputStream;
import java.io.IOException;
import java.net.URI;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import net.i2p.data.DataHelper;
import net.i2p.router.RouterContext;
import net.i2p.util.Addresses;
import net.i2p.util.AddressType;
import net.i2p.util.Log;
import net.i2p.util.SimpleTimer;
@@ -105,7 +107,8 @@ public class ReseedChecker {
File noReseedFileAlt2 = new File(_context.getConfigDir(), ".i2pnoreseed");
File noReseedFileAlt3 = new File(_context.getConfigDir(), "noreseed.i2p");
if (!noReseedFile.exists() && !noReseedFileAlt1.exists() && !noReseedFileAlt2.exists() && !noReseedFileAlt3.exists()) {
if (!Addresses.isConnected() && !Addresses.isConnectedIPv6()) {
Set<AddressType> addrs = Addresses.getConnectedAddressTypes();
if (!addrs.contains(AddressType.IPV4) && !addrs.contains(AddressType.IPV6)) {
if (!_networkLogged) {
_log.logAlways(Log.WARN, "Cannot reseed, no network connection");
_networkLogged = true;

4
router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
View File

@@ -31,6 +31,7 @@ import net.i2p.router.transport.crypto.X25519KeyFactory;
import net.i2p.router.transport.udp.UDPTransport;
import net.i2p.router.util.EventLog;
import net.i2p.util.Addresses;
import net.i2p.util.AddressType;
import net.i2p.util.I2PThread;
import net.i2p.util.Log;
import net.i2p.util.SimpleTimer;
@@ -711,7 +712,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
}
public void timeReached() {
boolean good = Addresses.isConnected() || Addresses.isConnectedIPv6();
Set<AddressType> addrs = Addresses.getConnectedAddressTypes();
boolean good = addrs.contains(AddressType.IPV4) || addrs.contains(AddressType.IPV6);
if (_netMonitorStatus != good) {
if (good)
_log.logAlways(Log.INFO, "Network reconnected");