* remove AVAHI_PUBLISH_IS_PROXY, it was a bad idea

* drop avahi_service_is_service_local(), avahi_client_is_service_local()
* add new lookup result flags AVAHI_LOOKUP_RESULT_OUR_OWN and AVAHI_LOOKUP_RESULT_LOCAL
* remove avahi_address_resolver_new() and replace it by avahi_address_resolver_new_a()
* avahi-client: save query data in browse/resolve objects so that we can return it on failure
* other cleanups


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@811 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

1 files changed, 23 insertions, 0 deletions

diff --git a/avahi-client/internal.h b/avahi-client/internal.h
index 56aaaae..c9c9dc7 100644
--- a/avahi-client/internal.h
+++ b/avahi-client/internal.h
@@ -66,6 +66,9 @@ struct AvahiDomainBrowser {
     AvahiDomainBrowserCallback callback;
     void *userdata;
     AVAHI_LLIST_FIELDS(AvahiDomainBrowser, domain_browsers);
+
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 };
 
 struct AvahiServiceBrowser {
@@ -74,6 +77,10 @@ struct AvahiServiceBrowser {
     AvahiServiceBrowserCallback callback;
     void *userdata;
     AVAHI_LLIST_FIELDS(AvahiServiceBrowser, service_browsers);
+
+    char *type, *domain;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 };
 
 struct AvahiServiceTypeBrowser {
@@ -82,6 +89,10 @@ struct AvahiServiceTypeBrowser {
     AvahiServiceTypeBrowserCallback callback;
     void *userdata;
     AVAHI_LLIST_FIELDS(AvahiServiceTypeBrowser, service_type_browsers);
+
+    char *domain;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 };
 
 struct AvahiServiceResolver {
@@ -90,6 +101,10 @@ struct AvahiServiceResolver {
     AvahiServiceResolverCallback callback;
     void *userdata;
     AVAHI_LLIST_FIELDS(AvahiServiceResolver, service_resolvers);
+
+    char *name, *type, *domain;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 };
 
 struct AvahiHostNameResolver {
@@ -98,6 +113,10 @@ struct AvahiHostNameResolver {
     AvahiHostNameResolverCallback callback;
     void *userdata;
     AVAHI_LLIST_FIELDS(AvahiHostNameResolver, host_name_resolvers);
+
+    char *host_name;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 };
 
 struct AvahiAddressResolver {
@@ -106,6 +125,10 @@ struct AvahiAddressResolver {
     AvahiAddressResolverCallback callback;
     void *userdata;
     AVAHI_LLIST_FIELDS(AvahiAddressResolver, address_resolvers);
+
+    AvahiAddress address;
+    AvahiIfIndex interface;
+    AvahiProtocol protocol;
 };
 
 int avahi_client_set_errno (AvahiClient *client, int error);