[avahi] [avahi-commits] r1499 - /trunk/avahi-core/entry.c

[Lennart Poettering]

On Fri, 20.07.07 18:13, svnmailer-noreply at 0pointer.de (svnmailer-noreply at 0pointer.de) wrote:

Good morning, Freedom Lovers!

> Author: lathiat
> Date: Fri Jul 20 20:13:42 2007
> New Revision: 1499
> 
> URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1499&root=avahi&view=rev
> Log:
>  * Modify the local conflict detection to allow multiple identical 
> records, so it is consistent with the network conflict detection.  This 
> allows you to publish shared services from the same machine not just 
> different machines.

Trent, why do you think this is a good idea?

Also, I would consider this a non-trivial change in the API, some
applications might rely on this behaviour. Changing API just for this
doesn't seem to be an option for me.

I vote for reverting this change!

> --- trunk/avahi-core/entry.c (original)
> +++ trunk/avahi-core/entry.c Fri Jul 20 20:13:42 2007
> @@ -160,6 +160,11 @@
>          
>          if ((flags & AVAHI_PUBLISH_ALLOW_MULTIPLE) && (e->flags & AVAHI_PUBLISH_ALLOW_MULTIPLE) )
>              continue;
> +
> +        if (avahi_record_equal_no_ttl(r, e->record)) {
> +            /* The records are the same, not a conflict in any case */
> +            continue;
> +        }
>  
>          if ((interface <= 0 ||
>               e->interface <= 0 ||
> 

Lennart


-- 
Lennart Poettering                        Red Hat, Inc.
lennart [at] poettering [dot] net         ICQ# 11060553
http://0pointer.net/lennart/           GnuPG 0x1A015CC4