oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Listen: simplify code flow in listen_global_init()

Browse Source
This commit is contained in:
Max Kellermann
2018-07-15 21:34:16 +02:00
parent 56bfff5a57
commit 524a7f4560
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Listen.cxx
View File

@@ -82,18 +82,14 @@ void
listen_global_init(ClientListener &listener) listen_global_init(ClientListener &listener)
{ {
int port = config_get_positive(ConfigOption::PORT, DEFAULT_PORT); int port = config_get_positive(ConfigOption::PORT, DEFAULT_PORT);
const auto *param = config_get_param(ConfigOption::BIND_TO_ADDRESS);
#ifdef ENABLE_SYSTEMD_DAEMON #ifdef ENABLE_SYSTEMD_DAEMON
if (listen_systemd_activation(listener)) if (listen_systemd_activation(listener))
return; return;
#endif #endif
if (param != nullptr) { for (const auto *param = config_get_param(ConfigOption::BIND_TO_ADDRESS);
/* "bind_to_address" is configured, create listeners param != nullptr; param = param->next) {
for all values */
do {
try { try {
listen_add_config_param(listener, port, param); listen_add_config_param(listener, port, param);
} catch (...) { } catch (...) {
@@ -101,8 +97,9 @@ listen_global_init(ClientListener &listener)
param->value.c_str(), param->value.c_str(),
param->line)); param->line));
} }
} while ((param = param->next) != nullptr); }
} else {
if (listener.IsEmpty()) {
/* no "bind_to_address" configured, bind the /* no "bind_to_address" configured, bind the
configured port on all interfaces */ configured port on all interfaces */