diff options
author | Max Kellermann <max@duempel.org> | 2014-01-29 18:32:28 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-01-29 18:32:28 +0100 |
commit | aeaf64b46757e64bf32e945d52df2c4d447e5aa4 (patch) | |
tree | bde0bbef6e3e94f65c75c0f17f9b3664e35260d9 /src/Listen.cxx | |
parent | a137f817f5e569211afdef0134c2179fdbad507f (diff) | |
download | mpd-aeaf64b46757e64bf32e945d52df2c4d447e5aa4.tar.gz mpd-aeaf64b46757e64bf32e945d52df2c4d447e5aa4.tar.xz mpd-aeaf64b46757e64bf32e945d52df2c4d447e5aa4.zip |
Listen: pass EventLoop to listen_global_init()
Don't use global variables.
Diffstat (limited to '')
-rw-r--r-- | src/Listen.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Listen.cxx b/src/Listen.cxx index faa3e0db1..731f51196 100644 --- a/src/Listen.cxx +++ b/src/Listen.cxx @@ -44,12 +44,12 @@ static constexpr Domain listen_domain("listen"); class ClientListener final : public ServerSocket { public: - ClientListener():ServerSocket(*main_loop) {} + ClientListener(EventLoop &_loop):ServerSocket(_loop) {} private: virtual void OnAccept(int fd, const sockaddr &address, size_t address_length, int uid) { - client_new(*main_loop, *instance->partition, + client_new(GetEventLoop(), *instance->partition, fd, &address, address_length, uid); } }; @@ -101,16 +101,14 @@ listen_systemd_activation(Error &error_r) } bool -listen_global_init(Error &error) +listen_global_init(EventLoop &loop, Error &error) { - assert(main_loop != nullptr); - int port = config_get_positive(CONF_PORT, DEFAULT_PORT); const struct config_param *param = config_get_next_param(CONF_BIND_TO_ADDRESS, nullptr); bool success; - listen_socket = new ClientListener(); + listen_socket = new ClientListener(loop); if (listen_systemd_activation(error)) return true; |