X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fannounce.h;h=3a8bcf351cbc3421009b733c4a168fff15ee5f82;hb=78a76e3d5f1d9cc81fd901b8e0263483a7c707d0;hp=21dd148f6a3fd35d49e2beed6f3a73ae338929b3;hpb=41f2725b37437a585ce285051bdae06f4919dc3b;p=catta

diff --git a/avahi-core/announce.h b/avahi-core/announce.h
index 21dd148..3a8bcf3 100644
--- a/avahi-core/announce.h
+++ b/avahi-core/announce.h
@@ -22,34 +22,34 @@
   USA.
 ***/
 
-typedef struct AvahiAnnouncement AvahiAnnouncement;
+typedef struct AvahiAnnouncer AvahiAnnouncer;
 
 #include <avahi-common/llist.h>
 #include "iface.h"
-#include "server.h"
+#include "internal.h"
 #include "timeeventq.h"
 #include "publish.h"
 
 typedef enum {
-    AVAHI_PROBING,
+    AVAHI_PROBING,         /* probing phase */
     AVAHI_WAITING,         /* wait for other records in group */
-    AVAHI_ANNOUNCING,
-    AVAHI_ESTABLISHED
-} AvahiAnnouncementState;
+    AVAHI_ANNOUNCING,      /* announcing phase */
+    AVAHI_ESTABLISHED      /* we'e established */
+} AvahiAnnouncerState;
 
-struct AvahiAnnouncement {
+struct AvahiAnnouncer {
     AvahiServer *server;
     AvahiInterface *interface;
     AvahiEntry *entry;
 
     AvahiTimeEvent *time_event;
 
-    AvahiAnnouncementState state;
+    AvahiAnnouncerState state;
     unsigned n_iteration;
     unsigned sec_delay;
 
-    AVAHI_LLIST_FIELDS(AvahiAnnouncement, by_interface);
-    AVAHI_LLIST_FIELDS(AvahiAnnouncement, by_entry);
+    AVAHI_LLIST_FIELDS(AvahiAnnouncer, by_interface);
+    AVAHI_LLIST_FIELDS(AvahiAnnouncer, by_entry);
 };
 
 void avahi_announce_interface(AvahiServer *s, AvahiInterface *i);
@@ -65,9 +65,6 @@ int avahi_entry_is_probing(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
 
 void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, int send_goodbye, int rem);
 void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, int send_goodbye, int rem);
-void avahi_goodbye_all(AvahiServer *s, int send_goodbye, int rem);
-
-AvahiAnnouncement *avahi_get_announcement(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
 
 void avahi_reannounce_entry(AvahiServer *s, AvahiEntry *e);