allow zeroconf to be disabled.
git-svn-id: https://svn.musicpd.org/mpd/trunk@6467 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
@@ -145,6 +145,7 @@ void initConf(void)
|
||||
registerConfigParam(CONF_PORT, 0, 0);
|
||||
registerConfigParam(CONF_LOG_LEVEL, 0, 0);
|
||||
registerConfigParam(CONF_ZEROCONF_NAME, 0, 0);
|
||||
registerConfigParam(CONF_ZEROCONF_ENABLED, 0, 0);
|
||||
registerConfigParam(CONF_PASSWORD, 1, 0);
|
||||
registerConfigParam(CONF_DEFAULT_PERMS, 0, 0);
|
||||
registerConfigParam(CONF_AUDIO_OUTPUT, 1, 1);
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#define CONF_PORT "port"
|
||||
#define CONF_LOG_LEVEL "log_level"
|
||||
#define CONF_ZEROCONF_NAME "zeroconf_name"
|
||||
#define CONF_ZEROCONF_ENABLED "zeroconf_enabled"
|
||||
#define CONF_PASSWORD "password"
|
||||
#define CONF_DEFAULT_PERMS "default_permissions"
|
||||
#define CONF_AUDIO_OUTPUT "audio_output"
|
||||
|
||||
@@ -549,6 +549,10 @@ void initZeroconf(void)
|
||||
{
|
||||
const char* serviceName = SERVICE_NAME;
|
||||
ConfigParam *param;
|
||||
int enabled = getBoolConfigParam(CONF_ZEROCONF_ENABLED);
|
||||
|
||||
if (enabled != -1 && enabled != 1)
|
||||
return;
|
||||
|
||||
param = getConfigParam(CONF_ZEROCONF_NAME);
|
||||
|
||||
@@ -566,6 +570,11 @@ void initZeroconf(void)
|
||||
|
||||
void finishZeroconf(void)
|
||||
{
|
||||
int enabled = getBoolConfigParam(CONF_ZEROCONF_ENABLED);
|
||||
|
||||
if (enabled != -1 && enabled != 1)
|
||||
return;
|
||||
|
||||
#ifdef HAVE_AVAHI
|
||||
DEBUG( "Avahi: Shutting down interface\n" );
|
||||
deregisterIO( &zeroConfIo );
|
||||
|
||||
Reference in New Issue
Block a user