PeerAddress/HttpDiscovery: accept unresolved InetSocketAddresses to a…

…void super-slow reverse DNS lookups for HTTPSeed discovered peers.
bitcoinj · Oct 8, 2015 · e104bfb · e104bfb
1 parent 3d322d5
commit e104bfb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/PeerAddress.java b/core/src/main/java/org/bitcoinj/core/PeerAddress.java
@@ -97,7 +97,7 @@ public PeerAddress(InetAddress addr) {
      */
     public PeerAddress(InetSocketAddress addr) {
         if (addr.getHostName() == null || !addr.getHostName().toLowerCase().endsWith(".onion")) {
-            this.addr = checkNotNull(addr.getAddress());
+            this.addr = addr.getHostName() == null ? addr.getAddress() : new InetSocketAddress(addr.getHostName(), addr.getPort()).getAddress();
         } else {
             this.hostname = addr.getHostName();
         }

diff --git a/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java b/core/src/main/java/org/bitcoinj/net/discovery/HttpDiscovery.java
@@ -120,7 +120,7 @@ public InetSocketAddress[] protoToAddrs(PeerSeedProtos.SignedPeerSeeds proto) th
         InetSocketAddress[] results = new InetSocketAddress[seeds.getSeedCount()];
         int i = 0;
         for (PeerSeedProtos.PeerSeedData data : seeds.getSeedList())
-            results[i++] = new InetSocketAddress(data.getIpAddress(), data.getPort());
+            results[i++] = InetSocketAddress.createUnresolved(data.getIpAddress(), data.getPort());
         return results;
     }