Listener: pass ListenerConfig to ctor

CM4all · Oct 23, 2023 · a113848 · a113848
1 parent 283cc2a
commit a113848
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Instance.cxx b/src/Instance.cxx
@@ -23,7 +23,6 @@
 
 #include <cassert>
 
-#include <sys/socket.h>
 #include <signal.h>
 #include <unistd.h>
 
@@ -90,7 +89,7 @@ Instance::DisableZeroconf() noexcept
 void
 Instance::AddListener(const ListenerConfig &config)
 {
-	listeners.emplace_front(*this, config.Create(SOCK_STREAM));
+	listeners.emplace_front(*this, config);
 
 #ifdef HAVE_AVAHI
 	auto &listener = listeners.front();

diff --git a/src/Listener.cxx b/src/Listener.cxx
@@ -4,11 +4,15 @@
 
 #include "Listener.hxx"
 #include "Instance.hxx"
+#include "Config.hxx"
 #include "net/SocketAddress.hxx"
 
-Listener::Listener(Instance &_instance, UniqueSocketDescriptor &&_fd)
-	:ServerSocket(_instance.GetEventLoop(), std::move(_fd)),
-	 instance(_instance), logger(instance.GetLogger()) {}
+#include <sys/socket.h>
+
+Listener::Listener(Instance &_instance, const ListenerConfig &config)
+	:ServerSocket(_instance.GetEventLoop(), config.Create(SOCK_STREAM)),
+	 instance(_instance),
+	 logger(instance.GetLogger()) {}
 
 void
 Listener::OnAccept(UniqueSocketDescriptor &&connection_fd,

diff --git a/src/Listener.hxx b/src/Listener.hxx
@@ -6,6 +6,7 @@
 
 #include "event/net/ServerSocket.hxx"
 
+struct ListenerConfig;
 class Instance;
 class RootLogger;
 
@@ -14,7 +15,7 @@ class Listener final : ServerSocket {
 	const RootLogger &logger;
 
 public:
-	Listener(Instance &_instance, UniqueSocketDescriptor &&fd);
+	Listener(Instance &_instance, const ListenerConfig &_config);
 
 	using ServerSocket::GetLocalAddress;