From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 22 Nov 2024 12:26:50 +0000 (+0100)
Subject: Do no start old webserver
X-Git-Tag: dnsdist-2.0.0-alpha1~95^2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97a129176f6cf1dd35a78e70180195fde468bc94;p=thirdparty%2Fpdns.git

Do no start old webserver
---

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index b25481c64e..f554811583 100644
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -2919,7 +2919,7 @@ static void recursorThread()
     t_fdm->addReadFD(threadInfo.getPipes().readToThread, handlePipeRequest);
 
     if (threadInfo.isHandler()) {
-      if (::arg().mustDo("webserver")) {
+      if (false && ::arg().mustDo("webserver")) {
         SLOG(g_log << Logger::Warning << "Enabling web server" << endl,
              log->info(Logr::Info, "Enabling web server"));
         try {
@@ -3320,8 +3320,10 @@ int main(int argc, char** argv)
       g_packetCache = std::make_unique<RecursorPacketCache>(g_maxPacketCacheEntries, ::arg().asNum("packetcache-shards"));
     }
 
-    extern void serveRustWeb();
-    serveRustWeb();
+    if (::arg().mustDo("webserver")) {
+      extern void serveRustWeb();
+      serveRustWeb();
+    }
     ret = serviceMain(startupLog);
   }
   catch (const PDNSException& ae) {
diff --git a/pdns/recursordist/ws-recursor.cc b/pdns/recursordist/ws-recursor.cc
index afee7d1827..a2ad5e7c0c 100644
--- a/pdns/recursordist/ws-recursor.cc
+++ b/pdns/recursordist/ws-recursor.cc
@@ -961,7 +961,8 @@ void serveRustWeb()
   for (const auto& [url, _]  : g_urlmap) {
     urls.emplace_back(url);
   }
-  pdns::rust::web::rec::serveweb({"127.0.0.1:3000", "[::1]:3000"}, ::rust::Slice<const ::rust::String>{urls.data(), urls.size()});
+  auto address = ComboAddress(arg()["webserver-address"], arg().asNum("webserver-port"));
+  pdns::rust::web::rec::serveweb({::rust::String(address.toStringWithPort())}, ::rust::Slice<const ::rust::String>{urls.data(), urls.size()});
 }
 
 static void fromCxxToRust(const HttpResponse& cxxresp, pdns::rust::web::rec::Response& rustResponse)