forgot to pull the publish_no_reverse change to the example.

[catta] / avahi-core / announce.h

diff --git a/avahi-core/announce.h b/avahi-core/announce.h
index 9c01d2641a0f5191febcc9000df15c3a7b73e549..fd23d8be2906eeacb83d730b3fbfa6c01ac0419c 100644 (file)
--- a/avahi-core/announce.h
+++ b/avahi-core/announce.h
@@ -1,54 +1,53 @@
 #ifndef fooannouncehfoo
 #define fooannouncehfoo
 
-/* $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
   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);
@@ -62,11 +61,9 @@ void avahi_s_entry_group_check_probed(AvahiSEntryGroup *g, int immediately);
 int avahi_entry_is_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
 int avahi_entry_is_probing(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
 
-void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, int send_goodbye);
-void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, int send_goodbye);
-
-void avahi_goodbye_all(AvahiServer *s, int send_goodbye);
+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);
 
-AvahiAnnouncement *avahi_get_announcement(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
+void avahi_reannounce_entry(AvahiServer *s, AvahiEntry *e);
 
 #endif