diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-09-28 23:49:09 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-09-28 23:49:09 +0000 |
| commit | c2662cc5d17fcb54ec6d04dd81a26bb427c55c74 (patch) | |
| tree | d1d561f6148d2c6917c5b0f84d01f6aa3530f7d7 /avahi-daemon | |
| parent | 7c71db755d754ca6f10ad835afed8640e0de2f44 (diff) | |
* add option to not enable SO_REUSEADDR for multicast sockets, effectively disallow multiple mDNS stacks running simultaneously
* add a config file option for this and enable it by default
* remove some bad \n in log messages
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@646 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon')
| -rw-r--r-- | avahi-daemon/avahi-daemon.conf | 1 | ||||
| -rw-r--r-- | avahi-daemon/main.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf index 4761baa..b561f06 100644 --- a/avahi-daemon/avahi-daemon.conf +++ b/avahi-daemon/avahi-daemon.conf @@ -7,6 +7,7 @@ check-response-ttl=no use-iff-running=no enable-dbus=yes add-service-cookie=yes +disallow-other-stacks=yes [wide-area] enable-wide-area=yes diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 5320b68..07d7127 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -393,6 +393,8 @@ static int load_config_file(DaemonConfig *c) { c->server_config.check_response_ttl = is_yes(p->value); else if (strcasecmp(p->key, "use-iff-running") == 0) c->server_config.use_iff_running = is_yes(p->value); + else if (strcasecmp(p->key, "disallow-other-stacks") == 0) + c->server_config.disallow_other_stacks = is_yes(p->value); else if (strcasecmp(p->key, "enable-dbus") == 0) { if (*(p->value) == 'w' || *(p->value) == 'W') { @@ -871,6 +873,7 @@ int main(int argc, char *argv[]) { init_rand_seed(); avahi_server_config_init(&config.server_config); + config.server_config.disallow_other_stacks = 1; config.command = DAEMON_RUN; config.daemonize = 0; config.config_file = NULL; |