From 4b757105ecfb6be234ac97bca0a336fa2fcf0598 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 30 Jan 2024 08:02:51 -0500 Subject: [PATCH] Naming: Add .i2p.alt support to naming services --- .../src/net/i2p/router/naming/BlockfileNamingService.java | 4 ++++ core/java/src/net/i2p/client/naming/DummyNamingService.java | 4 ++++ .../src/net/i2p/client/naming/SingleFileNamingService.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/apps/addressbook/java/src/net/i2p/router/naming/BlockfileNamingService.java b/apps/addressbook/java/src/net/i2p/router/naming/BlockfileNamingService.java index ca11d1659..d72a23a8b 100644 --- a/apps/addressbook/java/src/net/i2p/router/naming/BlockfileNamingService.java +++ b/apps/addressbook/java/src/net/i2p/router/naming/BlockfileNamingService.java @@ -762,6 +762,10 @@ public class BlockfileNamingService extends DummyNamingService { */ @Override public Destination lookup(String hostname, Properties lookupOptions, Properties storedOptions) { + if (hostname.endsWith(".i2p.alt")) { + // RFC 9476 + hostname = hostname.substring(0, hostname.length() - 4); + } Destination rv = lookup2(hostname, lookupOptions, storedOptions); if (rv == null) { // if hostname starts with "www.", strip and try again diff --git a/core/java/src/net/i2p/client/naming/DummyNamingService.java b/core/java/src/net/i2p/client/naming/DummyNamingService.java index 89a73540c..a39ad112b 100644 --- a/core/java/src/net/i2p/client/naming/DummyNamingService.java +++ b/core/java/src/net/i2p/client/naming/DummyNamingService.java @@ -55,6 +55,10 @@ public class DummyNamingService extends NamingService { */ @Override public Destination lookup(String hostname, Properties lookupOptions, Properties storedOptions) { + if (hostname.endsWith(".i2p.alt")) { + // RFC 9476 + hostname = hostname.substring(0, hostname.length() - 4); + } Destination d = getCache(hostname); if (d != null) return d; diff --git a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java index dfe4d270f..dca47c157 100644 --- a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java +++ b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java @@ -85,6 +85,10 @@ public class SingleFileNamingService extends NamingService { */ @Override public Destination lookup(String hostname, Properties lookupOptions, Properties storedOptions) { + if (hostname.endsWith(".i2p.alt")) { + // RFC 9476 + hostname = hostname.substring(0, hostname.length() - 4); + } try { String key = getKey(hostname); if (key == null && hostname.startsWith("www.") && hostname.length() > 7)