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-core/server.c | |
| 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-core/server.c')
| -rw-r--r-- | avahi-core/server.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/avahi-core/server.c b/avahi-core/server.c index c4545c6..6b7571e 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -1324,8 +1324,8 @@ static int valid_server_config(const AvahiServerConfig *sc) { static int setup_sockets(AvahiServer *s) { assert(s); - s->fd_ipv4 = s->config.use_ipv4 ? avahi_open_socket_ipv4() : -1; - s->fd_ipv6 = s->config.use_ipv6 ? avahi_open_socket_ipv6() : -1; + s->fd_ipv4 = s->config.use_ipv4 ? avahi_open_socket_ipv4(s->config.disallow_other_stacks) : -1; + s->fd_ipv6 = s->config.use_ipv6 ? avahi_open_socket_ipv6(s->config.disallow_other_stacks) : -1; if (s->fd_ipv6 < 0 && s->fd_ipv4 < 0) return AVAHI_ERR_NO_NETWORK; @@ -2446,6 +2446,7 @@ AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) { c->add_service_cookie = 1; c->enable_wide_area = 0; c->n_wide_area_servers = 0; + c->disallow_other_stacks = 0; return c; } |