diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-21 15:20:55 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-21 15:20:55 +0000 |
| commit | 0571dc2e99dee3051632548f2e979db6b37fb650 (patch) | |
| tree | 1576b3c6965912680e286a88b69a374a1c28f24f | |
| parent | 298a8cdb7b369d80a1d8bad2bd315d2a38c5a38f (diff) | |
* fix local conflict detection algorithm
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@382 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | avahi-core/server.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/avahi-core/server.c b/avahi-core/server.c index 6ba8ea0..235247a 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -1472,15 +1472,14 @@ static int check_record_conflict(AvahiServer *s, AvahiIfIndex interface, AvahiPr if ((flags & AVAHI_ENTRY_ALLOWMUTIPLE) && (e->flags & AVAHI_ENTRY_ALLOWMUTIPLE) ) continue; - if (interface <= 0 || - e->interface <= 0 || - e->interface == interface || - protocol == AVAHI_PROTO_UNSPEC || - e->protocol == AVAHI_PROTO_UNSPEC || - e->protocol == protocol) + if ((interface <= 0 || + e->interface <= 0 || + e->interface == interface) && + (protocol == AVAHI_PROTO_UNSPEC || + e->protocol == AVAHI_PROTO_UNSPEC || + e->protocol == protocol)) return -1; - } return 0; |