X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fannounce.c;h=ccdbf15adf06f7d4a8450a4432013e12decde002;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=dbad6c71f52174f2ef73d566c2bd349758a9105b;hpb=c58379bde376cb2298fca14f83a86626f1b76f2f;p=catta

diff --git a/avahi-core/announce.c b/avahi-core/announce.c
index dbad6c7..ccdbf15 100644
--- a/avahi-core/announce.c
+++ b/avahi-core/announce.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -23,79 +21,85 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+
+#include <avahi-common/timeval.h>
+#include <avahi-common/malloc.h>
+
 #include "announce.h"
-#include "util.h"
+#include "log.h"
+#include "rr-util.h"
 
 #define AVAHI_ANNOUNCEMENT_JITTER_MSEC 250
 #define AVAHI_PROBE_JITTER_MSEC 250
 #define AVAHI_PROBE_INTERVAL_MSEC 250
 
-static void remove_announcement(AvahiServer *s, AvahiAnnouncement *a) {
-    g_assert(s);
-    g_assert(a);
+static void remove_announcer(AvahiServer *s, AvahiAnnouncer *a) {
+    assert(s);
+    assert(a);
 
     if (a->time_event)
-        avahi_time_event_queue_remove(s->time_event_queue, a->time_event);
+        avahi_time_event_free(a->time_event);
 
-    AVAHI_LLIST_REMOVE(AvahiAnnouncement, by_interface, a->interface->announcements, a);
-    AVAHI_LLIST_REMOVE(AvahiAnnouncement, by_entry, a->entry->announcements, a);
-    
-    g_free(a);
+    AVAHI_LLIST_REMOVE(AvahiAnnouncer, by_interface, a->interface->announcers, a);
+    AVAHI_LLIST_REMOVE(AvahiAnnouncer, by_entry, a->entry->announcers, a);
+
+    avahi_free(a);
 }
 
 static void elapse_announce(AvahiTimeEvent *e, void *userdata);
 
-static void set_timeout(AvahiAnnouncement *a, const GTimeVal *tv) {
-    g_assert(a);
+static void set_timeout(AvahiAnnouncer *a, const struct timeval *tv) {
+    assert(a);
 
     if (!tv) {
         if (a->time_event) {
-            avahi_time_event_queue_remove(a->server->time_event_queue, a->time_event);
+            avahi_time_event_free(a->time_event);
             a->time_event = NULL;
         }
     } else {
 
-        if (a->time_event) 
-            avahi_time_event_queue_update(a->server->time_event_queue, a->time_event, tv);
+        if (a->time_event)
+            avahi_time_event_update(a->time_event, tv);
         else
-            a->time_event = avahi_time_event_queue_add(a->server->time_event_queue, tv, elapse_announce, a);
+            a->time_event = avahi_time_event_new(a->server->time_event_queue, tv, elapse_announce, a);
     }
 }
 
-static void next_state(AvahiAnnouncement *a);
+static void next_state(AvahiAnnouncer *a);
 
-void avahi_entry_group_check_probed(AvahiEntryGroup *g, gboolean immediately) {
+void avahi_s_entry_group_check_probed(AvahiSEntryGroup *g, int immediately) {
     AvahiEntry *e;
-    g_assert(g);
-    g_assert(!g->dead);
+    assert(g);
+    assert(!g->dead);
 
     /* Check whether all group members have been probed */
-    
-    if (g->state != AVAHI_ENTRY_GROUP_REGISTERING || g->n_probing > 0) 
+
+    if (g->state != AVAHI_ENTRY_GROUP_REGISTERING || g->n_probing > 0)
         return;
 
-    avahi_entry_group_change_state(g, AVAHI_ENTRY_GROUP_ESTABLISHED);
+    avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_ESTABLISHED);
 
     if (g->dead)
         return;
-    
-    for (e = g->entries; e; e = e->entries_next) {
-        AvahiAnnouncement *a;
-        
-        for (a = e->announcements; a; a = a->by_entry_next) {
+
+    for (e = g->entries; e; e = e->by_group_next) {
+        AvahiAnnouncer *a;
+
+        for (a = e->announcers; a; a = a->by_entry_next) {
 
             if (a->state != AVAHI_WAITING)
                 continue;
-            
+
             a->state = AVAHI_ANNOUNCING;
 
             if (immediately) {
                 /* Shortcut */
-                
+
                 a->n_iteration = 1;
                 next_state(a);
             } else {
-                GTimeVal tv;
+                struct timeval tv;
                 a->n_iteration = 0;
                 avahi_elapse_time(&tv, 0, AVAHI_ANNOUNCEMENT_JITTER_MSEC);
                 set_timeout(a, &tv);
@@ -104,32 +108,25 @@ void avahi_entry_group_check_probed(AvahiEntryGroup *g, gboolean immediately) {
     }
 }
 
-static void next_state(AvahiAnnouncement *a) {
-    g_assert(a);
+static void next_state(AvahiAnnouncer *a) {
+    assert(a);
 
-/*     g_message("%i -- %u", a->state, a->n_iteration);   */
-    
     if (a->state == AVAHI_WAITING) {
 
-        g_assert(a->entry->group);
+        assert(a->entry->group);
+
+        avahi_s_entry_group_check_probed(a->entry->group, 1);
 
-        avahi_entry_group_check_probed(a->entry->group, TRUE);
-        
     } else if (a->state == AVAHI_PROBING) {
 
         if (a->n_iteration >= 4) {
             /* Probing done */
-            
-            gchar *t;
-
-            g_message("Enough probes for record [%s]", t = avahi_record_to_string(a->entry->record));
-            g_free(t);
 
             if (a->entry->group) {
-                g_assert(a->entry->group->n_probing);
+                assert(a->entry->group->n_probing);
                 a->entry->group->n_probing--;
             }
-            
+
             if (a->entry->group && a->entry->group->state == AVAHI_ENTRY_GROUP_REGISTERING)
                 a->state = AVAHI_WAITING;
             else {
@@ -140,283 +137,388 @@ static void next_state(AvahiAnnouncement *a) {
             set_timeout(a, NULL);
             next_state(a);
         } else {
-            GTimeVal tv;
+            struct timeval tv;
+
+            avahi_interface_post_probe(a->interface, a->entry->record, 0);
 
-            avahi_interface_post_probe(a->interface, a->entry->record, FALSE);
-            
             avahi_elapse_time(&tv, AVAHI_PROBE_INTERVAL_MSEC, 0);
             set_timeout(a, &tv);
-            
+
             a->n_iteration++;
         }
 
     } else if (a->state == AVAHI_ANNOUNCING) {
 
-        avahi_interface_post_response(a->interface, NULL, a->entry->record, a->entry->flags & AVAHI_ENTRY_UNIQUE, FALSE);
+        if (a->entry->flags & AVAHI_PUBLISH_UNIQUE)
+            /* Send the whole rrset at once */
+            avahi_server_prepare_matching_responses(a->server, a->interface, a->entry->record->key, 0);
+        else
+            avahi_server_prepare_response(a->server, a->interface, a->entry, 0, 0);
+
+        avahi_server_generate_response(a->server, a->interface, NULL, NULL, 0, 0, 0);
 
         if (++a->n_iteration >= 4) {
-            gchar *t;
             /* Announcing done */
 
-            g_message("Enough announcements for record [%s]", t = avahi_record_to_string(a->entry->record));
-            g_free(t);
-
             a->state = AVAHI_ESTABLISHED;
 
             set_timeout(a, NULL);
         } else {
-            GTimeVal tv;
+            struct timeval tv;
             avahi_elapse_time(&tv, a->sec_delay*1000, AVAHI_ANNOUNCEMENT_JITTER_MSEC);
-        
+
             if (a->n_iteration < 10)
                 a->sec_delay *= 2;
-            
+
             set_timeout(a, &tv);
         }
     }
 }
 
 static void elapse_announce(AvahiTimeEvent *e, void *userdata) {
-    g_assert(e);
+    assert(e);
 
     next_state(userdata);
 }
 
-AvahiAnnouncement *avahi_get_announcement(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
-    AvahiAnnouncement *a;
-    
-    g_assert(s);
-    g_assert(e);
-    g_assert(i);
+static AvahiAnnouncer *get_announcer(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
+    AvahiAnnouncer *a;
 
-    for (a = e->announcements; a; a = a->by_entry_next)
+    assert(s);
+    assert(e);
+    assert(i);
+
+    for (a = e->announcers; a; a = a->by_entry_next)
         if (a->interface == i)
             return a;
 
     return NULL;
 }
 
-static void new_announcement(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
-    AvahiAnnouncement *a;
-    GTimeVal tv;
-    gchar *t; 
-
-    g_assert(s);
-    g_assert(i);
-    g_assert(e);
-    g_assert(!e->dead);
-
-/*     g_message("NEW ANNOUNCEMENT: %s.%i [%s]", i->hardware->name, i->protocol, t = avahi_record_to_string(e->record)); */
-/*     g_free(t); */
-    
-    if (!avahi_interface_match(i, e->interface, e->protocol) || !i->announcing || !avahi_entry_commited(e))
-        return;
-
-    /* We don't want duplicate announcements */
-    if (avahi_get_announcement(s, e, i))
-        return;
+static void go_to_initial_state(AvahiAnnouncer *a) {
+    AvahiEntry *e;
+    struct timeval tv;
 
-    a = g_new(AvahiAnnouncement, 1);
-    a->server = s;
-    a->interface = i;
-    a->entry = e;
+    assert(a);
+    e = a->entry;
 
-    if ((e->flags & AVAHI_ENTRY_UNIQUE) && !(e->flags & AVAHI_ENTRY_NOPROBE))
+    if ((e->flags & AVAHI_PUBLISH_UNIQUE) && !(e->flags & AVAHI_PUBLISH_NO_PROBE))
         a->state = AVAHI_PROBING;
-    else if (!(e->flags & AVAHI_ENTRY_NOANNOUNCE)) {
+    else if (!(e->flags & AVAHI_PUBLISH_NO_ANNOUNCE)) {
 
         if (!e->group || e->group->state == AVAHI_ENTRY_GROUP_ESTABLISHED)
             a->state = AVAHI_ANNOUNCING;
         else
             a->state = AVAHI_WAITING;
-        
+
     } else
         a->state = AVAHI_ESTABLISHED;
 
-
-    g_message("New announcement on interface %s.%i for entry [%s] state=%i", i->hardware->name, i->protocol, t = avahi_record_to_string(e->record), a->state);
-    g_free(t);
-
     a->n_iteration = 1;
     a->sec_delay = 1;
-    a->time_event = NULL;
+
+    if (a->state == AVAHI_PROBING && e->group)
+        e->group->n_probing++;
 
     if (a->state == AVAHI_PROBING)
-        if (e->group)
-            e->group->n_probing++;
-    
-    AVAHI_LLIST_PREPEND(AvahiAnnouncement, by_interface, i->announcements, a);
-    AVAHI_LLIST_PREPEND(AvahiAnnouncement, by_entry, e->announcements, a);
-
-    if (a->state == AVAHI_PROBING) {
-        avahi_elapse_time(&tv, 0, AVAHI_PROBE_JITTER_MSEC);
-        set_timeout(a, &tv);
-    } else if (a->state == AVAHI_ANNOUNCING) {
-        avahi_elapse_time(&tv, 0, AVAHI_ANNOUNCEMENT_JITTER_MSEC);
-        set_timeout(a, &tv);
+        set_timeout(a, avahi_elapse_time(&tv, 0, AVAHI_PROBE_JITTER_MSEC));
+    else if (a->state == AVAHI_ANNOUNCING)
+        set_timeout(a, avahi_elapse_time(&tv, 0, AVAHI_ANNOUNCEMENT_JITTER_MSEC));
+    else
+        set_timeout(a, NULL);
+}
+
+static void new_announcer(AvahiServer *s, AvahiInterface *i, AvahiEntry *e) {
+    AvahiAnnouncer *a;
+
+    assert(s);
+    assert(i);
+    assert(e);
+    assert(!e->dead);
+
+    if (!avahi_interface_match(i, e->interface, e->protocol) || !i->announcing || !avahi_entry_is_commited(e))
+        return;
+
+    /* We don't want duplicate announcers */
+    if (get_announcer(s, e, i))
+        return;
+
+    if ((!(a = avahi_new(AvahiAnnouncer, 1)))) {
+        avahi_log_error(__FILE__": Out of memory.");
+        return;
     }
+
+    a->server = s;
+    a->interface = i;
+    a->entry = e;
+    a->time_event = NULL;
+
+    AVAHI_LLIST_PREPEND(AvahiAnnouncer, by_interface, i->announcers, a);
+    AVAHI_LLIST_PREPEND(AvahiAnnouncer, by_entry, e->announcers, a);
+
+    go_to_initial_state(a);
 }
 
 void avahi_announce_interface(AvahiServer *s, AvahiInterface *i) {
     AvahiEntry *e;
-    
-    g_assert(s);
-    g_assert(i);
+
+    assert(s);
+    assert(i);
 
     if (!i->announcing)
         return;
 
     for (e = s->entries; e; e = e->entries_next)
         if (!e->dead)
-            new_announcement(s, i, e);
+            new_announcer(s, i, e);
 }
 
-static void announce_walk_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata) {
+static void announce_walk_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, void* userdata) {
     AvahiEntry *e = userdata;
-    
-    g_assert(m);
-    g_assert(i);
-    g_assert(e);
-    g_assert(!e->dead);
 
-    new_announcement(m->server, i, e);
+    assert(m);
+    assert(i);
+    assert(e);
+    assert(!e->dead);
+
+    new_announcer(m->server, i, e);
 }
 
 void avahi_announce_entry(AvahiServer *s, AvahiEntry *e) {
-    g_assert(s);
-    g_assert(e);
-    g_assert(!e->dead);
+    assert(s);
+    assert(e);
+    assert(!e->dead);
 
     avahi_interface_monitor_walk(s->monitor, e->interface, e->protocol, announce_walk_callback, e);
 }
 
-void avahi_announce_group(AvahiServer *s, AvahiEntryGroup *g) {
+void avahi_announce_group(AvahiServer *s, AvahiSEntryGroup *g) {
     AvahiEntry *e;
-    
-    g_assert(s);
-    g_assert(g);
+
+    assert(s);
+    assert(g);
 
     for (e = g->entries; e; e = e->by_group_next)
         if (!e->dead)
             avahi_announce_entry(s, e);
 }
 
-gboolean avahi_entry_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
-    AvahiAnnouncement *a;
+int avahi_entry_is_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
+    AvahiAnnouncer *a;
+
+    assert(s);
+    assert(e);
+    assert(i);
+    assert(!e->dead);
 
-    g_assert(s);
-    g_assert(e);
-    g_assert(i);
-    g_assert(!e->dead);
+    if (!(a = get_announcer(s, e, i)))
+        return 0;
 
-    if (!(a = avahi_get_announcement(s, e, i)))
-        return FALSE;
-    
-    return a->state == AVAHI_ANNOUNCING || a->state == AVAHI_ESTABLISHED;
+    return
+        a->state == AVAHI_ANNOUNCING ||
+        a->state == AVAHI_ESTABLISHED ||
+        (a->state == AVAHI_WAITING && !(e->flags & AVAHI_PUBLISH_UNIQUE));
 }
 
-gboolean avahi_entry_registering(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
-    AvahiAnnouncement *a;
+int avahi_entry_is_probing(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
+    AvahiAnnouncer *a;
 
-    g_assert(s);
-    g_assert(e);
-    g_assert(i);
-    g_assert(!e->dead);
+    assert(s);
+    assert(e);
+    assert(i);
+    assert(!e->dead);
 
-    if (!(a = avahi_get_announcement(s, e, i)))
-        return FALSE;
-    
-    return a->state == AVAHI_PROBING || a->state == AVAHI_WAITING;
+    if (!(a = get_announcer(s, e, i)))
+        return 0;
+
+    return
+        a->state == AVAHI_PROBING ||
+        (a->state == AVAHI_WAITING && (e->flags & AVAHI_PUBLISH_UNIQUE));
+}
+
+void avahi_entry_return_to_initial_state(AvahiServer *s, AvahiEntry *e, AvahiInterface *i) {
+    AvahiAnnouncer *a;
+
+    assert(s);
+    assert(e);
+    assert(i);
+
+    if (!(a = get_announcer(s, e, i)))
+        return;
+
+    if (a->state == AVAHI_PROBING && a->entry->group)
+        a->entry->group->n_probing--;
+
+    go_to_initial_state(a);
 }
 
 static AvahiRecord *make_goodbye_record(AvahiRecord *r) {
-/*     gchar *t; */
     AvahiRecord *g;
-    
-    g_assert(r);
 
-/*     g_message("Preparing goodbye for record [%s]", t = avahi_record_to_string(r)); */
-/*     g_free(t); */
+    assert(r);
 
-    g = avahi_record_copy(r);
-    g_assert(g->ref == 1);
+    if (!(g = avahi_record_copy(r)))
+        return NULL; /* OOM */
+
+    assert(g->ref == 1);
     g->ttl = 0;
 
     return g;
 }
 
-static void send_goodbye_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata) {
+static int is_duplicate_entry(AvahiServer *s, AvahiEntry *e) {
+    AvahiEntry *i;
+
+    assert(s);
+    assert(e);
+
+    for (i = avahi_hashmap_lookup(s->entries_by_key, e->record->key); i; i = i->by_key_next) {
+
+        if ((i == e) || (i->dead))
+            continue;
+
+        if (!avahi_record_equal_no_ttl(i->record, e->record))
+            continue;
+
+        return 1;
+    }
+
+    return 0;
+}
+
+static void send_goodbye_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, void* userdata) {
     AvahiEntry *e = userdata;
     AvahiRecord *g;
-    
-    g_assert(m);
-    g_assert(i);
-    g_assert(e);
-    g_assert(!e->dead);
+
+    assert(m);
+    assert(i);
+    assert(e);
+    assert(!e->dead);
 
     if (!avahi_interface_match(i, e->interface, e->protocol))
         return;
 
-    if (e->flags & AVAHI_ENTRY_NOANNOUNCE)
+    if (e->flags & AVAHI_PUBLISH_NO_ANNOUNCE)
         return;
 
-    if (!avahi_entry_registered(m->server, e, i))
+    if (!avahi_entry_is_registered(m->server, e, i))
         return;
-    
-    g = make_goodbye_record(e->record);
-    avahi_interface_post_response(i, NULL, g, e->flags & AVAHI_ENTRY_UNIQUE, TRUE);
+
+    if (is_duplicate_entry(m->server, e))
+        return;
+
+    if (!(g = make_goodbye_record(e->record)))
+        return; /* OOM */
+
+    avahi_interface_post_response(i, g, e->flags & AVAHI_PUBLISH_UNIQUE, NULL, 1);
     avahi_record_unref(g);
 }
-    
-void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, gboolean goodbye) {
-    g_assert(s);
-    g_assert(i);
-
-/*     g_message("goodbye interface: %s.%u", i->hardware->name, i->protocol); */
-
-    if (goodbye && avahi_interface_relevant(i)) {
-        AvahiEntry *e;
-        
-        for (e = s->entries; e; e = e->entries_next)
-            if (!e->dead)
-                send_goodbye_callback(s->monitor, i, e);
+
+static void reannounce(AvahiAnnouncer *a) {
+    AvahiEntry *e;
+    struct timeval tv;
+
+    assert(a);
+    e = a->entry;
+
+    /* If the group this entry belongs to is not even commited, there's nothing to reannounce */
+    if (e->group && (e->group->state == AVAHI_ENTRY_GROUP_UNCOMMITED || e->group->state == AVAHI_ENTRY_GROUP_COLLISION))
+        return;
+
+    /* Because we might change state we decrease the probing counter first */
+    if (a->state == AVAHI_PROBING && a->entry->group)
+        a->entry->group->n_probing--;
+
+    if (a->state == AVAHI_PROBING ||
+        (a->state == AVAHI_WAITING && (e->flags & AVAHI_PUBLISH_UNIQUE) && !(e->flags & AVAHI_PUBLISH_NO_PROBE)))
+
+        /* We were probing or waiting after probe, so we restart probing from the beginning here */
+
+        a->state = AVAHI_PROBING;
+    else if (a->state == AVAHI_WAITING)
+
+        /* We were waiting, but were not probing before, so we continue waiting  */
+        a->state = AVAHI_WAITING;
+
+    else if (e->flags & AVAHI_PUBLISH_NO_ANNOUNCE)
+
+        /* No announcer needed */
+        a->state = AVAHI_ESTABLISHED;
+
+    else {
+
+        /* Ok, let's restart announcing */
+        a->state = AVAHI_ANNOUNCING;
     }
 
-    while (i->announcements)
-        remove_announcement(s, i->announcements);
+    /* Now let's increase the probing counter again */
+    if (a->state == AVAHI_PROBING && e->group)
+        e->group->n_probing++;
 
-/*     g_message("goodbye interface done: %s.%u", i->hardware->name, i->protocol); */
+    a->n_iteration = 1;
+    a->sec_delay = 1;
 
+    if (a->state == AVAHI_PROBING)
+        set_timeout(a, avahi_elapse_time(&tv, 0, AVAHI_PROBE_JITTER_MSEC));
+    else if (a->state == AVAHI_ANNOUNCING)
+        set_timeout(a, avahi_elapse_time(&tv, 0, AVAHI_ANNOUNCEMENT_JITTER_MSEC));
+    else
+        set_timeout(a, NULL);
 }
 
-void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, gboolean goodbye) {
-    g_assert(s);
-    g_assert(e);
-    
-/*     g_message("goodbye entry: %p", e); */
-    
-    if (goodbye && !e->dead)
-        avahi_interface_monitor_walk(s->monitor, 0, AF_UNSPEC, send_goodbye_callback, e);
 
-    while (e->announcements)
-        remove_announcement(s, e->announcements);
+static void reannounce_walk_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, void* userdata) {
+    AvahiEntry *e = userdata;
+    AvahiAnnouncer *a;
+
+    assert(m);
+    assert(i);
+    assert(e);
+    assert(!e->dead);
 
-/*     g_message("goodbye entry done: %p", e); */
+    if (!(a = get_announcer(m->server, e, i)))
+        return;
 
+    reannounce(a);
 }
 
-void avahi_goodbye_all(AvahiServer *s, gboolean goodbye) {
-    AvahiEntry *e;
-    
-    g_assert(s);
+void avahi_reannounce_entry(AvahiServer *s, AvahiEntry *e) {
 
-/*     g_message("goodbye all"); */
+    assert(s);
+    assert(e);
+    assert(!e->dead);
 
-    for (e = s->entries; e; e = e->entries_next)
-        if (!e->dead)
-            avahi_goodbye_entry(s, e, goodbye);
+    avahi_interface_monitor_walk(s->monitor, e->interface, e->protocol, reannounce_walk_callback, e);
+}
+
+void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, int send_goodbye, int remove) {
+    assert(s);
+    assert(i);
 
-/*     g_message("goodbye all done"); */
+    if (send_goodbye)
+        if (i->announcing) {
+            AvahiEntry *e;
+
+            for (e = s->entries; e; e = e->entries_next)
+                if (!e->dead)
+                    send_goodbye_callback(s->monitor, i, e);
+        }
+
+    if (remove)
+        while (i->announcers)
+            remove_announcer(s, i->announcers);
+}
+
+void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, int send_goodbye, int remove) {
+    assert(s);
+    assert(e);
+
+    if (send_goodbye)
+        if (!e->dead)
+            avahi_interface_monitor_walk(s->monitor, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, send_goodbye_callback, e);
 
+    if (remove)
+        while (e->announcers)
+            remove_announcer(s, e->announcers);
 }