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

[catta] / avahi-core / server.c

diff --git a/avahi-core/server.c b/avahi-core/server.c
index 1630b29098b85ca4a1cfd91c86cef69afc294dcb..a020f6432f0fdfa8b866038588d6d7ca899689a6 100644 (file)
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -484,7 +484,7 @@ static void reflect_response(AvahiServer *s, AvahiInterface *i, AvahiRecord *r,
         return;
 
     for (j = s->monitor->interfaces; j; j = j->interface_next)
-        if (j != i && (s->config.ipv_reflect || j->protocol == i->protocol))
+        if (j != i && (s->config.reflect_ipv || j->protocol == i->protocol))
             avahi_interface_post_response(j, r, flush_cache, NULL, TRUE);
 }
 
@@ -511,7 +511,7 @@ static void reflect_query(AvahiServer *s, AvahiInterface *i, AvahiKey *k) {
         return;
 
     for (j = s->monitor->interfaces; j; j = j->interface_next)
-        if (j != i && (s->config.ipv_reflect || j->protocol == i->protocol)) {
+        if (j != i && (s->config.reflect_ipv || j->protocol == i->protocol)) {
             /* Post the query to other networks */
             avahi_interface_post_query(j, k, TRUE);
 
@@ -533,7 +533,7 @@ static void reflect_probe(AvahiServer *s, AvahiInterface *i, AvahiRecord *r) {
         return;
 
     for (j = s->monitor->interfaces; j; j = j->interface_next)
-        if (j != i && (s->config.ipv_reflect || j->protocol == i->protocol))
+        if (j != i && (s->config.reflect_ipv || j->protocol == i->protocol))
             avahi_interface_post_probe(j, r, TRUE);
 }
 
@@ -561,7 +561,13 @@ static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterfac
 
         if (!legacy_unicast)
             reflect_query(s, i, key);
-        avahi_query_scheduler_incoming(i->query_scheduler, key);
+
+        if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 &&
+            !(avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & AVAHI_DNS_FLAG_TC))
+            /* Allow our own queries to be suppressed by incoming
+             * queries only when they do not include known answers */
+            avahi_query_scheduler_incoming(i->query_scheduler, key);
+        
         avahi_server_prepare_matching_responses(s, i, key, unicast_response);
         avahi_key_unref(key);
     }
@@ -775,7 +781,7 @@ static void reflect_legacy_unicast_query_packet(AvahiServer *s, AvahiDnsPacket *
     for (j = s->monitor->interfaces; j; j = j->interface_next)
         if (avahi_interface_relevant(j) &&
             j != i &&
-            (s->config.ipv_reflect || j->protocol == i->protocol)) {
+            (s->config.reflect_ipv || j->protocol == i->protocol)) {
 
             if (j->protocol == AF_INET && s->fd_legacy_unicast_ipv4 >= 0) {
                 avahi_send_dns_packet_ipv4(s->fd_legacy_unicast_ipv4, j->hardware->index, p, NULL, 0);
@@ -1105,7 +1111,7 @@ static void register_hinfo(AvahiServer *s) {
     
     g_assert(s);
     
-    if (!s->config.register_hinfo || s->hinfo_entry_group)
+    if (!s->config.publish_hinfo || s->hinfo_entry_group)
         return;
     
     s->hinfo_entry_group = avahi_entry_group_new(s, avahi_host_rr_entry_group_callback, NULL);
@@ -1136,7 +1142,7 @@ static void register_localhost(AvahiServer *s) {
 static void register_browse_domain(AvahiServer *s) {
     g_assert(s);
 
-    if (!s->config.announce_domain || s->browse_domain_entry_group)
+    if (!s->config.publish_domain || s->browse_domain_entry_group)
         return;
 
     s->browse_domain_entry_group = avahi_entry_group_new(s, NULL, NULL);
@@ -1268,17 +1274,14 @@ AvahiServer *avahi_server_new(GMainContext *c, const AvahiServerConfig *sc, Avah
     }
 
     if (s->fd_ipv4 < 0 && s->config.use_ipv4)
-        avahi_log_debug("Failed to create IPv4 socket, proceeding in IPv6 only mode");
+        avahi_log_notice("Failed to create IPv4 socket, proceeding in IPv6 only mode");
     else if (s->fd_ipv6 < 0 && s->config.use_ipv6)
-        avahi_log_debug("Failed to create IPv6 socket, proceeding in IPv4 only mode");
+        avahi_log_notice("Failed to create IPv6 socket, proceeding in IPv4 only mode");
 
     s->fd_legacy_unicast_ipv4 = s->fd_ipv4 >= 0 && s->config.enable_reflector ? avahi_open_legacy_unicast_socket_ipv4() : -1;
     s->fd_legacy_unicast_ipv6 = s->fd_ipv6 >= 0 && s->config.enable_reflector ? avahi_open_legacy_unicast_socket_ipv6() : -1;
 
-    if (c)
-        g_main_context_ref(s->context = c);
-    else
-        s->context = g_main_context_default();
+    g_main_context_ref(s->context = (c ? c : g_main_context_default()));
 
     /* Prepare IO source registration */
     s->source = g_source_new(&source_funcs, sizeof(GSource) + sizeof(AvahiServer*));
@@ -1399,6 +1402,36 @@ void avahi_server_free(AvahiServer* s) {
     g_free(s);
 }
 
+static gint check_record_conflict(AvahiServer *s, gint interface, guchar protocol, AvahiRecord *r, AvahiEntryFlags flags) {
+    AvahiEntry *e;
+    
+    g_assert(s);
+    g_assert(r);
+
+    for (e = g_hash_table_lookup(s->entries_by_key, r->key); e; e = e->by_key_next) {
+        if (e->dead)
+            continue;
+
+        if (!(flags & AVAHI_ENTRY_UNIQUE) && !(e->flags & AVAHI_ENTRY_UNIQUE))
+            continue;
+        
+        if ((flags & AVAHI_ENTRY_ALLOWMUTIPLE) && (e->flags & AVAHI_ENTRY_ALLOWMUTIPLE) )
+            continue;
+
+        if (interface <= 0 ||
+            e->interface <= 0 ||
+            e->interface == interface ||
+            protocol == AF_UNSPEC ||
+            e->protocol == AF_UNSPEC ||
+            e->protocol == protocol)
+
+            return -1;
+
+    }
+
+    return 0;
+}
+
 gint avahi_server_add(
     AvahiServer *s,
     AvahiEntryGroup *g,
@@ -1413,6 +1446,9 @@ gint avahi_server_add(
 
     g_assert(r->key->type != AVAHI_DNS_TYPE_ANY);
 
+    if (check_record_conflict(s, interface, protocol, r, flags) < 0)
+        return -1;
+
     e = g_new(AvahiEntry, 1);
     e->server = s;
     e->record = avahi_record_ref(r);
@@ -1488,14 +1524,15 @@ gint avahi_server_add_ptr(
     const gchar *dest) {
 
     AvahiRecord *r;
+    gint ret;
 
     g_assert(dest);
 
     r = avahi_record_new_full(name ? name : s->host_name_fqdn, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
     r->data.ptr.name = avahi_normalize_name(dest);
-    avahi_server_add(s, g, interface, protocol, flags, r);
+    ret = avahi_server_add(s, g, interface, protocol, flags, r);
     avahi_record_unref(r);
-    return 0;
+    return ret;
 }
 
 gint avahi_server_add_address(
@@ -1508,6 +1545,7 @@ gint avahi_server_add_address(
     AvahiAddress *a) {
 
     gchar *n = NULL;
+    gint ret = 0;
     g_assert(s);
     g_assert(a);
 
@@ -1519,11 +1557,11 @@ gint avahi_server_add_address(
 
         r = avahi_record_new_full(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
         r->data.a.address = a->data.ipv4;
-        avahi_server_add(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, r);
+        ret = avahi_server_add(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE | AVAHI_ENTRY_ALLOWMUTIPLE, r);
         avahi_record_unref(r);
         
         reverse = avahi_reverse_lookup_name_ipv4(&a->data.ipv4);
-        avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, reverse, name);
+        ret |= avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, reverse, name);
         g_free(reverse);
         
     } else {
@@ -1532,21 +1570,21 @@ gint avahi_server_add_address(
             
         r = avahi_record_new_full(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
         r->data.aaaa.address = a->data.ipv6;
-        avahi_server_add(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, r);
+        ret = avahi_server_add(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE | AVAHI_ENTRY_ALLOWMUTIPLE, r);
         avahi_record_unref(r);
 
         reverse = avahi_reverse_lookup_name_ipv6_arpa(&a->data.ipv6);
-        avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, reverse, name);
+        ret |= avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, reverse, name);
         g_free(reverse);
     
         reverse = avahi_reverse_lookup_name_ipv6_int(&a->data.ipv6);
-        avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, reverse, name);
+        ret |= avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, reverse, name);
         g_free(reverse);
     }
     
     g_free(n);
 
-    return 0;
+    return ret;
 }
 
 gint avahi_server_add_text_strlst(
@@ -1559,15 +1597,16 @@ gint avahi_server_add_text_strlst(
     AvahiStringList *strlst) {
 
     AvahiRecord *r;
+    gint ret;
     
     g_assert(s);
     
     r = avahi_record_new_full(name ? name : s->host_name_fqdn, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT);
     r->data.txt.string_list = strlst;
-    avahi_server_add(s, g, interface, protocol, flags, r);
+    ret = avahi_server_add(s, g, interface, protocol, flags, r);
     avahi_record_unref(r);
 
-    return 0;
+    return ret;
 }
 
 gint avahi_server_add_text_va(
@@ -1581,8 +1620,7 @@ gint avahi_server_add_text_va(
     
     g_assert(s);
 
-    avahi_server_add_text_strlst(s, g, interface, protocol, flags, name, avahi_string_list_new_va(va));
-    return 0;
+    return avahi_server_add_text_strlst(s, g, interface, protocol, flags, name, avahi_string_list_new_va(va));
 }
 
 gint avahi_server_add_text(
@@ -1595,14 +1633,15 @@ gint avahi_server_add_text(
     ...) {
 
     va_list va;
+    gint ret;
     
     g_assert(s);
 
     va_start(va, name);
-    avahi_server_add_text_va(s, g, interface, protocol, flags, name, va);
+    ret = avahi_server_add_text_va(s, g, interface, protocol, flags, name, va);
     va_end(va);
 
-    return 0;
+    return ret;
 }
 
 static void escape_service_name(gchar *d, guint size, const gchar *s) {
@@ -1641,6 +1680,7 @@ gint avahi_server_add_service_strlst(
 
     gchar ptr_name[256], svc_name[256], ename[64], enum_ptr[256];
     AvahiRecord *r;
+    gint ret = 0;
     
     g_assert(s);
     g_assert(type);
@@ -1660,22 +1700,22 @@ gint avahi_server_add_service_strlst(
     snprintf(ptr_name, sizeof(ptr_name), "%s.%s", type, domain);
     snprintf(svc_name, sizeof(svc_name), "%s.%s.%s", ename, type, domain);
     
-    avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, ptr_name, svc_name);
+    ret = avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, ptr_name, svc_name);
 
     r = avahi_record_new_full(svc_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV);
     r->data.srv.priority = 0;
     r->data.srv.weight = 0;
     r->data.srv.port = port;
     r->data.srv.name = avahi_normalize_name(host);
-    avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, r);
+    ret |= avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, r);
     avahi_record_unref(r);
 
-    avahi_server_add_text_strlst(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, svc_name, strlst);
+    ret |= avahi_server_add_text_strlst(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, svc_name, strlst);
 
     snprintf(enum_ptr, sizeof(enum_ptr), "_services._dns-sd._udp.%s", domain);
-    avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, enum_ptr, ptr_name);
+    ret |=avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, enum_ptr, ptr_name);
 
-    return 0;
+    return ret;
 }
 
 gint avahi_server_add_service_va(
@@ -1694,8 +1734,7 @@ gint avahi_server_add_service_va(
     g_assert(type);
     g_assert(name);
 
-    avahi_server_add_service_strlst(s, g, interface, protocol, type, name, domain, host, port, avahi_string_list_new_va(va));
-    return 0;
+    return avahi_server_add_service_strlst(s, g, interface, protocol, type, name, domain, host, port, avahi_string_list_new_va(va));
 }
 
 gint avahi_server_add_service(
@@ -1711,15 +1750,16 @@ gint avahi_server_add_service(
     ... ){
 
     va_list va;
+    gint ret;
     
     g_assert(s);
     g_assert(type);
     g_assert(name);
 
     va_start(va, port);
-    avahi_server_add_service_va(s, g, interface, protocol, type, name, domain, host, port, va);
+    ret = avahi_server_add_service_va(s, g, interface, protocol, type, name, domain, host, port, va);
     va_end(va);
-    return 0;
+    return ret;
 }
 
 static void post_query_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata) {
@@ -1870,18 +1910,18 @@ AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) {
     g_assert(c);
 
     memset(c, 0, sizeof(AvahiServerConfig));
-    c->register_hinfo = TRUE;
-    c->register_addresses = TRUE;
     c->use_ipv6 = TRUE;
     c->use_ipv4 = TRUE;
     c->host_name = NULL;
     c->domain_name = NULL;
     c->check_response_ttl = TRUE;
-    c->announce_domain = TRUE;
+    c->publish_hinfo = TRUE;
+    c->publish_addresses = TRUE;
+    c->publish_workstation = TRUE;
+    c->publish_domain = TRUE;
     c->use_iff_running = FALSE;
     c->enable_reflector = FALSE;
-    c->ipv_reflect = FALSE;
-    c->register_workstation = TRUE;
+    c->reflect_ipv = FALSE;
     
     return c;
 }