diff --git a/core/java/src/net/i2p/util/DNSOverHTTPS.java b/core/java/src/net/i2p/util/DNSOverHTTPS.java index 72e1a2d98..bd8d9909f 100644 --- a/core/java/src/net/i2p/util/DNSOverHTTPS.java +++ b/core/java/src/net/i2p/util/DNSOverHTTPS.java @@ -29,6 +29,7 @@ import org.minidns.record.Record.TYPE; import net.i2p.I2PAppContext; import net.i2p.data.Base64; import net.i2p.data.DataHelper; +import net.i2p.util.Addresses; /** * Simple implemetation of DNS over HTTPS. @@ -157,11 +158,12 @@ public class DNSOverHTTPS implements EepGet.StatusListener { } /** - * V4_ONLY + * V4_ONLY unless we have only IPv6 address, then V6_ONLY * @return null if not found */ public String lookup(String host) { - return lookup(host, Type.V4_ONLY); + Type type = (Addresses.isConnected() || !Addresses.isConnectedIPv6()) ? Type.V4_ONLY : Type.V6_ONLY; + return lookup(host, type); } /** diff --git a/history.txt b/history.txt index ed9f50399..087b65287 100644 --- a/history.txt +++ b/history.txt @@ -1,7 +1,14 @@ +2022-01-30 zzz + * Reseed, DoH: Fixes for IPv6-only + +2022-01-26 zzz + * NTCP: Clock skew handling improvements + 2022-01-25 zzz * Tunnels: - Enable tunnel testing by default - Use tunnel builds as a tunnel test + * NTCP: Ban IP if RI signature fails * UDP: Pass priority through the packet builder, add priority to UDP-Sender queue diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f40f9f7a0..837dbdd0f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Git"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 9; + public final static long BUILD = 10; /** for example "-test" */ public final static String EXTRA = ""; diff --git a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java index ff699641a..b221df494 100644 --- a/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java +++ b/router/java/src/net/i2p/router/networkdb/reseed/ReseedChecker.java @@ -105,7 +105,7 @@ 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()) { + if (!Addresses.isConnected() && !Addresses.isConnectedIPv6()) { if (!_networkLogged) { _log.logAlways(Log.WARN, "Cannot reseed, no network connection"); _networkLogged = true;