diff options
| author | Patrik Weiskircher <pat@icore.at> | 2007-06-03 18:08:51 +0000 |
|---|---|---|
| committer | Patrik Weiskircher <pat@icore.at> | 2007-06-03 18:08:51 +0000 |
| commit | d67737bc6499545e2a372b732a578ebc28128cc2 (patch) | |
| tree | 305ea0c3a6300550306c0118ac7743d7c53543ee /src | |
| parent | 4025498488edc9e405abe21dc633b48911dcd1d9 (diff) | |
| download | mpd-d67737bc6499545e2a372b732a578ebc28128cc2.tar.gz mpd-d67737bc6499545e2a372b732a578ebc28128cc2.tar.xz mpd-d67737bc6499545e2a372b732a578ebc28128cc2.zip | |
allow zeroconf to be disabled.
git-svn-id: https://svn.musicpd.org/mpd/trunk@6467 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.c | 1 | ||||
| -rw-r--r-- | src/conf.h | 1 | ||||
| -rw-r--r-- | src/zeroconf.c | 9 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/conf.c b/src/conf.c index 8ab59a505..1addd7e82 100644 --- a/src/conf.c +++ b/src/conf.c @@ -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); diff --git a/src/conf.h b/src/conf.h index 7059eaa90..f5ef07525 100644 --- a/src/conf.h +++ b/src/conf.h @@ -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" diff --git a/src/zeroconf.c b/src/zeroconf.c index 585c6e2bf..6dca7e10b 100644 --- a/src/zeroconf.c +++ b/src/zeroconf.c @@ -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 ); |