X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fserver.c;h=b348269d59dd15544eace1b9c399f86b8fe67e9c;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=4c55edb310ff4349ba1b0d5a35f39fec43517c22;hpb=fa87e585fd3247969939bdca8f068ce1c2ec22c4;p=catta diff --git a/avahi-core/server.c b/avahi-core/server.c index 4c55edb..b348269 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -1,18 +1,16 @@ -/* $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 @@ -23,7 +21,9 @@ #include #endif +#include #include +#include #include #include #include @@ -31,116 +31,55 @@ #include #include #include +#include #include #include #include #include -#include "server.h" +#include "internal.h" #include "iface.h" #include "socket.h" #include "browse.h" #include "log.h" #include "util.h" +#include "dns-srv-rr.h" +#include "addr-util.h" +#include "domain-util.h" +#include "rr-util.h" -#define AVAHI_RR_HOLDOFF_MSEC 1000 -#define AVAHI_RR_HOLDOFF_MSEC_RATE_LIMIT 60000 -#define AVAHI_RR_RATE_LIMIT_COUNT 15 - -static void free_entry(AvahiServer*s, AvahiEntry *e) { - AvahiEntry *t; - - assert(s); - assert(e); - - avahi_goodbye_entry(s, e, 1); - - /* Remove from linked list */ - AVAHI_LLIST_REMOVE(AvahiEntry, entries, s->entries, e); - - /* Remove from hash table indexed by name */ - t = avahi_hashmap_lookup(s->entries_by_key, e->record->key); - AVAHI_LLIST_REMOVE(AvahiEntry, by_key, t, e); - if (t) - avahi_hashmap_replace(s->entries_by_key, t->record->key, t); - else - avahi_hashmap_remove(s->entries_by_key, e->record->key); - - /* Remove from associated group */ - if (e->group) - AVAHI_LLIST_REMOVE(AvahiEntry, by_group, e->group->entries, e); - - avahi_record_unref(e->record); - avahi_free(e); -} - -static void free_group(AvahiServer *s, AvahiSEntryGroup *g) { - assert(s); - assert(g); - - while (g->entries) - free_entry(s, g->entries); - - if (g->register_time_event) - avahi_time_event_free(g->register_time_event); - - AVAHI_LLIST_REMOVE(AvahiSEntryGroup, groups, s->groups, g); - avahi_free(g); -} - -static void cleanup_dead(AvahiServer *s) { - assert(s); - - if (s->need_group_cleanup) { - AvahiSEntryGroup *g, *next; - - for (g = s->groups; g; g = next) { - next = g->groups_next; - - if (g->dead) - free_group(s, g); - } - - s->need_group_cleanup = 0; - } - - if (s->need_entry_cleanup) { - AvahiEntry *e, *next; - - for (e = s->entries; e; e = next) { - next = e->entries_next; - - if (e->dead) - free_entry(s, e); - } - - s->need_entry_cleanup = 0; - } - - if (s->need_browser_cleanup) - avahi_browser_cleanup(s); -} +#define AVAHI_DEFAULT_CACHE_ENTRIES_MAX 4096 static void enum_aux_records(AvahiServer *s, AvahiInterface *i, const char *name, uint16_t type, void (*callback)(AvahiServer *s, AvahiRecord *r, int flush_cache, void* userdata), void* userdata) { - AvahiKey *k; - AvahiEntry *e; - assert(s); assert(i); assert(name); assert(callback); - assert(type != AVAHI_DNS_TYPE_ANY); + if (type == AVAHI_DNS_TYPE_ANY) { + AvahiEntry *e; + + for (e = s->entries; e; e = e->entries_next) + if (!e->dead && + avahi_entry_is_registered(s, e, i) && + e->record->key->clazz == AVAHI_DNS_CLASS_IN && + avahi_domain_equal(name, e->record->key->name)) + callback(s, e->record, e->flags & AVAHI_PUBLISH_UNIQUE, userdata); + + } else { + AvahiEntry *e; + AvahiKey *k; - if (!(k = avahi_key_new(name, AVAHI_DNS_CLASS_IN, type))) - return; /** OOM */ + if (!(k = avahi_key_new(name, AVAHI_DNS_CLASS_IN, type))) + return; /** OOM */ - for (e = avahi_hashmap_lookup(s->entries_by_key, k); e; e = e->by_key_next) - if (!e->dead && avahi_entry_is_registered(s, e, i)) - callback(s, e->record, e->flags & AVAHI_ENTRY_UNIQUE, userdata); + for (e = avahi_hashmap_lookup(s->entries_by_key, k); e; e = e->by_key_next) + if (!e->dead && avahi_entry_is_registered(s, e, i)) + callback(s, e->record, e->flags & AVAHI_PUBLISH_UNIQUE, userdata); - avahi_key_unref(k); + avahi_key_unref(k); + } } void avahi_server_enumerate_aux_records(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, void (*callback)(AvahiServer *s, AvahiRecord *r, int flush_cache, void* userdata), void* userdata) { @@ -148,7 +87,9 @@ void avahi_server_enumerate_aux_records(AvahiServer *s, AvahiInterface *i, Avahi assert(i); assert(r); assert(callback); - + + /* Call the specified callback far all records referenced by the one specified in *r */ + if (r->key->clazz == AVAHI_DNS_CLASS_IN) { if (r->key->type == AVAHI_DNS_TYPE_PTR) { enum_aux_records(s, i, r->data.ptr.name, AVAHI_DNS_TYPE_SRV, callback, userdata); @@ -156,7 +97,8 @@ void avahi_server_enumerate_aux_records(AvahiServer *s, AvahiInterface *i, Avahi } else if (r->key->type == AVAHI_DNS_TYPE_SRV) { enum_aux_records(s, i, r->data.srv.name, AVAHI_DNS_TYPE_A, callback, userdata); enum_aux_records(s, i, r->data.srv.name, AVAHI_DNS_TYPE_AAAA, callback, userdata); - } + } else if (r->key->type == AVAHI_DNS_TYPE_CNAME) + enum_aux_records(s, i, r->data.cname.name, AVAHI_DNS_TYPE_ANY, callback, userdata); } } @@ -165,57 +107,74 @@ void avahi_server_prepare_response(AvahiServer *s, AvahiInterface *i, AvahiEntry assert(i); assert(e); - avahi_record_list_push(s->record_list, e->record, e->flags & AVAHI_ENTRY_UNIQUE, unicast_response, auxiliary); + avahi_record_list_push(s->record_list, e->record, e->flags & AVAHI_PUBLISH_UNIQUE, unicast_response, auxiliary); } void avahi_server_prepare_matching_responses(AvahiServer *s, AvahiInterface *i, AvahiKey *k, int unicast_response) { - AvahiEntry *e; -/* char *txt; */ - assert(s); assert(i); assert(k); -/* avahi_log_debug("Posting responses matching [%s]", txt = avahi_key_to_string(k)); */ -/* avahi_free(txt); */ + /* Push all records that match the specified key to the record list */ if (avahi_key_is_pattern(k)) { + AvahiEntry *e; /* Handle ANY query */ - + for (e = s->entries; e; e = e->entries_next) if (!e->dead && avahi_key_pattern_match(k, e->record->key) && avahi_entry_is_registered(s, e, i)) avahi_server_prepare_response(s, i, e, unicast_response, 0); } else { + AvahiEntry *e; /* Handle all other queries */ - + for (e = avahi_hashmap_lookup(s->entries_by_key, k); e; e = e->by_key_next) if (!e->dead && avahi_entry_is_registered(s, e, i)) avahi_server_prepare_response(s, i, e, unicast_response, 0); } + + /* Look for CNAME records */ + + if ((k->clazz == AVAHI_DNS_CLASS_IN || k->clazz == AVAHI_DNS_CLASS_ANY) + && k->type != AVAHI_DNS_TYPE_CNAME && k->type != AVAHI_DNS_TYPE_ANY) { + + AvahiKey *cname_key; + + if (!(cname_key = avahi_key_new(k->name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_CNAME))) + return; + + avahi_server_prepare_matching_responses(s, i, cname_key, unicast_response); + avahi_key_unref(cname_key); + } } static void withdraw_entry(AvahiServer *s, AvahiEntry *e) { assert(s); assert(e); - + + /* Withdraw the specified entry, and if is part of an entry group, + * put that into COLLISION state */ + + if (e->dead) + return; + if (e->group) { AvahiEntry *k; - - for (k = e->group->entries; k; k = k->by_group_next) { + + for (k = e->group->entries; k; k = k->by_group_next) if (!k->dead) { - avahi_goodbye_entry(s, k, 0); + avahi_goodbye_entry(s, k, 0, 1); k->dead = 1; } - } e->group->n_probing = 0; avahi_s_entry_group_change_state(e->group, AVAHI_ENTRY_GROUP_COLLISION); } else { - avahi_goodbye_entry(s, e, 0); + avahi_goodbye_entry(s, e, 0, 1); e->dead = 1; } @@ -224,27 +183,25 @@ static void withdraw_entry(AvahiServer *s, AvahiEntry *e) { static void withdraw_rrset(AvahiServer *s, AvahiKey *key) { AvahiEntry *e; - + assert(s); assert(key); - for (e = avahi_hashmap_lookup(s->entries_by_key, key); e; e = e->by_key_next) - if (!e->dead) - withdraw_entry(s, e); + /* Withdraw an entry RRSset */ + + for (e = avahi_hashmap_lookup(s->entries_by_key, key); e; e = e->by_key_next) + withdraw_entry(s, e); } static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) { AvahiEntry *e, *n; - char *t; int ours = 0, won = 0, lost = 0; - + assert(s); assert(record); assert(i); - t = avahi_record_to_string(record); - -/* avahi_log_debug("incoming_probe()"); */ + /* Handle incoming probes and check if they conflict our own probes */ for (e = avahi_hashmap_lookup(s->entries_by_key, record->key); e; e = n) { int cmp; @@ -252,12 +209,12 @@ static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface * if (e->dead) continue; - + if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) { ours = 1; break; } else { - + if (avahi_entry_is_probing(s, e, i)) { if (cmp > 0) won = 1; @@ -268,62 +225,84 @@ static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface * } if (!ours) { + char *t = avahi_record_to_string(record); if (won) - avahi_log_debug("Recieved conflicting probe [%s]. Local host won.", t); + avahi_log_debug("Received conflicting probe [%s]. Local host won.", t); else if (lost) { - avahi_log_debug("Recieved conflicting probe [%s]. Local host lost. Withdrawing.", t); + avahi_log_debug("Received conflicting probe [%s]. Local host lost. Withdrawing.", t); withdraw_rrset(s, record->key); - }/* else */ -/* avahi_log_debug("Not conflicting probe"); */ - } + } - avahi_free(t); + avahi_free(t); + } } -static int handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, int unique, const AvahiAddress *a) { +static int handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, int unique) { int valid = 1, ours = 0, conflict = 0, withdraw_immediately = 0; AvahiEntry *e, *n, *conflicting_entry = NULL; - + assert(s); assert(i); assert(record); - -/* avahi_log_debug("CHECKING FOR CONFLICT: [%s]", t); */ + /* Check whether an incoming record conflicts with one of our own */ for (e = avahi_hashmap_lookup(s->entries_by_key, record->key); e; e = n) { n = e->by_key_next; - if (e->dead || (!(e->flags & AVAHI_ENTRY_UNIQUE) && !unique)) + if (e->dead) + continue; + + /* Check if the incoming is a goodbye record */ + if (avahi_record_is_goodbye(record)) { + + if (avahi_record_equal_no_ttl(e->record, record)) { + char *t; + + /* Refresh */ + t = avahi_record_to_string(record); + avahi_log_debug("Received goodbye record for one of our records [%s]. Refreshing.", t); + avahi_server_prepare_matching_responses(s, i, e->record->key, 0); + + valid = 0; + avahi_free(t); + break; + } + + /* If the goodybe packet doesn't match one of our own RRs, we simply ignore it. */ + continue; + } + + if (!(e->flags & AVAHI_PUBLISH_UNIQUE) && !unique) continue; /* Either our entry or the other is intended to be unique, so let's check */ - + if (avahi_record_equal_no_ttl(e->record, record)) { ours = 1; /* We have an identical record, so this is no conflict */ - + /* Check wheter there is a TTL conflict */ if (record->ttl <= e->record->ttl/2 && avahi_entry_is_registered(s, e, i)) { char *t; /* Refresh */ - t = avahi_record_to_string(record); - - avahi_log_debug("Recieved record with bad TTL [%s]. Refreshing.", t); + t = avahi_record_to_string(record); + + avahi_log_debug("Received record with bad TTL [%s]. Refreshing.", t); avahi_server_prepare_matching_responses(s, i, e->record->key, 0); valid = 0; - + avahi_free(t); } - + /* There's no need to check the other entries of this RRset */ break; } else { - + if (avahi_entry_is_registered(s, e, i)) { - + /* A conflict => we have to return to probe mode */ conflict = 1; conflicting_entry = e; @@ -339,21 +318,19 @@ static int handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord *recor } } -/* avahi_log_debug("ours=%i conflict=%i", ours, conflict); */ - if (!ours && conflict) { char *t; - + valid = 0; - t = avahi_record_to_string(record); - + t = avahi_record_to_string(record); + if (withdraw_immediately) { - avahi_log_debug("Recieved conflicting record [%s] with local record to be. Withdrawing.", t); + avahi_log_debug("Received conflicting record [%s] with local record to be. Withdrawing.", t); withdraw_rrset(s, record->key); } else { assert(conflicting_entry); - avahi_log_debug("Recieved conflicting record [%s]. Resetting our record.", t); + avahi_log_debug("Received conflicting record [%s]. Resetting our record.", t); avahi_entry_return_to_initial_state(s, conflicting_entry, i); /* Local unique records are returned to probing @@ -372,7 +349,7 @@ static void append_aux_callback(AvahiServer *s, AvahiRecord *r, int flush_cache, assert(s); assert(r); assert(unicast_response); - + avahi_record_list_push(s->record_list, r, flush_cache, *unicast_response, 1); } @@ -393,13 +370,13 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP AvahiDnsPacket *reply; AvahiRecord *r; - if (!(reply = avahi_dns_packet_new_reply(p, 512 /* unicast DNS maximum packet size is 512 */ , 1, 1))) + if (!(reply = avahi_dns_packet_new_reply(p, 512 + AVAHI_DNS_PACKET_EXTRA_SIZE /* unicast DNS maximum packet size is 512 */ , 1, 1))) return; /* OOM */ - + while ((r = avahi_record_list_next(s->record_list, NULL, NULL, NULL))) { append_aux_records_to_list(s, i, r, 0); - + if (avahi_dns_packet_append_record(reply, r, 0, 10)) avahi_dns_packet_inc_field(reply, AVAHI_DNS_FIELD_ANCOUNT); else { @@ -425,33 +402,42 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP immediately, because known answer suppression records might be contained in later packets */ int tc = p && !!(avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & AVAHI_DNS_FLAG_TC); - + while ((r = avahi_record_list_next(s->record_list, &flush_cache, &unicast_response, &auxiliary))) { - - if (!avahi_interface_post_response(i, r, flush_cache, a, immediately || (flush_cache && !tc && !auxiliary)) && unicast_response) { - append_aux_records_to_list(s, i, r, unicast_response); - + int im = immediately; + + /* Only send the response immediately if it contains a + * unique entry AND it is not in reply to a truncated + * packet AND it is not an auxiliary record AND all other + * responses for this record are unique too. */ + + if (flush_cache && !tc && !auxiliary && avahi_record_list_all_flush_cache(s->record_list)) + im = 1; + + if (!avahi_interface_post_response(i, r, flush_cache, a, im) && unicast_response) { + /* Due to some reasons the record has not been scheduled. * The client requested an unicast response in that * case. Therefore we prepare such a response */ + append_aux_records_to_list(s, i, r, unicast_response); + for (;;) { - + if (!reply) { assert(p); if (!(reply = avahi_dns_packet_new_reply(p, i->hardware->mtu, 0, 0))) break; /* OOM */ } - + if (avahi_dns_packet_append_record(reply, r, flush_cache, 0)) { /* Appending this record succeeded, so incremeant * the specific header field, and return to the caller */ - - avahi_dns_packet_inc_field(reply, AVAHI_DNS_FIELD_ANCOUNT); + avahi_dns_packet_inc_field(reply, AVAHI_DNS_FIELD_ANCOUNT); break; } @@ -462,21 +448,32 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP avahi_dns_packet_free(reply); size = avahi_record_get_estimate_size(r) + AVAHI_DNS_PACKET_HEADER_SIZE; - if (size > AVAHI_DNS_PACKET_MAX_SIZE) - size = AVAHI_DNS_PACKET_MAX_SIZE; - if (!(reply = avahi_dns_packet_new_reply(p, size, 0, 1))) + if (!(reply = avahi_dns_packet_new_reply(p, size + AVAHI_DNS_PACKET_EXTRA_SIZE, 0, 1))) break; /* OOM */ - if (!avahi_dns_packet_append_record(reply, r, flush_cache, 0)) { + if (avahi_dns_packet_append_record(reply, r, flush_cache, 0)) { + + /* Appending this record succeeded, so incremeant + * the specific header field, and return to the caller */ + + avahi_dns_packet_inc_field(reply, AVAHI_DNS_FIELD_ANCOUNT); + break; + + } else { + + /* We completely fucked up, there's + * nothing we can do. The RR just doesn't + * fit in. Let's ignore it. */ + char *t; avahi_dns_packet_free(reply); + reply = NULL; t = avahi_record_to_string(r); avahi_log_warn("Record [%s] too large, doesn't fit in any packet!", t); avahi_free(t); break; - } else - avahi_dns_packet_inc_field(reply, AVAHI_DNS_FIELD_ANCOUNT); + } } /* Appending the record didn't succeeed, so let's send this packet, and create a new one */ @@ -490,7 +487,7 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP } if (reply) { - if (avahi_dns_packet_get_field(reply, AVAHI_DNS_FIELD_ANCOUNT) != 0) + if (avahi_dns_packet_get_field(reply, AVAHI_DNS_FIELD_ANCOUNT) != 0) avahi_interface_send_packet_unicast(i, reply, a, port); avahi_dns_packet_free(reply); } @@ -499,10 +496,9 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP avahi_record_list_flush(s->record_list); } - static void reflect_response(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, int flush_cache) { AvahiInterface *j; - + assert(s); assert(i); assert(r); @@ -517,19 +513,27 @@ static void reflect_response(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, static void* reflect_cache_walk_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, void* userdata) { AvahiServer *s = userdata; + AvahiRecord* r; assert(c); assert(pattern); assert(e); assert(s); + /* Don't reflect cache entry with ipv6 link-local addresses. */ + r = e->record; + if ((r->key->type == AVAHI_DNS_TYPE_AAAA) && + (r->data.aaaa.address.address[0] == 0xFE) && + (r->data.aaaa.address.address[1] == 0x80)) + return NULL; + avahi_record_list_push(s->record_list, e->record, e->cache_flush, 0, 0); return NULL; } static void reflect_query(AvahiServer *s, AvahiInterface *i, AvahiKey *k) { AvahiInterface *j; - + assert(s); assert(i); assert(k); @@ -540,7 +544,7 @@ static void reflect_query(AvahiServer *s, AvahiInterface *i, AvahiKey *k) { for (j = s->monitor->interfaces; j; j = j->interface_next) if (j != i && (s->config.reflect_ipv || j->protocol == i->protocol)) { /* Post the query to other networks */ - avahi_interface_post_query(j, k, 1); + avahi_interface_post_query(j, k, 1, NULL); /* Reply from caches of other network. This is needed to * "work around" known answer suppression. */ @@ -551,7 +555,7 @@ static void reflect_query(AvahiServer *s, AvahiInterface *i, AvahiKey *k) { static void reflect_probe(AvahiServer *s, AvahiInterface *i, AvahiRecord *r) { AvahiInterface *j; - + assert(s); assert(i); assert(r); @@ -564,127 +568,126 @@ static void reflect_probe(AvahiServer *s, AvahiInterface *i, AvahiRecord *r) { avahi_interface_post_probe(j, r, 1); } -static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a, uint16_t port, int legacy_unicast) { +static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a, uint16_t port, int legacy_unicast, int from_local_iface) { size_t n; int is_probe; - + assert(s); assert(p); assert(i); assert(a); -/* avahi_log_debug("query"); */ - assert(avahi_record_list_is_empty(s->record_list)); is_probe = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) > 0; - + /* Handle the questions */ for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT); n > 0; n --) { AvahiKey *key; int unicast_response = 0; if (!(key = avahi_dns_packet_consume_key(p, &unicast_response))) { - avahi_log_warn("Packet too short (1)"); + avahi_log_warn(__FILE__": Packet too short or invalid while reading question key. (Maybe a UTF-8 problem?)"); goto fail; } - if (!legacy_unicast) + if (!legacy_unicast && !from_local_iface) { reflect_query(s, i, key); + if (!unicast_response) + avahi_cache_start_poof(i->cache, key, a); + } 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); } - /* Known Answer Suppression */ - for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT); n > 0; n --) { - AvahiRecord *record; - int unique = 0; + if (!legacy_unicast) { - if (!(record = avahi_dns_packet_consume_record(p, &unique))) { - avahi_log_warn("Packet too short (2)"); - goto fail; - } + /* Known Answer Suppression */ + for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT); n > 0; n --) { + AvahiRecord *record; + int unique = 0; + + if (!(record = avahi_dns_packet_consume_record(p, &unique))) { + avahi_log_warn(__FILE__": Packet too short or invalid while reading known answer record. (Maybe a UTF-8 problem?)"); + goto fail; + } - if (handle_conflict(s, i, record, unique, a)) { avahi_response_scheduler_suppress(i->response_scheduler, record, a); avahi_record_list_drop(s->record_list, record); + avahi_cache_stop_poof(i->cache, record, a); + + avahi_record_unref(record); } - - avahi_record_unref(record); - } - /* Probe record */ - for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT); n > 0; n --) { - AvahiRecord *record; - int unique = 0; + /* Probe record */ + for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT); n > 0; n --) { + AvahiRecord *record; + int unique = 0; - if (!(record = avahi_dns_packet_consume_record(p, &unique))) { - avahi_log_warn("Packet too short (3)"); - goto fail; - } + if (!(record = avahi_dns_packet_consume_record(p, &unique))) { + avahi_log_warn(__FILE__": Packet too short or invalid while reading probe record. (Maybe a UTF-8 problem?)"); + goto fail; + } - if (!avahi_key_is_pattern(record->key)) { - reflect_probe(s, i, record); - incoming_probe(s, record, i); + if (!avahi_key_is_pattern(record->key)) { + if (!from_local_iface) + reflect_probe(s, i, record); + incoming_probe(s, record, i); + } + + avahi_record_unref(record); } - - avahi_record_unref(record); } if (!avahi_record_list_is_empty(s->record_list)) avahi_server_generate_response(s, i, p, a, port, legacy_unicast, is_probe); return; - + fail: avahi_record_list_flush(s->record_list); } -static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a) { +static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a, int from_local_iface) { unsigned n; - + assert(s); assert(p); assert(i); assert(a); -/* avahi_log_debug("response"); */ - for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) + avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ARCOUNT); n > 0; n--) { AvahiRecord *record; int cache_flush = 0; -/* char *txt; */ - + if (!(record = avahi_dns_packet_consume_record(p, &cache_flush))) { - avahi_log_warn("Packet too short (4)"); + avahi_log_warn(__FILE__": Packet too short or invalid while reading response record. (Maybe a UTF-8 problem?)"); break; } if (!avahi_key_is_pattern(record->key)) { -/* avahi_log_debug("Handling response: %s", txt = avahi_record_to_string(record)); */ -/* avahi_free(txt); */ - - if (handle_conflict(s, i, record, cache_flush, a)) { - reflect_response(s, i, record, cache_flush); + if (handle_conflict(s, i, record, cache_flush)) { + if (!from_local_iface && !avahi_record_is_link_local_address(record)) + reflect_response(s, i, record, cache_flush); avahi_cache_update(i->cache, record, cache_flush, a); avahi_response_scheduler_incoming(i->response_scheduler, record, cache_flush); } } - + avahi_record_unref(record); } /* If the incoming response contained a conflicting record, some - records have been scheduling for sending. We need to flush them + records have been scheduled for sending. We need to flush them here. */ if (!avahi_record_list_is_empty(s->record_list)) avahi_server_generate_response(s, i, NULL, NULL, 0, 0, 1); @@ -693,15 +696,15 @@ static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInter static AvahiLegacyUnicastReflectSlot* allocate_slot(AvahiServer *s) { unsigned n, idx = (unsigned) -1; AvahiLegacyUnicastReflectSlot *slot; - + assert(s); if (!s->legacy_unicast_reflect_slots) - s->legacy_unicast_reflect_slots = avahi_new0(AvahiLegacyUnicastReflectSlot*, AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS); + s->legacy_unicast_reflect_slots = avahi_new0(AvahiLegacyUnicastReflectSlot*, AVAHI_LEGACY_UNICAST_REFLECT_SLOTS_MAX); + + for (n = 0; n < AVAHI_LEGACY_UNICAST_REFLECT_SLOTS_MAX; n++, s->legacy_unicast_reflect_id++) { + idx = s->legacy_unicast_reflect_id % AVAHI_LEGACY_UNICAST_REFLECT_SLOTS_MAX; - for (n = 0; n < AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS; n++, s->legacy_unicast_reflect_id++) { - idx = s->legacy_unicast_reflect_id % AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS; - if (!s->legacy_unicast_reflect_slots[idx]) break; } @@ -715,7 +718,7 @@ static AvahiLegacyUnicastReflectSlot* allocate_slot(AvahiServer *s) { s->legacy_unicast_reflect_slots[idx] = slot; slot->id = s->legacy_unicast_reflect_id++; slot->server = s; - + return slot; } @@ -725,12 +728,12 @@ static void deallocate_slot(AvahiServer *s, AvahiLegacyUnicastReflectSlot *slot) assert(s); assert(slot); - idx = slot->id % AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS; + idx = slot->id % AVAHI_LEGACY_UNICAST_REFLECT_SLOTS_MAX; assert(s->legacy_unicast_reflect_slots[idx] == slot); avahi_time_event_free(slot->time_event); - + avahi_free(slot); s->legacy_unicast_reflect_slots[idx] = NULL; } @@ -742,7 +745,7 @@ static void free_slots(AvahiServer *s) { if (!s->legacy_unicast_reflect_slots) return; - for (idx = 0; idx < AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS; idx ++) + for (idx = 0; idx < AVAHI_LEGACY_UNICAST_REFLECT_SLOTS_MAX; idx ++) if (s->legacy_unicast_reflect_slots[idx]) deallocate_slot(s, s->legacy_unicast_reflect_slots[idx]); @@ -752,13 +755,13 @@ static void free_slots(AvahiServer *s) { static AvahiLegacyUnicastReflectSlot* find_slot(AvahiServer *s, uint16_t id) { unsigned idx; - + assert(s); if (!s->legacy_unicast_reflect_slots) return NULL; - - idx = id % AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS; + + idx = id % AVAHI_LEGACY_UNICAST_REFLECT_SLOTS_MAX; if (!s->legacy_unicast_reflect_slots[idx] || s->legacy_unicast_reflect_slots[idx]->id != id) return NULL; @@ -785,13 +788,11 @@ static void reflect_legacy_unicast_query_packet(AvahiServer *s, AvahiDnsPacket * assert(i); assert(a); assert(port > 0); - assert(i->protocol == a->family); - + assert(i->protocol == a->proto); + if (!s->config.enable_reflector) return; -/* avahi_log_debug("legacy unicast reflector"); */ - /* Reflecting legacy unicast queries is a little more complicated than reflecting normal queries, since we must route the responses back to the right client. Therefore we must store @@ -814,56 +815,54 @@ static void reflect_legacy_unicast_query_packet(AvahiServer *s, AvahiDnsPacket * avahi_elapse_time(&slot->elapse_time, 2000, 0); slot->time_event = avahi_time_event_new(s->time_event_queue, &slot->elapse_time, legacy_unicast_reflect_slot_timeout, slot); - /* Patch the packet with our new locally generatedt id */ + /* Patch the packet with our new locally generatet id */ avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ID, slot->id); - + for (j = s->monitor->interfaces; j; j = j->interface_next) - if (avahi_interface_relevant(j) && + if (j->announcing && j != i && (s->config.reflect_ipv || j->protocol == i->protocol)) { if (j->protocol == AVAHI_PROTO_INET && s->fd_legacy_unicast_ipv4 >= 0) { - avahi_send_dns_packet_ipv4(s->fd_legacy_unicast_ipv4, j->hardware->index, p, NULL, 0); - } else if (j->protocol == AVAHI_PROTO_INET6 && s->fd_legacy_unicast_ipv6 >= 0) - avahi_send_dns_packet_ipv6(s->fd_legacy_unicast_ipv6, j->hardware->index, p, NULL, 0); + avahi_send_dns_packet_ipv4(s->fd_legacy_unicast_ipv4, j->hardware->index, p, NULL, NULL, 0); + } else if (j->protocol == AVAHI_PROTO_INET6 && s->fd_legacy_unicast_ipv6 >= 0) + avahi_send_dns_packet_ipv6(s->fd_legacy_unicast_ipv6, j->hardware->index, p, NULL, NULL, 0); } /* Reset the id */ avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ID, slot->original_id); } -static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const struct sockaddr *sa) { - AvahiAddress a; +static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const AvahiAddress *address, uint16_t port) { assert(s); - assert(sa); + assert(address); + assert(port > 0); if (!s->config.enable_reflector) return 0; - - avahi_address_from_sockaddr(sa, &a); - if (!avahi_address_is_local(s->monitor, &a)) + if (!avahi_address_is_local(s->monitor, address)) return 0; - - if (sa->sa_family == AF_INET && s->fd_legacy_unicast_ipv4 >= 0) { + + if (address->proto == AVAHI_PROTO_INET && s->fd_legacy_unicast_ipv4 >= 0) { struct sockaddr_in lsa; socklen_t l = sizeof(lsa); - - if (getsockname(s->fd_legacy_unicast_ipv4, &lsa, &l) != 0) + + if (getsockname(s->fd_legacy_unicast_ipv4, (struct sockaddr*) &lsa, &l) != 0) avahi_log_warn("getsockname(): %s", strerror(errno)); else - return lsa.sin_port == ((const struct sockaddr_in*) sa)->sin_port; + return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port; } - if (sa->sa_family == AF_INET6 && s->fd_legacy_unicast_ipv6 >= 0) { + if (address->proto == AVAHI_PROTO_INET6 && s->fd_legacy_unicast_ipv6 >= 0) { struct sockaddr_in6 lsa; socklen_t l = sizeof(lsa); - if (getsockname(s->fd_legacy_unicast_ipv6, &lsa, &l) != 0) + if (getsockname(s->fd_legacy_unicast_ipv6, (struct sockaddr*) &lsa, &l) != 0) avahi_log_warn("getsockname(): %s", strerror(errno)); else - return lsa.sin6_port == ((const struct sockaddr_in6*) sa)->sin6_port; + return avahi_port_from_sockaddr((struct sockaddr*) &lsa) == port; } return 0; @@ -873,52 +872,68 @@ static int is_mdns_mcast_address(const AvahiAddress *a) { AvahiAddress b; assert(a); - avahi_address_parse(a->family == AVAHI_PROTO_INET ? AVAHI_IPV4_MCAST_GROUP : AVAHI_IPV6_MCAST_GROUP, a->family, &b); + avahi_address_parse(a->proto == AVAHI_PROTO_INET ? AVAHI_IPV4_MCAST_GROUP : AVAHI_IPV6_MCAST_GROUP, a->proto, &b); return avahi_address_cmp(a, &b) == 0; } -static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const struct sockaddr *sa, AvahiAddress *dest, AvahiIfIndex iface, int ttl) { +static int originates_from_local_iface(AvahiServer *s, AvahiIfIndex iface, const AvahiAddress *a, uint16_t port) { + assert(s); + assert(iface != AVAHI_IF_UNSPEC); + assert(a); + + /* If it isn't the MDNS port it can't be generated by us */ + if (port != AVAHI_MDNS_PORT) + return 0; + + return avahi_interface_has_address(s->monitor, iface, a); +} + +static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddress *src_address, uint16_t port, const AvahiAddress *dst_address, AvahiIfIndex iface, int ttl) { AvahiInterface *i; - AvahiAddress a; - uint16_t port; - + int from_local_iface = 0; + assert(s); assert(p); - assert(sa); - assert(dest); + assert(src_address); + assert(dst_address); assert(iface > 0); + assert(src_address->proto == dst_address->proto); - if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, sa->sa_family)) || - !avahi_interface_relevant(i)) { - avahi_log_warn("Recieved packet from invalid interface."); + if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, src_address->proto)) || + !i->announcing) { + avahi_log_warn("Received packet from invalid interface."); return; } -/* avahi_log_debug("new packet recieved on interface '%s.%i'.", i->hardware->name, i->protocol); */ + if (port <= 0) { + /* This fixes RHBZ #475394 */ + avahi_log_warn("Received packet from invalid source port %u.", (unsigned) port); + return; + } - port = avahi_port_from_sockaddr(sa); - avahi_address_from_sockaddr(sa, &a); - - if (avahi_address_is_ipv4_in_ipv6(&a)) + if (avahi_address_is_ipv4_in_ipv6(src_address)) /* This is an IPv4 address encapsulated in IPv6, so let's ignore it. */ return; - if (originates_from_local_legacy_unicast_socket(s, sa)) + if (originates_from_local_legacy_unicast_socket(s, src_address, port)) /* This originates from our local reflector, so let's ignore it */ return; - if (avahi_dns_packet_is_valid(p) < 0) { - avahi_log_warn("Recieved invalid packet."); + /* We don't want to reflect local traffic, so we check if this packet is generated locally. */ + if (s->config.enable_reflector) + from_local_iface = originates_from_local_iface(s, iface, src_address, port); + + if (avahi_dns_packet_check_valid_multicast(p) < 0) { + avahi_log_warn("Received invalid packet."); return; } if (avahi_dns_packet_is_query(p)) { int legacy_unicast = 0; - if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ARCOUNT) != 0) { - avahi_log_warn("Invalid query packet."); - return; - } + /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the + * AR section completely here, so far. Until the day we add + * EDNS0 support. */ if (port != AVAHI_MDNS_PORT) { /* Legacy Unicast */ @@ -928,83 +943,66 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const struct sock avahi_log_warn("Invalid legacy unicast query packet."); return; } - + legacy_unicast = 1; } if (legacy_unicast) - reflect_legacy_unicast_query_packet(s, p, i, &a, port); - - handle_query_packet(s, p, i, &a, port, legacy_unicast); - -/* avahi_log_debug("Handled query"); */ + reflect_legacy_unicast_query_packet(s, p, i, src_address, port); + + handle_query_packet(s, p, i, src_address, port, legacy_unicast, from_local_iface); + } else { + char t[AVAHI_ADDRESS_STR_MAX]; + if (port != AVAHI_MDNS_PORT) { - avahi_log_warn("Recieved repsonse with invalid source port %u on interface '%s.%i'", port, i->hardware->name, i->protocol); + avahi_log_warn("Received response from host %s with invalid source port %u on interface '%s.%i'", avahi_address_snprint(t, sizeof(t), src_address), port, i->hardware->name, i->protocol); return; } if (ttl != 255 && s->config.check_response_ttl) { - avahi_log_warn("Recieved response with invalid TTL %u on interface '%s.%i'.", ttl, i->hardware->name, i->protocol); + avahi_log_warn("Received response from host %s with invalid TTL %u on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), ttl, i->hardware->name, i->protocol); return; } - if (!is_mdns_mcast_address(dest) && - !avahi_interface_address_on_link(i, &a)) { - avahi_log_warn("Recivied non-local response on interface '%s.%i'.", i->hardware->name, i->protocol); + if (!is_mdns_mcast_address(dst_address) && + !avahi_interface_address_on_link(i, src_address)) { + + avahi_log_warn("Received non-local response from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol); return; } - + if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT) != 0 || avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) == 0 || avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0) { - avahi_log_warn("Invalid response packet."); + + avahi_log_warn("Invalid response packet from host %s.", avahi_address_snprint(t, sizeof(t), src_address)); return; } - handle_response_packet(s, p, i, &a); -/* avahi_log_debug("Handled response"); */ + handle_response_packet(s, p, i, src_address, from_local_iface); } } -static void dispatch_legacy_unicast_packet(AvahiServer *s, AvahiDnsPacket *p, const struct sockaddr *sa, AvahiIfIndex iface, int ttl) { - AvahiInterface *i, *j; - AvahiAddress a; - uint16_t port; +static void dispatch_legacy_unicast_packet(AvahiServer *s, AvahiDnsPacket *p) { + AvahiInterface *j; AvahiLegacyUnicastReflectSlot *slot; - + assert(s); assert(p); - assert(sa); - assert(iface > 0); - - if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, sa->sa_family)) || - !avahi_interface_relevant(i)) { - avahi_log_warn("Recieved packet from invalid interface."); - return; - } - -/* avahi_log_debug("new legacy unicast packet recieved on interface '%s.%i'.", i->hardware->name, i->protocol); */ - - port = avahi_port_from_sockaddr(sa); - avahi_address_from_sockaddr(sa, &a); - - if (avahi_address_is_ipv4_in_ipv6(&a)) - /* This is an IPv4 address encapsulated in IPv6, so let's ignore it. */ - return; - if (avahi_dns_packet_is_valid(p) < 0 || avahi_dns_packet_is_query(p)) { - avahi_log_warn("Recieved invalid packet."); + if (avahi_dns_packet_check_valid(p) < 0 || avahi_dns_packet_is_query(p)) { + avahi_log_warn("Received invalid packet."); return; } if (!(slot = find_slot(s, avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ID)))) { - avahi_log_warn("Recieved legacy unicast response with unknown id"); + avahi_log_warn("Received legacy unicast response with unknown id"); return; } - if (!(j = avahi_interface_monitor_get_interface(s->monitor, slot->interface, slot->address.family)) || - !avahi_interface_relevant(j)) + if (!(j = avahi_interface_monitor_get_interface(s->monitor, slot->interface, slot->address.proto)) || + !j->announcing) return; /* Patch the original ID into this response */ @@ -1017,52 +1015,62 @@ static void dispatch_legacy_unicast_packet(AvahiServer *s, AvahiDnsPacket *p, co avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ID, slot->id); } -static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent events, void *userdata) { +static void mcast_socket_event(AvahiWatch *w, int fd, AvahiWatchEvent events, void *userdata) { AvahiServer *s = userdata; - AvahiAddress dest; - AvahiDnsPacket *p; + AvahiAddress dest, src; + AvahiDnsPacket *p = NULL; AvahiIfIndex iface; + uint16_t port; uint8_t ttl; - struct sockaddr_in sa; - struct sockaddr_in6 sa6; assert(w); assert(fd >= 0); + assert(events & AVAHI_WATCH_IN); - if (events & AVAHI_WATCH_IN) { - - if (fd == s->fd_ipv4) { - dest.family = AVAHI_PROTO_INET; - if ((p = avahi_recv_dns_packet_ipv4(s->fd_ipv4, &sa, &dest.data.ipv4, &iface, &ttl))) { - dispatch_packet(s, p, (struct sockaddr*) &sa, &dest, iface, ttl); - avahi_dns_packet_free(p); - } - } else if (fd == s->fd_ipv6) { - dest.family = AVAHI_PROTO_INET6; + if (fd == s->fd_ipv4) { + dest.proto = src.proto = AVAHI_PROTO_INET; + p = avahi_recv_dns_packet_ipv4(s->fd_ipv4, &src.data.ipv4, &port, &dest.data.ipv4, &iface, &ttl); + } else { + assert(fd == s->fd_ipv6); + dest.proto = src.proto = AVAHI_PROTO_INET6; + p = avahi_recv_dns_packet_ipv6(s->fd_ipv6, &src.data.ipv6, &port, &dest.data.ipv6, &iface, &ttl); + } - if ((p = avahi_recv_dns_packet_ipv6(s->fd_ipv6, &sa6, &dest.data.ipv6, &iface, &ttl))) { - dispatch_packet(s, p, (struct sockaddr*) &sa6, &dest, iface, ttl); - avahi_dns_packet_free(p); - } - } else if (fd == s->fd_legacy_unicast_ipv4) { - dest.family = AVAHI_PROTO_INET; - - if ((p = avahi_recv_dns_packet_ipv4(s->fd_legacy_unicast_ipv4, &sa, &dest.data.ipv4, &iface, &ttl))) { - dispatch_legacy_unicast_packet(s, p, (struct sockaddr*) &sa, iface, ttl); - avahi_dns_packet_free(p); - } - } else if (fd == s->fd_legacy_unicast_ipv6) { - dest.family = AVAHI_PROTO_INET6; - - if ((p = avahi_recv_dns_packet_ipv6(s->fd_legacy_unicast_ipv6, &sa6, &dest.data.ipv6, &iface, &ttl))) { - dispatch_legacy_unicast_packet(s, p, (struct sockaddr*) &sa6, iface, ttl); - avahi_dns_packet_free(p); - } - } + if (p) { + if (iface == AVAHI_IF_UNSPEC) + iface = avahi_find_interface_for_address(s->monitor, &dest); - cleanup_dead(s); - } else { - assert(0); + if (iface != AVAHI_IF_UNSPEC) + dispatch_packet(s, p, &src, port, &dest, iface, ttl); + else + avahi_log_error("Incoming packet received on address that isn't local."); + + avahi_dns_packet_free(p); + + avahi_cleanup_dead_entries(s); + } +} + +static void legacy_unicast_socket_event(AvahiWatch *w, int fd, AvahiWatchEvent events, void *userdata) { + AvahiServer *s = userdata; + AvahiDnsPacket *p = NULL; + + assert(w); + assert(fd >= 0); + assert(events & AVAHI_WATCH_IN); + + if (fd == s->fd_legacy_unicast_ipv4) + p = avahi_recv_dns_packet_ipv4(s->fd_legacy_unicast_ipv4, NULL, NULL, NULL, NULL, NULL); + else { + assert(fd == s->fd_legacy_unicast_ipv6); + p = avahi_recv_dns_packet_ipv6(s->fd_legacy_unicast_ipv6, NULL, NULL, NULL, NULL, NULL); + } + + if (p) { + dispatch_legacy_unicast_packet(s, p); + avahi_dns_packet_free(p); + + avahi_cleanup_dead_entries(s); } } @@ -1071,9 +1079,11 @@ static void server_set_state(AvahiServer *s, AvahiServerState state) { if (s->state == state) return; - + s->state = state; + avahi_interface_monitor_update_rrs(s->monitor, 0); + if (s->callback) s->callback(s, state, s->userdata); } @@ -1087,38 +1097,32 @@ static void withdraw_host_rrs(AvahiServer *s) { if (s->browse_domain_entry_group) avahi_s_entry_group_reset(s->browse_domain_entry_group); - avahi_update_host_rrs(s->monitor, 1); + avahi_interface_monitor_update_rrs(s->monitor, 1); s->n_host_rr_pending = 0; } void avahi_server_decrease_host_rr_pending(AvahiServer *s) { assert(s); - + assert(s->n_host_rr_pending > 0); if (--s->n_host_rr_pending == 0) server_set_state(s, AVAHI_SERVER_RUNNING); } -void avahi_server_increase_host_rr_pending(AvahiServer *s) { - assert(s); - - s->n_host_rr_pending ++; -} - -void avahi_host_rr_entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void *userdata) { +void avahi_host_rr_entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) { assert(s); assert(g); if (state == AVAHI_ENTRY_GROUP_REGISTERING && s->state == AVAHI_SERVER_REGISTERING) - avahi_server_increase_host_rr_pending(s); - + s->n_host_rr_pending ++; + else if (state == AVAHI_ENTRY_GROUP_COLLISION && (s->state == AVAHI_SERVER_REGISTERING || s->state == AVAHI_SERVER_RUNNING)) { withdraw_host_rrs(s); server_set_state(s, AVAHI_SERVER_COLLISION); - + } else if (state == AVAHI_ENTRY_GROUP_ESTABLISHED && s->state == AVAHI_SERVER_REGISTERING) avahi_server_decrease_host_rr_pending(s); @@ -1127,9 +1131,9 @@ void avahi_host_rr_entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, Ava static void register_hinfo(AvahiServer *s) { struct utsname utsname; AvahiRecord *r; - + assert(s); - + if (!s->config.publish_hinfo) return; @@ -1142,16 +1146,23 @@ static void register_hinfo(AvahiServer *s) { avahi_log_warn("Failed to create HINFO entry group: %s", avahi_strerror(s->error)); return; } - + /* Fill in HINFO rr */ if ((r = avahi_record_new_full(s->host_name_fqdn, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_HINFO, AVAHI_DEFAULT_TTL_HOST_NAME))) { - uname(&utsname); - r->data.hinfo.cpu = avahi_strdup(avahi_strup(utsname.machine)); - r->data.hinfo.os = avahi_strdup(avahi_strup(utsname.sysname)); - if (avahi_server_add(s, s->hinfo_entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_ENTRY_UNIQUE, r) < 0) { - avahi_log_warn("Failed to add HINFO RR: %s", avahi_strerror(s->error)); - return; + if (uname(&utsname) < 0) + avahi_log_warn("uname() failed: %s\n", avahi_strerror(errno)); + else { + + r->data.hinfo.cpu = avahi_strdup(avahi_strup(utsname.machine)); + r->data.hinfo.os = avahi_strdup(avahi_strup(utsname.sysname)); + + avahi_log_info("Registering HINFO record with values '%s'/'%s'.", r->data.hinfo.cpu, r->data.hinfo.os); + + if (avahi_server_add(s, s->hinfo_entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_PUBLISH_UNIQUE, r) < 0) { + avahi_log_warn("Failed to add HINFO RR: %s", avahi_strerror(s->error)); + return; + } } avahi_record_unref(r); @@ -1165,13 +1176,13 @@ static void register_hinfo(AvahiServer *s) { static void register_localhost(AvahiServer *s) { AvahiAddress a; assert(s); - + /* Add localhost entries */ avahi_address_parse("127.0.0.1", AVAHI_PROTO_INET, &a); - avahi_server_add_address(s, NULL, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_ENTRY_NOPROBE|AVAHI_ENTRY_NOANNOUNCE, "localhost", &a); + avahi_server_add_address(s, NULL, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_PUBLISH_NO_PROBE|AVAHI_PUBLISH_NO_ANNOUNCE, "localhost", &a); avahi_address_parse("::1", AVAHI_PROTO_INET6, &a); - avahi_server_add_address(s, NULL, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_ENTRY_NOPROBE|AVAHI_ENTRY_NOANNOUNCE, "ip6-localhost", &a); + avahi_server_add_address(s, NULL, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_PUBLISH_NO_PROBE|AVAHI_PUBLISH_NO_ANNOUNCE, "ip6-localhost", &a); } static void register_browse_domain(AvahiServer *s) { @@ -1180,6 +1191,9 @@ static void register_browse_domain(AvahiServer *s) { if (!s->config.publish_domain) return; + if (avahi_domain_equal(s->domain_name, "local")) + return; + if (s->browse_domain_entry_group) assert(avahi_s_entry_group_is_empty(s->browse_domain_entry_group)); else @@ -1189,7 +1203,7 @@ static void register_browse_domain(AvahiServer *s) { avahi_log_warn("Failed to create browse domain entry group: %s", avahi_strerror(s->error)); return; } - + if (avahi_server_add_ptr(s, s->browse_domain_entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, AVAHI_DEFAULT_TTL, "b._dns-sd._udp.local", s->domain_name) < 0) { avahi_log_warn("Failed to add browse domain RR: %s", avahi_strerror(s->error)); return; @@ -1203,21 +1217,22 @@ static void register_stuff(AvahiServer *s) { assert(s); server_set_state(s, AVAHI_SERVER_REGISTERING); - s->n_host_rr_pending ++; /** Make sure that the state isn't changed tp AVAHI_SERVER_RUNNING too early */ + s->n_host_rr_pending ++; /** Make sure that the state isn't changed tp AVAHI_SERVER_RUNNING too early */ register_hinfo(s); register_browse_domain(s); - avahi_update_host_rrs(s->monitor, 0); + avahi_interface_monitor_update_rrs(s->monitor, 0); + assert(s->n_host_rr_pending > 0); s->n_host_rr_pending --; - + if (s->n_host_rr_pending == 0) server_set_state(s, AVAHI_SERVER_RUNNING); } static void update_fqdn(AvahiServer *s) { char *n; - + assert(s); assert(s->host_name); assert(s->domain_name); @@ -1230,17 +1245,28 @@ static void update_fqdn(AvahiServer *s) { } int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + char *hn = NULL; assert(s); - assert(host_name); - if (host_name && !avahi_is_valid_host_name(host_name)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); + AVAHI_CHECK_VALIDITY(s, !host_name || avahi_is_valid_host_name(host_name), AVAHI_ERR_INVALID_HOST_NAME); + + if (!host_name) + hn = avahi_get_host_name_strdup(); + else + hn = avahi_normalize_name_strdup(host_name); + + hn[strcspn(hn, ".")] = 0; + + if (avahi_domain_equal(s->host_name, hn) && s->state != AVAHI_SERVER_COLLISION) { + avahi_free(hn); + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); + } withdraw_host_rrs(s); avahi_free(s->host_name); - s->host_name = host_name ? avahi_normalize_name(host_name) : avahi_get_host_name(); - s->host_name[strcspn(s->host_name, ".")] = 0; + s->host_name = hn; + update_fqdn(s); register_stuff(s); @@ -1248,39 +1274,60 @@ int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { } int avahi_server_set_domain_name(AvahiServer *s, const char *domain_name) { + char *dn = NULL; assert(s); - assert(domain_name); - if (domain_name && !avahi_is_valid_domain_name(domain_name)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_DOMAIN_NAME); + AVAHI_CHECK_VALIDITY(s, !domain_name || avahi_is_valid_domain_name(domain_name), AVAHI_ERR_INVALID_DOMAIN_NAME); - withdraw_host_rrs(s); + if (!domain_name) + dn = avahi_strdup("local"); + else + dn = avahi_normalize_name_strdup(domain_name); + + if (avahi_domain_equal(s->domain_name, domain_name)) { + avahi_free(dn); + return avahi_server_set_errno(s, AVAHI_ERR_NO_CHANGE); + } + + withdraw_host_rrs(s); avahi_free(s->domain_name); - s->domain_name = domain_name ? avahi_normalize_name(domain_name) : avahi_strdup("local"); + s->domain_name = dn; update_fqdn(s); register_stuff(s); + + avahi_free(dn); return AVAHI_OK; } static int valid_server_config(const AvahiServerConfig *sc) { + AvahiStringList *l; + + assert(sc); + + if (sc->n_wide_area_servers > AVAHI_WIDE_AREA_SERVERS_MAX) + return AVAHI_ERR_INVALID_CONFIG; if (sc->host_name && !avahi_is_valid_host_name(sc->host_name)) return AVAHI_ERR_INVALID_HOST_NAME; - + if (sc->domain_name && !avahi_is_valid_domain_name(sc->domain_name)) return AVAHI_ERR_INVALID_DOMAIN_NAME; + for (l = sc->browse_domains; l; l = l->next) + if (!avahi_is_valid_domain_name((char*) l->text)) + return AVAHI_ERR_INVALID_DOMAIN_NAME; + return AVAHI_OK; } static int setup_sockets(AvahiServer *s) { assert(s); - - s->fd_ipv4 = s->config.use_ipv4 ? avahi_open_socket_ipv4() : -1; - s->fd_ipv6 = s->config.use_ipv6 ? avahi_open_socket_ipv6() : -1; - + + s->fd_ipv4 = s->config.use_ipv4 ? avahi_open_socket_ipv4(s->config.disallow_other_stacks) : -1; + s->fd_ipv6 = s->config.use_ipv6 ? avahi_open_socket_ipv6(s->config.disallow_other_stacks) : -1; + if (s->fd_ipv6 < 0 && s->fd_ipv4 < 0) return AVAHI_ERR_NO_NETWORK; @@ -1289,19 +1336,23 @@ static int setup_sockets(AvahiServer *s) { else if (s->fd_ipv6 < 0 && s->config.use_ipv6) 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; + s->fd_legacy_unicast_ipv4 = s->fd_ipv4 >= 0 && s->config.enable_reflector ? avahi_open_unicast_socket_ipv4() : -1; + s->fd_legacy_unicast_ipv6 = s->fd_ipv6 >= 0 && s->config.enable_reflector ? avahi_open_unicast_socket_ipv6() : -1; + + s->watch_ipv4 = + s->watch_ipv6 = + s->watch_legacy_unicast_ipv4 = + s->watch_legacy_unicast_ipv6 = NULL; - s->watch_ipv4 = s->watch_ipv6 = s->watch_legacy_unicast_ipv4 = s->watch_legacy_unicast_ipv6 = NULL; - if (s->fd_ipv4 >= 0) - s->watch_ipv4 = s->poll_api->watch_new(s->poll_api, s->fd_ipv4, AVAHI_WATCH_IN, socket_event, s); + s->watch_ipv4 = s->poll_api->watch_new(s->poll_api, s->fd_ipv4, AVAHI_WATCH_IN, mcast_socket_event, s); if (s->fd_ipv6 >= 0) - s->watch_ipv6 = s->poll_api->watch_new(s->poll_api, s->fd_ipv6, AVAHI_WATCH_IN, socket_event, s); + s->watch_ipv6 = s->poll_api->watch_new(s->poll_api, s->fd_ipv6, AVAHI_WATCH_IN, mcast_socket_event, s); + if (s->fd_legacy_unicast_ipv4 >= 0) - s->watch_legacy_unicast_ipv4 = s->poll_api->watch_new(s->poll_api, s->fd_legacy_unicast_ipv4, AVAHI_WATCH_IN, socket_event, s); + s->watch_legacy_unicast_ipv4 = s->poll_api->watch_new(s->poll_api, s->fd_legacy_unicast_ipv4, AVAHI_WATCH_IN, legacy_unicast_socket_event, s); if (s->fd_legacy_unicast_ipv6 >= 0) - s->watch_legacy_unicast_ipv6 = s->poll_api->watch_new(s->poll_api, s->fd_legacy_unicast_ipv6, AVAHI_WATCH_IN, socket_event, s); + s->watch_legacy_unicast_ipv6 = s->poll_api->watch_new(s->poll_api, s->fd_legacy_unicast_ipv6, AVAHI_WATCH_IN, legacy_unicast_socket_event, s); return 0; } @@ -1309,13 +1360,13 @@ static int setup_sockets(AvahiServer *s) { AvahiServer *avahi_server_new(const AvahiPoll *poll_api, const AvahiServerConfig *sc, AvahiServerCallback callback, void* userdata, int *error) { AvahiServer *s; int e; - - if ((e = valid_server_config(sc)) < 0) { + + if (sc && (e = valid_server_config(sc)) < 0) { if (error) *error = e; return NULL; } - + if (!(s = avahi_new(AvahiServer, 1))) { if (error) *error = AVAHI_ERR_NO_MEMORY; @@ -1336,7 +1387,7 @@ AvahiServer *avahi_server_new(const AvahiPoll *poll_api, const AvahiServerConfig avahi_server_config_free(&s->config); avahi_free(s); - + return NULL; } @@ -1344,12 +1395,17 @@ AvahiServer *avahi_server_new(const AvahiPoll *poll_api, const AvahiServerConfig s->need_entry_cleanup = 0; s->need_group_cleanup = 0; s->need_browser_cleanup = 0; - - s->time_event_queue = avahi_time_event_queue_new(poll_api); - + s->cleanup_time_event = NULL; + s->hinfo_entry_group = NULL; + s->browse_domain_entry_group = NULL; + s->error = AVAHI_OK; + s->state = AVAHI_SERVER_INVALID; + s->callback = callback; s->userdata = userdata; - + + s->time_event_queue = avahi_time_event_queue_new(poll_api); + s->entries_by_key = avahi_hashmap_new((AvahiHashFunc) avahi_key_hash, (AvahiEqualFunc) avahi_key_equal, NULL, NULL); AVAHI_LLIST_HEAD_INIT(AvahiEntry, s->entries); AVAHI_LLIST_HEAD_INIT(AvahiGroup, s->groups); @@ -1366,44 +1422,41 @@ AvahiServer *avahi_server_new(const AvahiPoll *poll_api, const AvahiServerConfig s->legacy_unicast_reflect_slots = NULL; s->legacy_unicast_reflect_id = 0; - + + s->record_list = avahi_record_list_new(); + /* Get host name */ - s->host_name = s->config.host_name ? avahi_normalize_name(s->config.host_name) : avahi_get_host_name(); + s->host_name = s->config.host_name ? avahi_normalize_name_strdup(s->config.host_name) : avahi_get_host_name_strdup(); s->host_name[strcspn(s->host_name, ".")] = 0; - s->domain_name = s->config.domain_name ? avahi_normalize_name(s->config.domain_name) : avahi_strdup("local"); + s->domain_name = s->config.domain_name ? avahi_normalize_name_strdup(s->config.domain_name) : avahi_strdup("local"); s->host_name_fqdn = NULL; update_fqdn(s); - s->record_list = avahi_record_list_new(); + do { + s->local_service_cookie = (uint32_t) rand() * (uint32_t) rand(); + } while (s->local_service_cookie == AVAHI_SERVICE_COOKIE_INVALID); - s->state = AVAHI_SERVER_INVALID; + if (s->config.enable_wide_area) { + s->wide_area_lookup_engine = avahi_wide_area_engine_new(s); + avahi_wide_area_set_servers(s->wide_area_lookup_engine, s->config.wide_area_servers, s->config.n_wide_area_servers); + } else + s->wide_area_lookup_engine = NULL; + + s->multicast_lookup_engine = avahi_multicast_lookup_engine_new(s); s->monitor = avahi_interface_monitor_new(s); avahi_interface_monitor_sync(s->monitor); register_localhost(s); - - s->hinfo_entry_group = NULL; - s->browse_domain_entry_group = NULL; register_stuff(s); - s->error = AVAHI_OK; - return s; } void avahi_server_free(AvahiServer* s) { assert(s); - while(s->entries) - free_entry(s, s->entries); - - avahi_interface_monitor_free(s->monitor); - - while (s->groups) - free_group(s, s->groups); - - free_slots(s); + /* Remove all browsers */ while (s->dns_server_browsers) avahi_s_dns_server_browser_free(s->dns_server_browsers); @@ -1421,32 +1474,58 @@ void avahi_server_free(AvahiServer* s) { avahi_s_service_resolver_free(s->service_resolvers); while (s->record_browsers) avahi_s_record_browser_destroy(s->record_browsers); - - avahi_hashmap_free(s->record_browser_hashmap); + + /* Remove all locally rgeistered stuff */ + + while(s->entries) + avahi_entry_free(s, s->entries); + + avahi_interface_monitor_free(s->monitor); + + while (s->groups) + avahi_entry_group_free(s, s->groups); + + free_slots(s); + avahi_hashmap_free(s->entries_by_key); + avahi_record_list_free(s->record_list); + avahi_hashmap_free(s->record_browser_hashmap); + + if (s->wide_area_lookup_engine) + avahi_wide_area_engine_free(s->wide_area_lookup_engine); + avahi_multicast_lookup_engine_free(s->multicast_lookup_engine); + + if (s->cleanup_time_event) + avahi_time_event_free(s->cleanup_time_event); avahi_time_event_queue_free(s->time_event_queue); - avahi_record_list_free(s->record_list); + /* Free watches */ if (s->watch_ipv4) s->poll_api->watch_free(s->watch_ipv4); if (s->watch_ipv6) s->poll_api->watch_free(s->watch_ipv6); + if (s->watch_legacy_unicast_ipv4) s->poll_api->watch_free(s->watch_legacy_unicast_ipv4); if (s->watch_legacy_unicast_ipv6) s->poll_api->watch_free(s->watch_legacy_unicast_ipv6); - + + /* Free sockets */ + if (s->fd_ipv4 >= 0) close(s->fd_ipv4); if (s->fd_ipv6 >= 0) close(s->fd_ipv6); + if (s->fd_legacy_unicast_ipv4 >= 0) close(s->fd_legacy_unicast_ipv4); if (s->fd_legacy_unicast_ipv6 >= 0) close(s->fd_legacy_unicast_ipv6); + /* Free other stuff */ + avahi_free(s->host_name); avahi_free(s->domain_name); avahi_free(s->host_name_fqdn); @@ -1456,937 +1535,272 @@ void avahi_server_free(AvahiServer* s) { avahi_free(s); } -static int check_record_conflict(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, AvahiRecord *r, AvahiEntryFlags flags) { - AvahiEntry *e; - - assert(s); - assert(r); - - for (e = avahi_hashmap_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 == AVAHI_PROTO_UNSPEC || - e->protocol == AVAHI_PROTO_UNSPEC || - e->protocol == protocol)) - - return -1; - } - - return 0; -} - -int avahi_server_add( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiEntryFlags flags, - AvahiRecord *r) { - - AvahiEntry *e, *t; - - assert(s); - assert(r); - - if (r->ttl == 0) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_TTL); - - if (avahi_key_is_pattern(r->key)) - return avahi_server_set_errno(s, AVAHI_ERR_IS_PATTERN); - - if (!avahi_record_is_valid(r)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_RECORD); - - if (check_record_conflict(s, interface, protocol, r, flags) < 0) - return avahi_server_set_errno(s, AVAHI_ERR_LOCAL_COLLISION); - - if (!(e = avahi_new(AvahiEntry, 1))) - return avahi_server_set_errno(s, AVAHI_ERR_NO_NETWORK); - - e->server = s; - e->record = avahi_record_ref(r); - e->group = g; - e->interface = interface; - e->protocol = protocol; - e->flags = flags; - e->dead = 0; - - AVAHI_LLIST_HEAD_INIT(AvahiAnnouncement, e->announcements); - - AVAHI_LLIST_PREPEND(AvahiEntry, entries, s->entries, e); - - /* Insert into hash table indexed by name */ - t = avahi_hashmap_lookup(s->entries_by_key, e->record->key); - AVAHI_LLIST_PREPEND(AvahiEntry, by_key, t, e); - avahi_hashmap_replace(s->entries_by_key, e->record->key, t); - - /* Insert into group list */ - if (g) - AVAHI_LLIST_PREPEND(AvahiEntry, by_group, g->entries, e); - - avahi_announce_entry(s, e); - - return 0; -} - -const AvahiRecord *avahi_server_iterate(AvahiServer *s, AvahiSEntryGroup *g, void **state) { - AvahiEntry **e = (AvahiEntry**) state; +const char* avahi_server_get_domain_name(AvahiServer *s) { assert(s); - assert(e); - - if (!*e) - *e = g ? g->entries : s->entries; - - while (*e && (*e)->dead) - *e = g ? (*e)->by_group_next : (*e)->entries_next; - - if (!*e) - return NULL; - return avahi_record_ref((*e)->record); + return s->domain_name; } -int avahi_server_dump(AvahiServer *s, AvahiDumpCallback callback, void* userdata) { - AvahiEntry *e; - +const char* avahi_server_get_host_name(AvahiServer *s) { assert(s); - assert(callback); - - callback(";;; ZONE DUMP FOLLOWS ;;;", userdata); - - for (e = s->entries; e; e = e->entries_next) { - char *t; - char ln[256]; - - if (e->dead) - continue; - - if (!(t = avahi_record_to_string(e->record))) - return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - - snprintf(ln, sizeof(ln), "%s ; iface=%i proto=%i", t, e->interface, e->protocol); - avahi_free(t); - - callback(ln, userdata); - } - avahi_dump_caches(s->monitor, callback, userdata); - return AVAHI_OK; + return s->host_name; } -int avahi_server_add_ptr( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiEntryFlags flags, - uint32_t ttl, - const char *name, - const char *dest) { - - AvahiRecord *r; - int ret; - +const char* avahi_server_get_host_name_fqdn(AvahiServer *s) { assert(s); - assert(dest); - if (!(r = avahi_record_new_full(name ? name : s->host_name_fqdn, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR, ttl))) - return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - - r->data.ptr.name = avahi_normalize_name(dest); - ret = avahi_server_add(s, g, interface, protocol, flags, r); - avahi_record_unref(r); - return ret; + return s->host_name_fqdn; } -int avahi_server_add_address( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiEntryFlags flags, - const char *name, - AvahiAddress *a) { - - char *n = NULL; - int ret = AVAHI_OK; +void* avahi_server_get_data(AvahiServer *s) { assert(s); - assert(a); - - if (name) { - if (!(n = avahi_normalize_name(name))) - return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - - name = n; - } else - name = s->host_name_fqdn; - - if (!avahi_is_valid_domain_name(name)) { - ret = avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); - goto fail; - } - - if (a->family == AVAHI_PROTO_INET) { - char *reverse; - AvahiRecord *r; - if (!(r = avahi_record_new_full(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A, AVAHI_DEFAULT_TTL_HOST_NAME))) { - ret = avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - goto fail; - } - - r->data.a.address = a->data.ipv4; - ret = avahi_server_add(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE | AVAHI_ENTRY_ALLOWMUTIPLE, r); - avahi_record_unref(r); - - if (ret < 0) - goto fail; - - if (!(reverse = avahi_reverse_lookup_name_ipv4(&a->data.ipv4))) { - ret = avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - goto fail; - } - - ret = avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL_HOST_NAME, reverse, name); - avahi_free(reverse); - - } else { - char *reverse; - AvahiRecord *r; - - assert(a->family == AVAHI_PROTO_INET6); - - if (!(r = avahi_record_new_full(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA, AVAHI_DEFAULT_TTL_HOST_NAME))) { - ret = avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - goto fail; - } - - r->data.aaaa.address = a->data.ipv6; - ret = avahi_server_add(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE | AVAHI_ENTRY_ALLOWMUTIPLE, r); - avahi_record_unref(r); - - if (ret < 0) - goto fail; - - if (!(reverse = avahi_reverse_lookup_name_ipv6_arpa(&a->data.ipv6))) { - ret = avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - goto fail; - } - - ret = avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL_HOST_NAME, reverse, name); - avahi_free(reverse); - - if (ret < 0) - goto fail; - - if (!(reverse = avahi_reverse_lookup_name_ipv6_int(&a->data.ipv6))) { - ret = avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - goto fail; - } - - ret = avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL_HOST_NAME, reverse, name); - avahi_free(reverse); - } - -fail: - - avahi_free(n); - - return ret; + return s->userdata; } -static int server_add_txt_strlst_nocopy( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiEntryFlags flags, - uint32_t ttl, - const char *name, - AvahiStringList *strlst) { - - AvahiRecord *r; - int ret; - +void avahi_server_set_data(AvahiServer *s, void* userdata) { assert(s); - - if (!(r = avahi_record_new_full(name ? name : s->host_name_fqdn, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT, ttl))) - return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - - r->data.txt.string_list = strlst; - ret = avahi_server_add(s, g, interface, protocol, flags, r); - avahi_record_unref(r); - return ret; + s->userdata = userdata; } -int avahi_server_add_txt_strlst( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiEntryFlags flags, - uint32_t ttl, - const char *name, - AvahiStringList *strlst) { - +AvahiServerState avahi_server_get_state(AvahiServer *s) { assert(s); - return server_add_txt_strlst_nocopy(s, g, interface, protocol, flags, ttl, name, avahi_string_list_copy(strlst)); + return s->state; } -int avahi_server_add_txt_va( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiEntryFlags flags, - uint32_t ttl, - const char *name, - va_list va) { +AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) { + assert(c); - assert(s); + memset(c, 0, sizeof(AvahiServerConfig)); + c->use_ipv6 = 1; + c->use_ipv4 = 1; + c->allow_interfaces = NULL; + c->deny_interfaces = NULL; + c->host_name = NULL; + c->domain_name = NULL; + c->check_response_ttl = 0; + c->publish_hinfo = 0; + c->publish_addresses = 1; + c->publish_no_reverse = 0; + c->publish_workstation = 0; + c->publish_domain = 1; + c->use_iff_running = 0; + c->enable_reflector = 0; + c->reflect_ipv = 0; + c->add_service_cookie = 0; + c->enable_wide_area = 0; + c->n_wide_area_servers = 0; + c->disallow_other_stacks = 0; + c->browse_domains = NULL; + c->disable_publishing = 0; + c->allow_point_to_point = 0; + c->publish_aaaa_on_ipv4 = 1; + c->publish_a_on_ipv6 = 0; + c->n_cache_entries_max = AVAHI_DEFAULT_CACHE_ENTRIES_MAX; + c->ratelimit_interval = 0; + c->ratelimit_burst = 0; - return server_add_txt_strlst_nocopy(s, g, interface, protocol, flags, ttl, name, avahi_string_list_new_va(va)); + return c; } -int avahi_server_add_txt( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - AvahiEntryFlags flags, - uint32_t ttl, - const char *name, - ...) { - - va_list va; - int ret; - - assert(s); - - va_start(va, name); - ret = avahi_server_add_txt_va(s, g, interface, protocol, flags, ttl, name, va); - va_end(va); +void avahi_server_config_free(AvahiServerConfig *c) { + assert(c); - return ret; + avahi_free(c->host_name); + avahi_free(c->domain_name); + avahi_string_list_free(c->browse_domains); + avahi_string_list_free(c->allow_interfaces); + avahi_string_list_free(c->deny_interfaces); } -static void escape_service_name(char *d, size_t size, const char *s) { - assert(d); - assert(size); - assert(s); +AvahiServerConfig* avahi_server_config_copy(AvahiServerConfig *ret, const AvahiServerConfig *c) { + char *d = NULL, *h = NULL; + AvahiStringList *browse = NULL, *allow = NULL, *deny = NULL; + assert(ret); + assert(c); - while (*s && size >= 2) { - if (*s == '.' || *s == '\\') { - if (size < 3) - break; + if (c->host_name) + if (!(h = avahi_strdup(c->host_name))) + return NULL; - *(d++) = '\\'; - size--; + if (c->domain_name) + if (!(d = avahi_strdup(c->domain_name))) { + avahi_free(h); + return NULL; } - - *(d++) = *(s++); - size--; - } - - assert(size > 0); - *(d++) = 0; -} - -static int server_add_service_strlst_nocopy( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - const char *name, - const char *type, - const char *domain, - const char *host, - uint16_t port, - AvahiStringList *strlst) { - - char ptr_name[256], svc_name[256], ename[64], enum_ptr[256]; - char *t = NULL, *d = NULL, *h = NULL; - AvahiRecord *r = NULL; - int ret = AVAHI_OK; - - assert(s); - assert(type); - assert(name); - - if (!avahi_is_valid_service_name(name)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_SERVICE_NAME); - - if (!avahi_is_valid_service_type(type)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_SERVICE_TYPE); - - if (domain && !avahi_is_valid_domain_name(domain)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_DOMAIN_NAME); - - if (host && !avahi_is_valid_domain_name(host)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); - - escape_service_name(ename, sizeof(ename), name); - if (!domain) - domain = s->domain_name; - - if (!host) - host = s->host_name_fqdn; - - if (!(d = avahi_normalize_name(domain)) || - !(t = avahi_normalize_name(type)) || - !(h = avahi_normalize_name(host))) { - ret = avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - goto fail; + if (!(browse = avahi_string_list_copy(c->browse_domains)) && c->browse_domains) { + avahi_free(h); + avahi_free(d); + return NULL; } - snprintf(ptr_name, sizeof(ptr_name), "%s.%s", t, d); - snprintf(svc_name, sizeof(svc_name), "%s.%s.%s", ename, t, d); - - if ((ret = avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, AVAHI_DEFAULT_TTL, ptr_name, svc_name)) < 0) - goto fail; - - if (!(r = avahi_record_new_full(svc_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV, AVAHI_DEFAULT_TTL_HOST_NAME))) { - ret = avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - goto fail; + if (!(allow = avahi_string_list_copy(c->allow_interfaces)) && c->allow_interfaces) { + avahi_string_list_free(browse); + avahi_free(h); + avahi_free(d); + return NULL; } - - r->data.srv.priority = 0; - r->data.srv.weight = 0; - r->data.srv.port = port; - r->data.srv.name = h; - h = NULL; - ret = avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, r); - avahi_record_unref(r); - - if (ret < 0) - goto fail; - - ret = server_add_txt_strlst_nocopy(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL, svc_name, strlst); - strlst = NULL; - - if (ret < 0) - goto fail; - snprintf(enum_ptr, sizeof(enum_ptr), "_services._dns-sd._udp.%s", d); - ret = avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, AVAHI_DEFAULT_TTL, enum_ptr, ptr_name); + if (!(deny = avahi_string_list_copy(c->deny_interfaces)) && c->deny_interfaces) { + avahi_string_list_free(allow); + avahi_string_list_free(browse); + avahi_free(h); + avahi_free(d); + return NULL; + } -fail: - - avahi_free(d); - avahi_free(t); - avahi_free(h); + *ret = *c; + ret->host_name = h; + ret->domain_name = d; + ret->browse_domains = browse; + ret->allow_interfaces = allow; + ret->deny_interfaces = deny; - avahi_string_list_free(strlst); - return ret; } -int avahi_server_add_service_strlst( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - const char *name, - const char *type, - const char *domain, - const char *host, - uint16_t port, - AvahiStringList *strlst) { - +int avahi_server_errno(AvahiServer *s) { assert(s); - assert(type); - assert(name); - - return server_add_service_strlst_nocopy(s, g, interface, protocol, name, type, domain, host, port, avahi_string_list_copy(strlst)); -} - -int avahi_server_add_service_va( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - const char *name, - const char *type, - const char *domain, - const char *host, - uint16_t port, - va_list va){ - assert(s); - assert(type); - assert(name); - - return server_add_service_strlst_nocopy(s, g, interface, protocol, name, type, domain, host, port, avahi_string_list_new_va(va)); + return s->error; } -int avahi_server_add_service( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - const char *name, - const char *type, - const char *domain, - const char *host, - uint16_t port, - ... ){ - - va_list va; - int ret; - +/* Just for internal use */ +int avahi_server_set_errno(AvahiServer *s, int error) { assert(s); - assert(type); - assert(name); - - va_start(va, port); - ret = avahi_server_add_service_va(s, g, interface, protocol, name, type, domain, host, port, va); - va_end(va); - return ret; -} -static void hexstring(char *s, size_t sl, const void *p, size_t pl) { - static const char hex[] = "0123456789abcdef"; - int b = 0; - const uint8_t *k = p; - - while (sl > 1 && pl > 0) { - *(s++) = hex[(b ? *k : *k >> 4) & 0xF]; - - if (b) { - k++; - pl--; - } - - b = !b; - - sl--; - } - - if (sl > 0) - *s = 0; + return s->error = error; } -int avahi_server_add_dns_server_address( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - const char *domain, - AvahiDNSServerType type, - const AvahiAddress *address, - uint16_t port /** should be 53 */) { - - AvahiRecord *r; - int ret; - char n[64] = "ip-"; - - assert(s); - assert(address); - assert(type == AVAHI_DNS_SERVER_UPDATE || type == AVAHI_DNS_SERVER_RESOLVE); - assert(address->family == AVAHI_PROTO_INET || address->family == AVAHI_PROTO_INET6); - - if (port == 0) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_PORT); - - if (domain && !avahi_is_valid_domain_name(domain)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_DOMAIN_NAME); - - if (address->family == AVAHI_PROTO_INET) { - hexstring(n+3, sizeof(n)-3, &address->data, 4); - r = avahi_record_new_full(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A, AVAHI_DEFAULT_TTL_HOST_NAME); - r->data.a.address = address->data.ipv4; - } else { - hexstring(n+3, sizeof(n)-3, &address->data, 6); - r = avahi_record_new_full(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA, AVAHI_DEFAULT_TTL_HOST_NAME); - r->data.aaaa.address = address->data.ipv6; - } - - if (!r) - return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - - ret = avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE | AVAHI_ENTRY_ALLOWMUTIPLE, r); - avahi_record_unref(r); - - if (ret < 0) - return ret; - - return avahi_server_add_dns_server_name(s, g, interface, protocol, domain, type, n, port); -} - -int avahi_server_add_dns_server_name( - AvahiServer *s, - AvahiSEntryGroup *g, - AvahiIfIndex interface, - AvahiProtocol protocol, - const char *domain, - AvahiDNSServerType type, - const char *name, - uint16_t port /** should be 53 */) { - - int ret = -1; - char t[256], *d = NULL, *n = NULL; - AvahiRecord *r; - +uint32_t avahi_server_get_local_service_cookie(AvahiServer *s) { assert(s); - assert(name); - assert(type == AVAHI_DNS_SERVER_UPDATE || type == AVAHI_DNS_SERVER_RESOLVE); - - if (port == 0) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_PORT); - - if (!avahi_is_valid_domain_name(name)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); - - if (domain && !avahi_is_valid_domain_name(domain)) - return avahi_server_set_errno(s, AVAHI_ERR_INVALID_DOMAIN_NAME); - - - if (!domain) - domain = s->domain_name; - - if (!(n = avahi_normalize_name(name)) || - !(d = avahi_normalize_name(domain))) { - avahi_free(n); - avahi_free(d); - return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - } - - snprintf(t, sizeof(t), "%s.%s", type == AVAHI_DNS_SERVER_RESOLVE ? "_domain._udp" : "_dns-update._udp", d); - avahi_free(d); - - if (!(r = avahi_record_new_full(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV, AVAHI_DEFAULT_TTL_HOST_NAME))) { - avahi_free(n); - return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - } - - r->data.srv.priority = 0; - r->data.srv.weight = 0; - r->data.srv.port = port; - r->data.srv.name = n; - ret = avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_NULL, r); - avahi_record_unref(r); - return ret; + return s->local_service_cookie; } -static void post_query_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, void* userdata) { - AvahiKey *k = userdata; - - assert(m); - assert(i); - assert(k); - - avahi_interface_post_query(i, k, 0); -} +static AvahiEntry *find_entry(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, AvahiKey *key) { + AvahiEntry *e; -void avahi_server_post_query(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, AvahiKey *key) { assert(s); assert(key); - avahi_interface_monitor_walk(s->monitor, interface, protocol, post_query_callback, key); -} - -void avahi_s_entry_group_change_state(AvahiSEntryGroup *g, AvahiEntryGroupState state) { - assert(g); + for (e = avahi_hashmap_lookup(s->entries_by_key, key); e; e = e->by_key_next) - if (g->state == state) - return; + if ((e->interface == interface || e->interface <= 0 || interface <= 0) && + (e->protocol == protocol || e->protocol == AVAHI_PROTO_UNSPEC || protocol == AVAHI_PROTO_UNSPEC) && + (!e->group || e->group->state == AVAHI_ENTRY_GROUP_ESTABLISHED || e->group->state == AVAHI_ENTRY_GROUP_REGISTERING)) - assert(state <= AVAHI_ENTRY_GROUP_COLLISION); + return e; - g->state = state; - - if (g->callback) - g->callback(g->server, g, state, g->userdata); + return NULL; } -AvahiSEntryGroup *avahi_s_entry_group_new(AvahiServer *s, AvahiSEntryGroupCallback callback, void* userdata) { - AvahiSEntryGroup *g; - - assert(s); - - if (!(g = avahi_new(AvahiSEntryGroup, 1))) { - avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - return NULL; - } - - g->server = s; - g->callback = callback; - g->userdata = userdata; - g->dead = 0; - g->state = AVAHI_ENTRY_GROUP_UNCOMMITED; - g->n_probing = 0; - g->n_register_try = 0; - g->register_time_event = NULL; - g->register_time.tv_sec = 0; - g->register_time.tv_usec = 0; - AVAHI_LLIST_HEAD_INIT(AvahiEntry, g->entries); - - AVAHI_LLIST_PREPEND(AvahiSEntryGroup, groups, s->groups, g); - return g; -} - -void avahi_s_entry_group_free(AvahiSEntryGroup *g) { +int avahi_server_get_group_of_service(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, const char *name, const char *type, const char *domain, AvahiSEntryGroup** ret_group) { + AvahiKey *key = NULL; AvahiEntry *e; - - assert(g); - assert(g->server); - - for (e = g->entries; e; e = e->by_group_next) { - if (!e->dead) { - avahi_goodbye_entry(g->server, e, 1); - e->dead = 1; - } - } - - if (g->register_time_event) { - avahi_time_event_free(g->register_time_event); - g->register_time_event = NULL; - } - - g->dead = 1; - - g->server->need_group_cleanup = 1; - g->server->need_entry_cleanup = 1; -} - -static void entry_group_commit_real(AvahiSEntryGroup *g) { - assert(g); - - gettimeofday(&g->register_time, NULL); - - avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_REGISTERING); - - if (!g->dead) { - avahi_announce_group(g->server, g); - avahi_s_entry_group_check_probed(g, 0); - } -} - -static void entry_group_register_time_event_callback(AvahiTimeEvent *e, void* userdata) { - AvahiSEntryGroup *g = userdata; - assert(g); - -/* avahi_log_debug("Holdoff passed, waking up and going on."); */ - - avahi_time_event_free(g->register_time_event); - g->register_time_event = NULL; - - /* Holdoff time passed, so let's start probing */ - entry_group_commit_real(g); -} - -int avahi_s_entry_group_commit(AvahiSEntryGroup *g) { - struct timeval now; - - assert(g); - assert(!g->dead); - - if (g->state != AVAHI_ENTRY_GROUP_UNCOMMITED && g->state != AVAHI_ENTRY_GROUP_COLLISION) - return avahi_server_set_errno(g->server, AVAHI_ERR_BAD_STATE); + int ret; + char n[AVAHI_DOMAIN_NAME_MAX]; - g->n_register_try++; + assert(s); + assert(name); + assert(type); + assert(ret_group); - avahi_timeval_add(&g->register_time, - 1000*(g->n_register_try >= AVAHI_RR_RATE_LIMIT_COUNT ? - AVAHI_RR_HOLDOFF_MSEC_RATE_LIMIT : - AVAHI_RR_HOLDOFF_MSEC)); + AVAHI_CHECK_VALIDITY(s, AVAHI_IF_VALID(interface), AVAHI_ERR_INVALID_INTERFACE); + AVAHI_CHECK_VALIDITY(s, AVAHI_PROTO_VALID(protocol), AVAHI_ERR_INVALID_PROTOCOL); + AVAHI_CHECK_VALIDITY(s, avahi_is_valid_service_name(name), AVAHI_ERR_INVALID_SERVICE_NAME); + AVAHI_CHECK_VALIDITY(s, avahi_is_valid_service_type_strict(type), AVAHI_ERR_INVALID_SERVICE_TYPE); + AVAHI_CHECK_VALIDITY(s, !domain || avahi_is_valid_domain_name(domain), AVAHI_ERR_INVALID_DOMAIN_NAME); - gettimeofday(&now, NULL); + if ((ret = avahi_service_name_join(n, sizeof(n), name, type, domain) < 0)) + return avahi_server_set_errno(s, ret); - if (avahi_timeval_compare(&g->register_time, &now) <= 0) { - /* Holdoff time passed, so let's start probing */ -/* avahi_log_debug("Holdoff passed, directly going on."); */ + if (!(key = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV))) + return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); - entry_group_commit_real(g); - } else { -/* avahi_log_debug("Holdoff not passed, sleeping."); */ + e = find_entry(s, interface, protocol, key); + avahi_key_unref(key); - /* Holdoff time has not yet passed, so let's wait */ - assert(!g->register_time_event); - g->register_time_event = avahi_time_event_new(g->server->time_event_queue, &g->register_time, entry_group_register_time_event_callback, g); - - avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_REGISTERING); + if (e) { + *ret_group = e->group; + return AVAHI_OK; } - return AVAHI_OK; + return avahi_server_set_errno(s, AVAHI_ERR_NOT_FOUND); } -void avahi_s_entry_group_reset(AvahiSEntryGroup *g) { +int avahi_server_is_service_local(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, const char *name) { + AvahiKey *key = NULL; AvahiEntry *e; - assert(g); - - if (g->register_time_event) { - avahi_time_event_free(g->register_time_event); - g->register_time_event = NULL; - } - - for (e = g->entries; e; e = e->by_group_next) { - if (!e->dead) { - avahi_goodbye_entry(g->server, e, 1); - e->dead = 1; - } - } - - if (g->register_time_event) { - avahi_time_event_free(g->register_time_event); - g->register_time_event = NULL; - } - - g->server->need_entry_cleanup = 1; - g->n_probing = 0; - - avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_UNCOMMITED); -} - -int avahi_entry_is_commited(AvahiEntry *e) { - assert(e); - assert(!e->dead); - - return !e->group || - e->group->state == AVAHI_ENTRY_GROUP_REGISTERING || - e->group->state == AVAHI_ENTRY_GROUP_ESTABLISHED; -} -AvahiEntryGroupState avahi_s_entry_group_get_state(AvahiSEntryGroup *g) { - assert(g); - assert(!g->dead); + assert(s); + assert(name); - return g->state; -} + if (!s->host_name_fqdn) + return 0; -void avahi_s_entry_group_set_data(AvahiSEntryGroup *g, void* userdata) { - assert(g); + if (!(key = avahi_key_new(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV))) + return 0; - g->userdata = userdata; -} + e = find_entry(s, interface, protocol, key); + avahi_key_unref(key); -void* avahi_s_entry_group_get_data(AvahiSEntryGroup *g) { - assert(g); + if (!e) + return 0; - return g->userdata; + return avahi_domain_equal(s->host_name_fqdn, e->record->data.srv.name); } -int avahi_s_entry_group_is_empty(AvahiSEntryGroup *g) { +int avahi_server_is_record_local(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, AvahiRecord *record) { AvahiEntry *e; - assert(g); - /* Look for an entry that is not dead */ - for (e = g->entries; e; e = e->by_group_next) - if (!e->dead) - return 0; - - return 1; -} - -const char* avahi_server_get_domain_name(AvahiServer *s) { assert(s); + assert(record); - return s->domain_name; -} + for (e = avahi_hashmap_lookup(s->entries_by_key, record->key); e; e = e->by_key_next) -const char* avahi_server_get_host_name(AvahiServer *s) { - assert(s); + if ((e->interface == interface || e->interface <= 0 || interface <= 0) && + (e->protocol == protocol || e->protocol == AVAHI_PROTO_UNSPEC || protocol == AVAHI_PROTO_UNSPEC) && + (!e->group || e->group->state == AVAHI_ENTRY_GROUP_ESTABLISHED || e->group->state == AVAHI_ENTRY_GROUP_REGISTERING) && + avahi_record_equal_no_ttl(record, e->record)) + return 1; - return s->host_name; + return 0; } -const char* avahi_server_get_host_name_fqdn(AvahiServer *s) { +/** Set the wide area DNS servers */ +int avahi_server_set_wide_area_servers(AvahiServer *s, const AvahiAddress *a, unsigned n) { assert(s); - return s->host_name_fqdn; -} + if (!s->wide_area_lookup_engine) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_CONFIG); -void* avahi_server_get_data(AvahiServer *s) { - assert(s); - - return s->userdata; + avahi_wide_area_set_servers(s->wide_area_lookup_engine, a, n); + return AVAHI_OK; } -void avahi_server_set_data(AvahiServer *s, void* userdata) { +const AvahiServerConfig* avahi_server_get_config(AvahiServer *s) { assert(s); - s->userdata = userdata; + return &s->config; } -AvahiServerState avahi_server_get_state(AvahiServer *s) { - assert(s); - - return s->state; -} +/** Set the browsing domains */ +int avahi_server_set_browse_domains(AvahiServer *s, AvahiStringList *domains) { + AvahiStringList *l; -AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) { - assert(c); - - memset(c, 0, sizeof(AvahiServerConfig)); - c->use_ipv6 = 1; - c->use_ipv4 = 1; - c->host_name = NULL; - c->domain_name = NULL; - c->check_response_ttl = 0; - c->publish_hinfo = 1; - c->publish_addresses = 1; - c->publish_workstation = 1; - c->publish_domain = 1; - c->use_iff_running = 0; - c->enable_reflector = 0; - c->reflect_ipv = 0; - - return c; -} - -void avahi_server_config_free(AvahiServerConfig *c) { - assert(c); - - avahi_free(c->host_name); - avahi_free(c->domain_name); -} - -AvahiServerConfig* avahi_server_config_copy(AvahiServerConfig *ret, const AvahiServerConfig *c) { - char *d = NULL, *h = NULL; - assert(ret); - assert(c); - - if (c->host_name) - if (!(h = avahi_strdup(c->host_name))) - return NULL; - - if (c->domain_name) - if (!(d = avahi_strdup(c->domain_name))) { - avahi_free(h); - return NULL; - } - - *ret = *c; - ret->host_name = h; - ret->domain_name = d; - - return ret; -} - -int avahi_server_errno(AvahiServer *s) { assert(s); - - return s->error; -} -/* Just for internal use */ -int avahi_server_set_errno(AvahiServer *s, int error) { - assert(s); + for (l = s->config.browse_domains; l; l = l->next) + if (!avahi_is_valid_domain_name((char*) l->text)) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_DOMAIN_NAME); - return s->error = error; -} + avahi_string_list_free(s->config.browse_domains); + s->config.browse_domains = avahi_string_list_copy(domains); + return AVAHI_OK; +}