fix: Remove dnsconfig* . Set net.DefaultResolver in NewNode.

Also remove unneeded "hacky" method IPFS.setDNSPair . Signed-off-by: jefft0 <jeff@thefirst.org>
ipfs-shipyard · Sep 13, 2022 · 86863cf · 86863cf
1 parent 9181c6a
commit 86863cf
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 194 deletions.
diff --git a/android/bridge/src/androidTest/java/ipfs/gomobile/android/basicIPFSClassTests.java b/android/bridge/src/androidTest/java/ipfs/gomobile/android/basicIPFSClassTests.java
@@ -75,19 +75,6 @@ public void testNullParams() throws Exception {
             fail("new IPFS() should fail with a null repoPath");
         } catch (Exception e) { /* ignore */ }
 
-
-        // DNS pair setter tests
-        try {
-            IPFS.setDNSPair(null, "foo");
-            fail("setDNSPair() should fail with a null primary");
-        } catch (Exception e) { /* ignore */ }
-
-        try {
-            IPFS.setDNSPair("foo", null);
-            fail("setDNSPair() should fail with a null secondary");
-        } catch (Exception e) { /* ignore */ }
-
-
         // Request tests
         try {
             ipfs.newRequest(null);

diff --git a/android/bridge/src/main/java/ipfs/gomobile/android/IPFS.java b/android/bridge/src/main/java/ipfs/gomobile/android/IPFS.java
@@ -332,19 +332,6 @@ synchronized public String serveGatewayMultiaddr(@NonNull String multiaddr, @Non
         }
     }
 
-    /**
-    * Sets the primary and secondary DNS for gomobile (hacky, will be removed in future version)
-    *
-    * @param primary The primary DNS address in the form {@code <ip4>:<port>}
-    * @param secondary The secondary DNS address in the form {@code <ip4>:<port>}
-    */
-    public static void setDNSPair(@NonNull String primary, @NonNull String secondary) {
-        Objects.requireNonNull(primary, "primary should not be null");
-        Objects.requireNonNull(secondary, "secondary should not be null");
-
-        Core.setDNSPair(primary, secondary, false);
-    }
-
     /**
     * Internal helper that opens the repo if it is closed.
     *

diff --git a/go/bind/core/dnsconfig.go b/go/bind/core/dnsconfig.go
diff --git a/go/bind/core/dnsconfig_deprecated.go b/go/bind/core/dnsconfig_deprecated.go
diff --git a/go/bind/core/dnsconfig_empty.s b/go/bind/core/dnsconfig_empty.s
diff --git a/go/bind/core/node.go b/go/bind/core/node.go
@@ -36,6 +36,18 @@ type Node struct {
 }
 
 func NewNode(r *Repo, driver ProximityDriver) (*Node, error) {
+	var dialer net.Dialer
+	net.DefaultResolver = &net.Resolver{
+		PreferGo: false,
+		Dial: func(context context.Context, _, _ string) (net.Conn, error) {
+			conn, err := dialer.DialContext(context, "udp", "84.200.69.80:53")
+			if err != nil {
+				return nil, err
+			}
+			return conn, nil
+		},
+	}
+
 	ctx := context.Background()
 
 	if _, err := loadPlugins(r.mr.Path); err != nil {

diff --git a/ios/Bridge/GomobileIPFS/Sources/IPFS.swift b/ios/Bridge/GomobileIPFS/Sources/IPFS.swift
@@ -227,14 +227,6 @@ public class IPFS {
         return try node.serveAPI(onTCPPort: onTCPPort)
     }
 
-    /// Sets the primary and secondary DNS for gomobile (hacky, will be removed in future version)
-    /// - Parameters:
-    ///   - primary: The primary DNS address in the form `<ip4>:<port>`
-    ///   - secondary: The secondary DNS address in the form `<ip4>:<port>`
-    public class func setDNSPair(_ primary: String, _ secondary: String) {
-        CoreSetDNSPair(primary, secondary, false)
-    }
-
     /// Internal helper that opens the repo if it is closed
     /// - Throws: `RepoError`: If the opening of the repo failed
     private func openRepoIfClosed() throws {