* Rework some Browsing/Resolving stuff

[catta] / avahi-core / server.h

diff --git a/avahi-core/server.h b/avahi-core/server.h
index fddf17e00f88d105345852d7e637fe464b1686af..93ae1f07acf4e2f8a4d459ae39e7d002e1b24e17 100644 (file)
--- a/avahi-core/server.h
+++ b/avahi-core/server.h
@@ -28,7 +28,7 @@
 #include "llist.h"
 #include "timeeventq.h"
 #include "announce.h"
-#include "subscribe.h"
+#include "resolve.h"
 #include "dns.h"
 #include "rrlist.h"
 
@@ -75,10 +75,13 @@ struct AvahiServer {
 
     AVAHI_LLIST_HEAD(AvahiEntryGroup, groups);
     
-    AVAHI_LLIST_HEAD(AvahiSubscription, subscriptions);
-    GHashTable *subscription_hashtable;
+    AVAHI_LLIST_HEAD(AvahiRecordBrowser, record_browsers);
+    GHashTable *record_browser_hashtable;
+    AVAHI_LLIST_HEAD(AvahiHostNameResolver, host_name_resolvers);
+    AVAHI_LLIST_HEAD(AvahiAddressResolver, address_resolvers);
+    AVAHI_LLIST_HEAD(AvahiDomainBrowser, domain_browsers);
 
-    gboolean need_entry_cleanup, need_group_cleanup;
+    gboolean need_entry_cleanup, need_group_cleanup, need_browser_cleanup;
     
     AvahiTimeEventQueue *time_event_queue;
     
@@ -94,7 +97,10 @@ struct AvahiServer {
     gpointer userdata;
 
     AvahiEntryGroup *hinfo_entry_group;
+    AvahiEntryGroup *browse_domain_entry_group;
     guint n_host_rr_pending;
+
+    AvahiTimeEvent *register_time_event;
     
     /* Used for assembling responses */
     AvahiRecordList *record_list;