DNS: Remove seed configuration

bosagora · Jun 16, 2022 · 0984fe0 · 0984fe0
1 parent 5819e91
commit 0984fe0
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 68 deletions.
diff --git a/doc/config.example.yaml b/doc/config.example.yaml
@@ -229,9 +229,6 @@ network:
   # Supported value: IPv4, IPv6
   - http://192.168.1.42:2828
   - http://192.168.0.44:2828
-dns:
-  # Supported value: FQDN seed
-  - seed.bosagora.io
 
 ################################################################################
 ##                               Logging options                              ##

diff --git a/source/agora/cli/multi/main.d b/source/agora/cli/multi/main.d
@@ -91,7 +91,6 @@ private int main (string[] args)
                 node : config.node,
                 validator : config.validator,
                 network : assumeUnique(converted_network),
-                dns_seeds : config.dns_seeds,
                 logging: config.logging,
                 admin: config.admin,
             };

diff --git a/source/agora/network/Manager.d b/source/agora/network/Manager.d
@@ -302,10 +302,6 @@ public class NetworkManager
 
         // add the IP seeds
         this.addAddresses(Set!Address.from(config.network));
-
-        // add the DNS seeds
-        if (config.dns_seeds.length > 0)
-            this.addAddresses(resolveDNSSeeds(config.dns_seeds, this.log));
     }
 
     ///
@@ -1264,61 +1260,6 @@ public class NetworkManager
     }
 }
 
-/*******************************************************************************
-
-    Resolves IPs out of a list of DNS seeds
-
-    Params:
-        addresses = the set of DNS seeds
-
-    Returns:
-        The resolved set of IPs
-
-*******************************************************************************/
-
-private Set!Address resolveDNSSeeds (in string[] dns_seeds, ref Logger log)
-{
-    import std.conv;
-    import std.string;
-    import std.socket : getAddressInfo, AddressFamily, ProtocolType;
-
-    Set!Address resolved_ips;
-
-    foreach (host; dns_seeds)
-    try
-    {
-        log.info("DNS: contacting seed '{}'..", host);
-        foreach (addr_info; getAddressInfo(host))
-        {
-            log.trace("DNS: checking address {}", addr_info);
-            if (addr_info.family != AddressFamily.INET &&
-                addr_info.family != AddressFamily.INET6)
-            {
-                log.trace("DNS: rejected non-IP family {}", addr_info.family);
-                continue;
-            }
-
-            // we only support TCP for now
-            if (addr_info.protocol != ProtocolType.TCP)
-            {
-                log.trace("DNS: rejected non-TCP node {}", addr_info);
-                continue;
-            }
-
-            // if the port is set to zero, assume default Boa schema
-            auto ip = "agora://" ~ addr_info.address.to!string;
-            log.info("DNS: accepted IP {}", ip);
-            resolved_ips.put(Address(ip));
-        }
-    }
-    catch (Exception ex)
-    {
-        log.error("Error contacting DNS seed: {}", ex.message);
-    }
-
-    return resolved_ips;
-}
-
 /// A range over the list of peers that can be invalidated
 public struct PeerRange
 {

diff --git a/source/agora/node/Config.d b/source/agora/node/Config.d
@@ -105,10 +105,6 @@ public struct Config
     /// The list of IPs for use with network discovery
     public @Optional immutable Address[] network;
 
-    /// The list of DNS FQDN seeds for use with network discovery
-    @Name("dns")
-    public @Optional immutable string[] dns_seeds;
-
     /// Logging config
     @Key("name")
     public immutable(LoggerConfig)[] logging = [ {

diff --git a/source/agora/node/main.d b/source/agora/node/main.d
@@ -357,7 +357,6 @@ private Nullable!Config makeTestNetConfig (AgoraCLIArgs cmdln)
             admin: config.admin,
             registry: config.registry,
             network: config.network,
-            dns_seeds: config.dns_seeds,
             logging: config.logging,
             event_handlers: config.event_handlers,
         };