X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Flookup.h;h=06dec6ee238e0f666cd404422f181d2d674a257a;hb=8b025aebc8b1286c2b9e0220e95339b5264e5bca;hp=518a4c9e403639efce4979d0c461dd2b31e40c60;hpb=1ffedb586bd2fb6daa3970304fac7c5b415cd38f;p=catta

diff --git a/avahi-core/lookup.h b/avahi-core/lookup.h
index 518a4c9..06dec6e 100644
--- a/avahi-core/lookup.h
+++ b/avahi-core/lookup.h
@@ -1,39 +1,30 @@
 #ifndef foolookuphfoo
 #define foolookuphfoo
 
-/* $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.
 ***/
 
-/** \file lookup.h Functions for browsing/resolving services and other RRs */
+/** \file avahi-core/lookup.h Functions for browsing/resolving services and other RRs */
 
 /** \example core-browse-services.c Example how to browse for DNS-SD
  * services using an embedded mDNS stack. */
 
-#include <avahi-common/cdecl.h>
-#include <avahi-common/defs.h>
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-AVAHI_C_DECL_BEGIN
-#endif
-
 /** A browsing object for arbitrary RRs */
 typedef struct AvahiSRecordBrowser AvahiSRecordBrowser;
 
@@ -55,22 +46,11 @@ typedef struct AvahiSServiceBrowser AvahiSServiceBrowser;
 /** A DNS-SD service resolver.  Use this to retrieve addres, port and TXT data for a DNS-SD service */
 typedef struct AvahiSServiceResolver AvahiSServiceResolver;
 
-/** A domain service browser object. Use this to browse for
- * conventional unicast DNS servers which may be used to resolve
- * conventional domain names */
-typedef struct AvahiSDNSServerBrowser AvahiSDNSServerBrowser;
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-AVAHI_C_DECL_END
-#endif
-
-#include "core.h"
-#include "publish.h"
+#include <avahi-common/cdecl.h>
+#include <avahi-common/defs.h>
+#include <avahi-core/core.h>
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
-#endif
-
 
 /** Callback prototype for AvahiSRecordBrowser events */
 typedef void (*AvahiSRecordBrowserCallback)(
@@ -98,7 +78,7 @@ void avahi_s_record_browser_free(AvahiSRecordBrowser *b);
 /** Callback prototype for AvahiSHostNameResolver events */
 typedef void (*AvahiSHostNameResolverCallback)(
     AvahiSHostNameResolver *r,
-    AvahiIfIndex interface,  
+    AvahiIfIndex interface,
     AvahiProtocol protocol,
     AvahiResolverEvent event, /**< Resolving event */
     const char *host_name,   /**< Host name which should be resolved. May differ in case from the query */
@@ -126,7 +106,7 @@ typedef void (*AvahiSAddressResolverCallback)(
     AvahiIfIndex interface,
     AvahiProtocol protocol,
     AvahiResolverEvent event,
-    const AvahiAddress *a,   
+    const AvahiAddress *a,
     const char *host_name,   /**< A host name for the specified address, if one was found, i.e. event == AVAHI_RESOLVER_FOUND */
     AvahiLookupResultFlags flags,  /**< Lookup flags */
     void* userdata);
@@ -250,35 +230,6 @@ AvahiSServiceResolver *avahi_s_service_resolver_new(
 /** Free an AvahiSServiceResolver object */
 void avahi_s_service_resolver_free(AvahiSServiceResolver *r);
 
-/** Callback prototype for AvahiSDNSServerBrowser events */
-typedef void (*AvahiSDNSServerBrowserCallback)(
-    AvahiSDNSServerBrowser *b,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiBrowserEvent event,
-    const char *host_name,       /**< Host name of the DNS server, probably useless */
-    const AvahiAddress *a,        /**< Address of the DNS server */
-    uint16_t port,                 /**< Port number of the DNS servers, probably 53 */
-    AvahiLookupResultFlags flags,  /**< Lookup flags */
-    void* userdata);
-
-/** Create a new AvahiSDNSServerBrowser object */
-AvahiSDNSServerBrowser *avahi_s_dns_server_browser_new(
-    AvahiServer *server,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    const char *domain,
-    AvahiDNSServerType type,
-    AvahiProtocol aprotocol,  /**< Address protocol for the DNS server */ 
-    AvahiLookupFlags flags,                 /**< Lookup flags. */
-    AvahiSDNSServerBrowserCallback callback,
-    void* userdata);
-
-/** Free an AvahiSDNSServerBrowser object */
-void avahi_s_dns_server_browser_free(AvahiSDNSServerBrowser *b);
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_END
-#endif
 
 #endif