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

include hostname in zeroconf_name (fixes #387) 

expand %h to the system hostname and default to a zeroconf string that
contains %h
This commit is contained in:
Florian Schlichting 2018-10-31 17:54:45 +01:00
parent 2148d4bb31
commit d1f85240a2
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/mpd.conf.5
View File

@ -99,7 +99,8 @@ information will be published with Zeroconf. The default is yes.
.B zeroconf_name <name> .B zeroconf_name <name>
If Zeroconf is enabled, this is the service name to publish. This name should If Zeroconf is enabled, this is the service name to publish. This name should
be unique to your local network, but name collisions will be properly dealt be unique to your local network, but name collisions will be properly dealt
with. The default is "Music Player". with. The default is "Music Player @ %h", where %h will be replaced with the
hostname of the machine running MPD.
.TP .TP
.B audio_output .B audio_output
See \fBDESCRIPTION\fP and the various \fBAUDIO OUTPUT PARAMETERS\fP sections See \fBDESCRIPTION\fP and the various \fBAUDIO OUTPUT PARAMETERS\fP sections

4
doc/mpdconf.example
View File

@ -151,9 +151,9 @@
#zeroconf_enabled "yes" #zeroconf_enabled "yes"
# #
# The argument to this setting will be the Zeroconf / Avahi unique name for # The argument to this setting will be the Zeroconf / Avahi unique name for
# this MPD server on the network. # this MPD server on the network. %h will be replaced with the hostname.
# #
#zeroconf_name "Music Player" #zeroconf_name "Music Player @ %h"
# #
############################################################################### ###############################################################################

3
doc/user.rst
View File

@ -673,7 +673,8 @@ settings control this feature:
* - **zeroconf_enabled yes|no** * - **zeroconf_enabled yes|no**
- Enables or disables this feature. Default is yes. - Enables or disables this feature. Default is yes.
* - **zeroconf_name NAME** * - **zeroconf_name NAME**
- The service name to publish via Zeroconf. The default is "Music Player". - The service name to publish via Zeroconf. The default is "Music Player @ %h".
%h will be replaced with the hostname of the machine running :program:`MPD`.
Advanced configuration Advanced configuration
********************** **********************

10
src/zeroconf/ZeroconfGlue.cxx
View File

@ -27,13 +27,16 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <unistd.h>
#include <limits.h>
#include <regex>
static constexpr Domain zeroconf_domain("zeroconf"); static constexpr Domain zeroconf_domain("zeroconf");
/* The default service name to publish /* The default service name to publish
* (overridden by 'zeroconf_name' config parameter) * (overridden by 'zeroconf_name' config parameter)
*/ */
#define SERVICE_NAME "Music Player" #define SERVICE_NAME "Music Player @ %h"
#define DEFAULT_ZEROCONF_ENABLED 1 #define DEFAULT_ZEROCONF_ENABLED 1
@ -59,6 +62,11 @@ ZeroconfInit(const ConfigData &config, gcc_unused EventLoop &loop)
serviceName = config.GetString(ConfigOption::ZEROCONF_NAME, serviceName = config.GetString(ConfigOption::ZEROCONF_NAME,
SERVICE_NAME); SERVICE_NAME);
char hostname[HOST_NAME_MAX+1];
gethostname(hostname, HOST_NAME_MAX);
std::string sName = std::regex_replace(serviceName, std::regex("%h"), hostname);
serviceName = sName.c_str();
#ifdef HAVE_AVAHI #ifdef HAVE_AVAHI
AvahiInit(loop, serviceName); AvahiInit(loop, serviceName);
#endif #endif