* Improve error message when /etc/avahi/services is not available

[catta] / avahi-core / core.h

diff --git a/avahi-core/core.h b/avahi-core/core.h
index 961399e42c4c390a9ec48d247e543a1c834bb976..0565d23e49ff70215ab0fe9abf4c3599318649c3 100644 (file)
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -34,8 +34,9 @@ typedef struct AvahiEntry AvahiEntry;
 /** A group of locally registered DNS RRs */
 typedef struct AvahiEntryGroup AvahiEntryGroup;
 
-#include <avahi-core/address.h>
-#include <avahi-core/rr.h>
+#include <avahi-common/address.h>
+#include <avahi-common/rr.h>
+#include <avahi-common/alternative.h>
 
 /** States of a server object */
 typedef enum {
@@ -51,7 +52,8 @@ typedef enum {
     AVAHI_ENTRY_NULL = 0,          /**< No special flags */
     AVAHI_ENTRY_UNIQUE = 1,        /**< The RRset is intended to be unique */
     AVAHI_ENTRY_NOPROBE = 2,       /**< Though the RRset is intended to be unique no probes shall be sent */
-    AVAHI_ENTRY_NOANNOUNCE = 4     /**< Do not announce this RR to other hosts */
+    AVAHI_ENTRY_NOANNOUNCE = 4,    /**< Do not announce this RR to other hosts */
+    AVAHI_ENTRY_ALLOWMUTIPLE = 8   /**< Allow multiple local records of this type, even if they are intended to be unique */
 } AvahiEntryFlags;
 
 /** States of an entry group object */
@@ -74,14 +76,14 @@ typedef struct AvahiServerConfig {
     gchar *domain_name;                    /**< Default domain name. If left empty defaults to .local */
     gboolean use_ipv4;                     /**< Enable IPv4 support */
     gboolean use_ipv6;                     /**< Enable IPv6 support */
-    gboolean register_hinfo;               /**< Register a HINFO record for the host containing the local OS and CPU type */
-    gboolean register_addresses;           /**< Register A, AAAA and PTR records for all local IP addresses */
-    gboolean register_workstation;         /**< Register a _workstation._tcp service */
+    gboolean publish_hinfo;                /**< Register a HINFO record for the host containing the local OS and CPU type */
+    gboolean publish_addresses;            /**< Register A, AAAA and PTR records for all local IP addresses */
+    gboolean publish_workstation;          /**< Register a _workstation._tcp service */
+    gboolean publish_domain;               /**< Announce the local domain for browsing */
     gboolean check_response_ttl;           /**< If enabled the server ignores all incoming responses with IP TTL != 255 */
-    gboolean announce_domain;              /**< Announce the local domain for browsing */
-    gboolean use_iff_running;              /**< Require IFF_RUNNING on local network interfaces. This is the official way to check for link beat. Unfortunately this doesn't work with all drivers. So bettere leave this off. */
+    gboolean use_iff_running;        /**< Require IFF_RUNNING on local network interfaces. This is the official way to check for link beat. Unfortunately this doesn't work with all drivers. So bettere leave this off. */
     gboolean enable_reflector;             /**< Reflect incoming mDNS traffic to all local networks. This allows mDNS based network browsing beyond ethernet borders */
-    gboolean ipv_reflect;                  /**< if enable_reflector is TRUE, enable/disable reflecting between IPv4 and IPv6 */
+    gboolean reflect_ipv;                  /**< if enable_reflector is TRUE, enable/disable reflecting between IPv4 and IPv6 */
 } AvahiServerConfig;
 
 /** Allocate a new mDNS responder object. */