* Rework some Browsing/Resolving stuff

[catta] / avahi-core / server.h

diff --git a/avahi-core/server.h b/avahi-core/server.h
index 4d0e8a3877e7d52c479358b6949d44d3ded15e3f..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,20 +75,33 @@ 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;
     
-    gchar *host_name, *host_name_fqdn, *domain;
+    gchar *host_name, *host_name_fqdn, *domain_name;
 
     gint fd_ipv4, fd_ipv6;
 
     GPollFD pollfd_ipv4, pollfd_ipv6;
     GSource *source;
 
+    AvahiServerState state;
+    AvahiServerCallback callback;
+    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;
 };
@@ -107,4 +120,9 @@ gboolean avahi_entry_commited(AvahiEntry *e);
 
 void avahi_server_enumerate_aux_records(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, void (*callback)(AvahiServer *s, AvahiRecord *r, gboolean flush_cache, gpointer userdata), gpointer userdata);
 
+void avahi_host_rr_entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata);
+
+void avahi_server_decrease_host_rr_pending(AvahiServer *s);
+void avahi_server_increase_host_rr_pending(AvahiServer *s);
+
 #endif