X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Finternal.h;h=b826175e04125d0361862019a56a74322e0a1d8d;hb=77e36045b7f13654e5dad8b80b3224dd06daede0;hp=e1f46621817c565c759b444e1bb1b1ba235e88d2;hpb=98b772ffc6e06ca0e19c2d31326c281a77646367;p=catta

diff --git a/avahi-client/internal.h b/avahi-client/internal.h
index e1f4662..b826175 100644
--- a/avahi-client/internal.h
+++ b/avahi-client/internal.h
@@ -22,53 +22,100 @@
   USA.
 ***/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <dbus/dbus.h>
+#include "client.h"
 
-struct _AvahiClient
-{
+struct AvahiClient {
+    const AvahiPoll *poll_api;
     DBusConnection *bus;
-    int errno;
+    int error;
+    AvahiClientState state;
+
+    /* Cache for some seldom changing server data */
+    char *version_string, *host_name, *host_name_fqdn, *domain_name;
+    
     AvahiClientCallback callback;
-    void *user_data;
+    void *userdata;
+    
     AVAHI_LLIST_HEAD(AvahiEntryGroup, groups);
     AVAHI_LLIST_HEAD(AvahiDomainBrowser, domain_browsers);
+    AVAHI_LLIST_HEAD(AvahiServiceBrowser, service_browsers);
     AVAHI_LLIST_HEAD(AvahiServiceTypeBrowser, service_type_browsers);
+    AVAHI_LLIST_HEAD(AvahiServiceResolver, service_resolvers);
+    AVAHI_LLIST_HEAD(AvahiHostNameResolver, host_name_resolvers);
+    AVAHI_LLIST_HEAD(AvahiAddressResolver, address_resolvers);
 };
 
-struct _AvahiEntryGroup {
+struct AvahiEntryGroup {
     char *path;
+    AvahiEntryGroupState state;
     AvahiClient *client;
     AvahiEntryGroupCallback callback;
-    void *user_data;
+    void *userdata;
     AVAHI_LLIST_FIELDS(AvahiEntryGroup, groups);
 };
 
-struct _AvahiDomainBrowser {
+struct AvahiDomainBrowser {
     char *path;
     AvahiClient *client;
     AvahiDomainBrowserCallback callback;
-    void *user_data;
+    void *userdata;
     AVAHI_LLIST_FIELDS(AvahiDomainBrowser, domain_browsers);
 };
 
-struct _AvahiServiceTypeBrowser {
+struct AvahiServiceBrowser {
+    char *path;
+    AvahiClient *client;
+    AvahiServiceBrowserCallback callback;
+    void *userdata;
+    AVAHI_LLIST_FIELDS(AvahiServiceBrowser, service_browsers);
+};
+
+struct AvahiServiceTypeBrowser {
     char *path;
     AvahiClient *client;
     AvahiServiceTypeBrowserCallback callback;
-    void *user_data;
+    void *userdata;
     AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, service_type_browsers);
 };
 
-int avahi_client_set_errno (AvahiClient *client, int errno);
+struct AvahiServiceResolver {
+    char *path;
+    AvahiClient *client;
+    AvahiServiceResolverCallback callback;
+    void *userdata;
+    AVAHI_LLIST_FIELDS(AvahiServiceResolver, service_resolvers);
+};
+
+struct AvahiHostNameResolver {
+    char *path;
+    AvahiClient *client;
+    AvahiHostNameResolverCallback callback;
+    void *userdata;
+    AVAHI_LLIST_FIELDS(AvahiHostNameResolver, host_name_resolvers);
+};
 
-void avahi_entry_group_state_change (AvahiEntryGroup *group, int state);
+struct AvahiAddressResolver {
+    char *path;
+    AvahiClient *client;
+    AvahiAddressResolverCallback callback;
+    void *userdata;
+    AVAHI_LLIST_FIELDS(AvahiAddressResolver, address_resolvers);
+};
 
-DBusHandlerResult avahi_domain_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message);
+int avahi_client_set_errno (AvahiClient *client, int error);
+int avahi_client_set_dbus_error(AvahiClient *client, DBusError *error);
+
+void avahi_entry_group_set_state(AvahiEntryGroup *group, AvahiEntryGroupState state);
 
+DBusHandlerResult avahi_domain_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message);
 DBusHandlerResult avahi_service_type_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message);
+DBusHandlerResult avahi_service_browser_event (AvahiClient *client, AvahiBrowserEvent event, DBusMessage *message);
+
+DBusHandlerResult avahi_service_resolver_event (AvahiClient *client, AvahiResolverEvent event, DBusMessage *message);
+DBusHandlerResult avahi_host_name_resolver_event (AvahiClient *client, AvahiResolverEvent event, DBusMessage *message);
+DBusHandlerResult avahi_address_resolver_event (AvahiClient *client, AvahiResolverEvent event, DBusMessage *message);
+
+int avahi_client_simple_method_call(AvahiClient *client, const char *path, const char *interface, const char *method);
 
 #endif