Merge branch 'main' of https://github.com/EpicGames/zen

1 files changed, 51 insertions, 3 deletions

diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 1a04aa39b..9a8090fc0 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -117,6 +117,37 @@ namespace zen {
 using namespace std::literals;
 using namespace fmt::literals;
 
+namespace utils {
+	asio::error_code ResolveHostname(asio::io_context&		   Ctx,
+									 std::string_view		   Host,
+									 std::string_view		   DefaultPort,
+									 std::vector<std::string>& OutEndpoints)
+	{
+		std::string_view Port = DefaultPort;
+
+		if (const size_t Idx = Host.find(":"); Idx != std::string_view::npos)
+		{
+			Port = Host.substr(Idx + 1);
+			Host = Host.substr(0, Idx);
+		}
+
+		asio::ip::tcp::resolver Resolver(Ctx);
+
+		asio::error_code					  ErrorCode;
+		asio::ip::tcp::resolver::results_type Endpoints = Resolver.resolve(Host, Port, ErrorCode);
+
+		if (!ErrorCode)
+		{
+			for (const asio::ip::tcp::endpoint& Ep : Endpoints)
+			{
+				OutEndpoints.push_back("http://{}:{}"_format(Ep.address().to_string(), Ep.port()));
+			}
+		}
+
+		return ErrorCode;
+	}
+}  // namespace utils
+
 class ZenServer : public IHttpStatusProvider
 {
 public:
@@ -616,12 +647,29 @@ ZenServer::InitializeStructuredCache(ZenServiceConfig& ServiceConfig)
 
 		UpstreamCache = zen::MakeUpstreamCache(UpstreamOptions, *m_CacheStore, *m_CidStore);
 
-		if (!UpstreamConfig.ZenConfig.Urls.empty())
+		// Zen upstream
 		{
-			std::unique_ptr<zen::UpstreamEndpoint> ZenEndpoint = zen::MakeZenUpstreamEndpoint(UpstreamConfig.ZenConfig.Urls);
-			UpstreamCache->RegisterEndpoint(std::move(ZenEndpoint));
+			std::vector<std::string> ZenUrls = UpstreamConfig.ZenConfig.Urls;
+			if (!UpstreamConfig.ZenConfig.Dns.empty())
+			{
+				for (const std::string& Dns : UpstreamConfig.ZenConfig.Dns)
+				{
+					const asio::error_code Err = zen::utils::ResolveHostname(m_IoContext, Dns, "1337"sv, ZenUrls);
+					if (Err)
+					{
+						ZEN_ERROR("resolve '{}' FAILED, reason '{}'", Err.message());
+					}
+				}
+			}
+
+			if (!ZenUrls.empty())
+			{
+				std::unique_ptr<zen::UpstreamEndpoint> ZenEndpoint = zen::MakeZenUpstreamEndpoint(ZenUrls);
+				UpstreamCache->RegisterEndpoint(std::move(ZenEndpoint));
+			}
 		}
 
+		// Jupiter upstream
 		{
 			zen::CloudCacheClientOptions Options;
 			if (UpstreamConfig.JupiterConfig.UseProductionSettings)