X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fserver.c;h=a1486f88935e52148d65d7c70fab7ebe6b9461e2;hb=6b391bb81f0dce0193a722254016b26c12a17643;hp=bd4f536268e82bedc462ff7602daf70ee526c13d;hpb=66142b071a2497d7e3cf58d7bf5159bb1c970d84;p=catta diff --git a/avahi-core/server.c b/avahi-core/server.c index bd4f536..a1486f8 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -30,111 +30,48 @@ #include #include #include +#include +#include -#include "server.h" -#include "util.h" +#include +#include +#include +#include + +#include "internal.h" #include "iface.h" #include "socket.h" #include "browse.h" #include "log.h" +#include "util.h" +#include "dns-srv-rr.h" -#define AVAHI_HOST_RR_HOLDOFF_MSEC 2000 - -static void free_entry(AvahiServer*s, AvahiEntry *e) { - AvahiEntry *t; - - g_assert(s); - g_assert(e); - - avahi_goodbye_entry(s, e, TRUE); - - /* Remove from linked list */ - AVAHI_LLIST_REMOVE(AvahiEntry, entries, s->entries, e); - - /* Remove from hash table indexed by name */ - t = g_hash_table_lookup(s->entries_by_key, e->record->key); - AVAHI_LLIST_REMOVE(AvahiEntry, by_key, t, e); - if (t) - g_hash_table_replace(s->entries_by_key, t->record->key, t); - else - g_hash_table_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); - g_free(e); -} - -static void free_group(AvahiServer *s, AvahiEntryGroup *g) { - g_assert(s); - g_assert(g); - - while (g->entries) - free_entry(s, g->entries); - - AVAHI_LLIST_REMOVE(AvahiEntryGroup, groups, s->groups, g); - g_free(g); -} - -static void cleanup_dead(AvahiServer *s) { - AvahiEntryGroup *g, *ng; - AvahiEntry *e, *ne; - g_assert(s); - - - if (s->need_group_cleanup) { - for (g = s->groups; g; g = ng) { - ng = g->groups_next; - - if (g->dead) - free_group(s, g); - } - - s->need_group_cleanup = FALSE; - } - - if (s->need_entry_cleanup) { - for (e = s->entries; e; e = ne) { - ne = e->entries_next; - - if (e->dead) - free_entry(s, e); - } - - s->need_entry_cleanup = FALSE; - } - - if (s->need_browser_cleanup) - avahi_browser_cleanup(s); -} - -static void enum_aux_records(AvahiServer *s, AvahiInterface *i, const gchar *name, guint16 type, void (*callback)(AvahiServer *s, AvahiRecord *r, gboolean flush_cache, gpointer userdata), gpointer userdata) { +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; - g_assert(s); - g_assert(i); - g_assert(name); - g_assert(callback); + assert(s); + assert(i); + assert(name); + assert(callback); - g_assert(type != AVAHI_DNS_TYPE_ANY); + assert(type != AVAHI_DNS_TYPE_ANY); - k = avahi_key_new(name, AVAHI_DNS_CLASS_IN, type); + if (!(k = avahi_key_new(name, AVAHI_DNS_CLASS_IN, type))) + return; /** OOM */ - for (e = g_hash_table_lookup(s->entries_by_key, k); e; e = e->by_key_next) - if (!e->dead && avahi_entry_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); } -void avahi_server_enumerate_aux_records(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, void (*callback)(AvahiServer *s, AvahiRecord *r, gboolean flush_cache, gpointer userdata), gpointer userdata) { - g_assert(s); - g_assert(i); - g_assert(r); - g_assert(callback); +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) { + assert(s); + assert(i); + assert(r); + assert(callback); if (r->key->clazz == AVAHI_DNS_CLASS_IN) { if (r->key->type == AVAHI_DNS_TYPE_PTR) { @@ -147,104 +84,109 @@ void avahi_server_enumerate_aux_records(AvahiServer *s, AvahiInterface *i, Avahi } } -void avahi_server_prepare_response(AvahiServer *s, AvahiInterface *i, AvahiEntry *e, gboolean unicast_response, gboolean auxiliary) { - g_assert(s); - g_assert(i); - g_assert(e); +void avahi_server_prepare_response(AvahiServer *s, AvahiInterface *i, AvahiEntry *e, int unicast_response, int auxiliary) { + assert(s); + 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, gboolean unicast_response) { +void avahi_server_prepare_matching_responses(AvahiServer *s, AvahiInterface *i, AvahiKey *k, int unicast_response) { AvahiEntry *e; -/* gchar *txt; */ +/* char *txt; */ - g_assert(s); - g_assert(i); - g_assert(k); + assert(s); + assert(i); + assert(k); /* avahi_log_debug("Posting responses matching [%s]", txt = avahi_key_to_string(k)); */ -/* g_free(txt); */ +/* avahi_free(txt); */ if (avahi_key_is_pattern(k)) { /* 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_registered(s, e, i)) - avahi_server_prepare_response(s, i, e, unicast_response, FALSE); + 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 { /* Handle all other queries */ - for (e = g_hash_table_lookup(s->entries_by_key, k); e; e = e->by_key_next) - if (!e->dead && avahi_entry_registered(s, e, i)) - avahi_server_prepare_response(s, i, e, unicast_response, FALSE); + 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); } } static void withdraw_entry(AvahiServer *s, AvahiEntry *e) { - g_assert(s); - g_assert(e); + assert(s); + assert(e); if (e->group) { AvahiEntry *k; for (k = e->group->entries; k; k = k->by_group_next) { - avahi_goodbye_entry(s, k, FALSE); - k->dead = TRUE; + if (!k->dead) { + avahi_goodbye_entry(s, k, 0, 1); + k->dead = 1; + } } - - avahi_entry_group_change_state(e->group, AVAHI_ENTRY_GROUP_COLLISION); + + e->group->n_probing = 0; + + avahi_s_entry_group_change_state(e->group, AVAHI_ENTRY_GROUP_COLLISION); } else { - avahi_goodbye_entry(s, e, FALSE); - e->dead = TRUE; + avahi_goodbye_entry(s, e, 0, 1); + e->dead = 1; } - s->need_entry_cleanup = TRUE; + s->need_entry_cleanup = 1; } static void withdraw_rrset(AvahiServer *s, AvahiKey *key) { AvahiEntry *e; - g_assert(s); - g_assert(key); + assert(s); + assert(key); - for (e = g_hash_table_lookup(s->entries_by_key, key); e; e = e->by_key_next) - withdraw_entry(s, e); + for (e = avahi_hashmap_lookup(s->entries_by_key, key); e; e = e->by_key_next) + if (!e->dead) + withdraw_entry(s, e); } static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) { AvahiEntry *e, *n; - gchar *t; - gboolean ours = FALSE, won = FALSE, lost = FALSE; + char *t; + int ours = 0, won = 0, lost = 0; - g_assert(s); - g_assert(record); - g_assert(i); + assert(s); + assert(record); + assert(i); t = avahi_record_to_string(record); /* avahi_log_debug("incoming_probe()"); */ - for (e = g_hash_table_lookup(s->entries_by_key, record->key); e; e = n) { - gint cmp; + for (e = avahi_hashmap_lookup(s->entries_by_key, record->key); e; e = n) { + int cmp; n = e->by_key_next; if (e->dead) continue; if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) { - ours = TRUE; + ours = 1; break; } else { - if (avahi_entry_probing(s, e, i)) { + if (avahi_entry_is_probing(s, e, i)) { if (cmp > 0) - won = TRUE; + won = 1; else /* cmp < 0 */ - lost = TRUE; + lost = 1; } } } @@ -260,43 +202,66 @@ static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface * /* avahi_log_debug("Not conflicting probe"); */ } - g_free(t); + avahi_free(t); } -static gboolean handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, gboolean unique, const AvahiAddress *a) { - gboolean valid = TRUE, ours = FALSE, conflict = FALSE, withdraw_immediately = FALSE; +static int handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, int unique, const AvahiAddress *a) { + int valid = 1, ours = 0, conflict = 0, withdraw_immediately = 0; AvahiEntry *e, *n, *conflicting_entry = NULL; - g_assert(s); - g_assert(i); - g_assert(record); + assert(s); + assert(i); + assert(record); /* avahi_log_debug("CHECKING FOR CONFLICT: [%s]", t); */ - for (e = g_hash_table_lookup(s->entries_by_key, record->key); e; e = n) { + 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("Recieved 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 = TRUE; /* We have an identical record, so this is no conflict */ + 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_registered(s, e, i)) { - gchar *t; + 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); - avahi_server_prepare_matching_responses(s, i, e->record->key, FALSE); - valid = FALSE; + avahi_server_prepare_matching_responses(s, i, e->record->key, 0); + valid = 0; - g_free(t); + avahi_free(t); } /* There's no need to check the other entries of this RRset */ @@ -304,19 +269,19 @@ static gboolean handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord * } else { - if (avahi_entry_registered(s, e, i)) { + if (avahi_entry_is_registered(s, e, i)) { /* A conflict => we have to return to probe mode */ - conflict = TRUE; + conflict = 1; conflicting_entry = e; - } else if (avahi_entry_probing(s, e, i)) { + } else if (avahi_entry_is_probing(s, e, i)) { /* We are currently registering a matching record, but * someone else already claimed it, so let's * withdraw */ - conflict = TRUE; - withdraw_immediately = TRUE; + conflict = 1; + withdraw_immediately = 1; } } } @@ -324,9 +289,9 @@ static gboolean handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord * /* avahi_log_debug("ours=%i conflict=%i", ours, conflict); */ if (!ours && conflict) { - gchar *t; + char *t; - valid = FALSE; + valid = 0; t = avahi_record_to_string(record); @@ -334,7 +299,7 @@ static gboolean handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord * avahi_log_debug("Recieved conflicting record [%s] with local record to be. Withdrawing.", t); withdraw_rrset(s, record->key); } else { - g_assert(conflicting_entry); + assert(conflicting_entry); avahi_log_debug("Recieved conflicting record [%s]. Resetting our record.", t); avahi_entry_return_to_initial_state(s, conflicting_entry, i); @@ -342,51 +307,52 @@ static gboolean handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord * * state. Local shared records are reannounced. */ } - g_free(t); + avahi_free(t); } return valid; } -static void append_aux_callback(AvahiServer *s, AvahiRecord *r, gboolean flush_cache, gpointer userdata) { - gboolean *unicast_response = userdata; +static void append_aux_callback(AvahiServer *s, AvahiRecord *r, int flush_cache, void* userdata) { + int *unicast_response = userdata; - g_assert(s); - g_assert(r); - g_assert(unicast_response); + assert(s); + assert(r); + assert(unicast_response); - avahi_record_list_push(s->record_list, r, flush_cache, *unicast_response, TRUE); + avahi_record_list_push(s->record_list, r, flush_cache, *unicast_response, 1); } -static void append_aux_records_to_list(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, gboolean unicast_response) { - g_assert(s); - g_assert(r); +static void append_aux_records_to_list(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, int unicast_response) { + assert(s); + assert(r); avahi_server_enumerate_aux_records(s, i, r, append_aux_callback, &unicast_response); } -void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, guint16 port, gboolean legacy_unicast, gboolean immediately) { +void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, uint16_t port, int legacy_unicast, int immediately) { - g_assert(s); - g_assert(i); - g_assert(!legacy_unicast || (a && port > 0 && p)); + assert(s); + assert(i); + assert(!legacy_unicast || (a && port > 0 && p)); if (legacy_unicast) { AvahiDnsPacket *reply; AvahiRecord *r; - reply = avahi_dns_packet_new_reply(p, 512 /* unicast DNS maximum packet size is 512 */ , TRUE, TRUE); + if (!(reply = avahi_dns_packet_new_reply(p, 512 /* 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, FALSE); + append_aux_records_to_list(s, i, r, 0); - if (avahi_dns_packet_append_record(reply, r, FALSE, 10)) + if (avahi_dns_packet_append_record(reply, r, 0, 10)) avahi_dns_packet_inc_field(reply, AVAHI_DNS_FIELD_ANCOUNT); else { - gchar *t = avahi_record_to_string(r); + char *t = avahi_record_to_string(r); avahi_log_warn("Record [%s] not fitting in legacy unicast packet, dropping.", t); - g_free(t); + avahi_free(t); } avahi_record_unref(r); @@ -398,14 +364,14 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP avahi_dns_packet_free(reply); } else { - gboolean unicast_response, flush_cache, auxiliary; + int unicast_response, flush_cache, auxiliary; AvahiDnsPacket *reply = NULL; AvahiRecord *r; /* In case the query packet was truncated never respond immediately, because known answer suppression records might be contained in later packets */ - gboolean tc = p && !!(avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_FLAGS) & AVAHI_DNS_FLAG_TC); + 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))) { @@ -420,8 +386,10 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP for (;;) { if (!reply) { - g_assert(p); - reply = avahi_dns_packet_new_reply(p, i->hardware->mtu, FALSE, FALSE); + 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)) { @@ -435,7 +403,7 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP } if (avahi_dns_packet_get_field(reply, AVAHI_DNS_FIELD_ANCOUNT) == 0) { - guint size; + size_t size; /* The record is too large for one packet, so create a larger packet */ @@ -443,14 +411,16 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP 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; - reply = avahi_dns_packet_new_reply(p, size, FALSE, TRUE); + + if (!(reply = avahi_dns_packet_new_reply(p, size, 0, 1))) + break; /* OOM */ if (!avahi_dns_packet_append_record(reply, r, flush_cache, 0)) { + char *t; avahi_dns_packet_free(reply); - - gchar *t = avahi_record_to_string(r); + t = avahi_record_to_string(r); avahi_log_warn("Record [%s] too large, doesn't fit in any packet!", t); - g_free(t); + avahi_free(t); break; } else avahi_dns_packet_inc_field(reply, AVAHI_DNS_FIELD_ANCOUNT); @@ -477,39 +447,39 @@ void avahi_server_generate_response(AvahiServer *s, AvahiInterface *i, AvahiDnsP } -static void reflect_response(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, gboolean flush_cache) { +static void reflect_response(AvahiServer *s, AvahiInterface *i, AvahiRecord *r, int flush_cache) { AvahiInterface *j; - g_assert(s); - g_assert(i); - g_assert(r); + assert(s); + assert(i); + assert(r); if (!s->config.enable_reflector) return; for (j = s->monitor->interfaces; j; j = j->interface_next) if (j != i && (s->config.reflect_ipv || j->protocol == i->protocol)) - avahi_interface_post_response(j, r, flush_cache, NULL, TRUE); + avahi_interface_post_response(j, r, flush_cache, NULL, 1); } -static gpointer reflect_cache_walk_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, gpointer userdata) { +static void* reflect_cache_walk_callback(AvahiCache *c, AvahiKey *pattern, AvahiCacheEntry *e, void* userdata) { AvahiServer *s = userdata; - g_assert(c); - g_assert(pattern); - g_assert(e); - g_assert(s); + assert(c); + assert(pattern); + assert(e); + assert(s); - avahi_record_list_push(s->record_list, e->record, e->cache_flush, FALSE, FALSE); + 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; - g_assert(s); - g_assert(i); - g_assert(k); + assert(s); + assert(i); + assert(k); if (!s->config.enable_reflector) return; @@ -517,7 +487,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, TRUE); + avahi_interface_post_query(j, k, 1); /* Reply from caches of other network. This is needed to * "work around" known answer suppression. */ @@ -529,45 +499,47 @@ static void reflect_query(AvahiServer *s, AvahiInterface *i, AvahiKey *k) { static void reflect_probe(AvahiServer *s, AvahiInterface *i, AvahiRecord *r) { AvahiInterface *j; - g_assert(s); - g_assert(i); - g_assert(r); + assert(s); + assert(i); + assert(r); if (!s->config.enable_reflector) return; for (j = s->monitor->interfaces; j; j = j->interface_next) if (j != i && (s->config.reflect_ipv || j->protocol == i->protocol)) - avahi_interface_post_probe(j, r, TRUE); + avahi_interface_post_probe(j, r, 1); } -static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a, guint16 port, gboolean legacy_unicast) { - guint n; - gboolean is_probe; +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; - g_assert(s); - g_assert(p); - g_assert(i); - g_assert(a); + assert(s); + assert(p); + assert(i); + assert(a); /* avahi_log_debug("query"); */ - g_assert(avahi_record_list_empty(s->record_list)); + 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; - gboolean unicast_response = FALSE; + int unicast_response = 0; if (!(key = avahi_dns_packet_consume_key(p, &unicast_response))) { avahi_log_warn("Packet too short (1)"); goto fail; } - if (!legacy_unicast) + if (!legacy_unicast && !from_local_iface) { reflect_query(s, i, key); + 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)) @@ -579,43 +551,48 @@ static void handle_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterfac avahi_key_unref(key); } - /* Known Answer Suppression */ - for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT); n > 0; n --) { - AvahiRecord *record; - gboolean unique = FALSE; - - if (!(record = avahi_dns_packet_consume_record(p, &unique))) { - avahi_log_warn("Packet too short (2)"); - goto fail; - } + if (!legacy_unicast) { - 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); + /* 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("Packet too short (2)"); + 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; - gboolean unique = FALSE; - - if (!(record = avahi_dns_packet_consume_record(p, &unique))) { - avahi_log_warn("Packet too short (3)"); - goto fail; - } - - if (!avahi_key_is_pattern(record->key)) { - reflect_probe(s, i, record); - incoming_probe(s, record, i); + /* 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 (!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_empty(s->record_list)) + if (!avahi_record_list_is_empty(s->record_list)) avahi_server_generate_response(s, i, p, a, port, legacy_unicast, is_probe); return; @@ -624,21 +601,21 @@ fail: avahi_record_list_flush(s->record_list); } -static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a) { - guint n; +static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a, int from_local_iface) { + unsigned n; - g_assert(s); - g_assert(p); - g_assert(i); - g_assert(a); + 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; - gboolean cache_flush = FALSE; -/* gchar *txt; */ + int cache_flush = 0; +/* char *txt; */ if (!(record = avahi_dns_packet_consume_record(p, &cache_flush))) { avahi_log_warn("Packet too short (4)"); @@ -648,10 +625,11 @@ static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInter if (!avahi_key_is_pattern(record->key)) { /* avahi_log_debug("Handling response: %s", txt = avahi_record_to_string(record)); */ -/* g_free(txt); */ +/* avahi_free(txt); */ if (handle_conflict(s, i, record, cache_flush, a)) { - reflect_response(s, i, record, cache_flush); + if (!from_local_iface) + 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); } @@ -663,18 +641,18 @@ static void handle_response_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInter /* If the incoming response contained a conflicting record, some records have been scheduling for sending. We need to flush them here. */ - if (!avahi_record_list_empty(s->record_list)) - avahi_server_generate_response(s, i, NULL, NULL, 0, FALSE, TRUE); + if (!avahi_record_list_is_empty(s->record_list)) + avahi_server_generate_response(s, i, NULL, NULL, 0, 0, 1); } static AvahiLegacyUnicastReflectSlot* allocate_slot(AvahiServer *s) { - guint n, idx = (guint) -1; + unsigned n, idx = (unsigned) -1; AvahiLegacyUnicastReflectSlot *slot; - g_assert(s); + assert(s); if (!s->legacy_unicast_reflect_slots) - s->legacy_unicast_reflect_slots = g_new0(AvahiLegacyUnicastReflectSlot*, AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS); + s->legacy_unicast_reflect_slots = avahi_new0(AvahiLegacyUnicastReflectSlot*, AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS); 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; @@ -683,34 +661,38 @@ static AvahiLegacyUnicastReflectSlot* allocate_slot(AvahiServer *s) { break; } - if (idx == (guint) -1 || s->legacy_unicast_reflect_slots[idx]) + if (idx == (unsigned) -1 || s->legacy_unicast_reflect_slots[idx]) return NULL; - slot = s->legacy_unicast_reflect_slots[idx] = g_new(AvahiLegacyUnicastReflectSlot, 1); + if (!(slot = avahi_new(AvahiLegacyUnicastReflectSlot, 1))) + return NULL; /* OOM */ + + s->legacy_unicast_reflect_slots[idx] = slot; slot->id = s->legacy_unicast_reflect_id++; slot->server = s; + return slot; } static void deallocate_slot(AvahiServer *s, AvahiLegacyUnicastReflectSlot *slot) { - guint idx; + unsigned idx; - g_assert(s); - g_assert(slot); + assert(s); + assert(slot); idx = slot->id % AVAHI_MAX_LEGACY_UNICAST_REFLECT_SLOTS; - g_assert(s->legacy_unicast_reflect_slots[idx] == slot); + assert(s->legacy_unicast_reflect_slots[idx] == slot); - avahi_time_event_queue_remove(s->time_event_queue, slot->time_event); + avahi_time_event_free(slot->time_event); - g_free(slot); + avahi_free(slot); s->legacy_unicast_reflect_slots[idx] = NULL; } static void free_slots(AvahiServer *s) { - guint idx; - g_assert(s); + unsigned idx; + assert(s); if (!s->legacy_unicast_reflect_slots) return; @@ -719,14 +701,14 @@ static void free_slots(AvahiServer *s) { if (s->legacy_unicast_reflect_slots[idx]) deallocate_slot(s, s->legacy_unicast_reflect_slots[idx]); - g_free(s->legacy_unicast_reflect_slots); + avahi_free(s->legacy_unicast_reflect_slots); s->legacy_unicast_reflect_slots = NULL; } -static AvahiLegacyUnicastReflectSlot* find_slot(AvahiServer *s, guint16 id) { - guint idx; +static AvahiLegacyUnicastReflectSlot* find_slot(AvahiServer *s, uint16_t id) { + unsigned idx; - g_assert(s); + assert(s); if (!s->legacy_unicast_reflect_slots) return NULL; @@ -742,28 +724,28 @@ static AvahiLegacyUnicastReflectSlot* find_slot(AvahiServer *s, guint16 id) { static void legacy_unicast_reflect_slot_timeout(AvahiTimeEvent *e, void *userdata) { AvahiLegacyUnicastReflectSlot *slot = userdata; - g_assert(e); - g_assert(slot); - g_assert(slot->time_event == e); + assert(e); + assert(slot); + assert(slot->time_event == e); deallocate_slot(slot->server, slot); } -static void reflect_legacy_unicast_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a, guint16 port) { +static void reflect_legacy_unicast_query_packet(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a, uint16_t port) { AvahiLegacyUnicastReflectSlot *slot; AvahiInterface *j; - g_assert(s); - g_assert(p); - g_assert(i); - g_assert(a); - g_assert(port > 0); - g_assert(i->protocol == a->family); + assert(s); + assert(p); + assert(i); + assert(a); + assert(port > 0); + assert(i->protocol == a->proto); if (!s->config.enable_reflector) return; -/* avahi_log_debug("legacy unicast reflectr"); */ +/* avahi_log_debug("legacy unicast reflector"); */ /* Reflecting legacy unicast queries is a little more complicated than reflecting normal queries, since we must route the @@ -785,13 +767,13 @@ static void reflect_legacy_unicast_query_packet(AvahiServer *s, AvahiDnsPacket * slot->interface = i->hardware->index; avahi_elapse_time(&slot->elapse_time, 2000, 0); - slot->time_event = avahi_time_event_queue_add(s->time_event_queue, &slot->elapse_time, legacy_unicast_reflect_slot_timeout, slot); + 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 */ 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 (avahi_interface_is_relevant(j) && j != i && (s->config.reflect_ipv || j->protocol == i->protocol)) { @@ -805,24 +787,24 @@ static void reflect_legacy_unicast_query_packet(AvahiServer *s, AvahiDnsPacket * avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_ID, slot->original_id); } -static gboolean originates_from_local_legacy_unicast_socket(AvahiServer *s, const struct sockaddr *sa) { +static int originates_from_local_legacy_unicast_socket(AvahiServer *s, const struct sockaddr *sa) { AvahiAddress a; - g_assert(s); - g_assert(sa); + assert(s); + assert(sa); if (!s->config.enable_reflector) - return FALSE; + return 0; avahi_address_from_sockaddr(sa, &a); if (!avahi_address_is_local(s->monitor, &a)) - return FALSE; + return 0; if (sa->sa_family == AF_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; @@ -833,36 +815,49 @@ static gboolean originates_from_local_legacy_unicast_socket(AvahiServer *s, cons 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 FALSE; + return 0; } -static gboolean is_mdns_mcast_address(const AvahiAddress *a) { +static int is_mdns_mcast_address(const AvahiAddress *a) { AvahiAddress b; - g_assert(a); + 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, gint 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 struct sockaddr *sa, AvahiAddress *dest, AvahiIfIndex iface, int ttl) { AvahiInterface *i; AvahiAddress a; - guint16 port; + uint16_t port; + int from_local_iface = 0; - g_assert(s); - g_assert(p); - g_assert(sa); - g_assert(dest); - g_assert(iface > 0); + assert(s); + assert(p); + assert(sa); + assert(dest); + assert(iface > 0); - if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, sa->sa_family)) || - !avahi_interface_relevant(i)) { + if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, avahi_af_to_proto(sa->sa_family))) || + !avahi_interface_is_relevant(i)) { avahi_log_warn("Recieved packet from invalid interface."); return; } @@ -880,13 +875,17 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const struct sock /* This originates from our local reflector, so let's ignore it */ return; - if (avahi_dns_packet_check_valid(p) < 0) { + /* 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, &a, port); + + if (avahi_dns_packet_check_valid_multicast(p) < 0) { avahi_log_warn("Recieved invalid packet."); return; } if (avahi_dns_packet_is_query(p)) { - gboolean legacy_unicast = FALSE; + int legacy_unicast = 0; if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ARCOUNT) != 0) { avahi_log_warn("Invalid query packet."); @@ -902,13 +901,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const struct sock return; } - legacy_unicast = TRUE; + 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); + handle_query_packet(s, p, i, &a, port, legacy_unicast, from_local_iface); /* avahi_log_debug("Handled query"); */ } else { @@ -935,31 +934,29 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const struct sock return; } - handle_response_packet(s, p, i, &a); + handle_response_packet(s, p, i, &a, from_local_iface); /* avahi_log_debug("Handled response"); */ } } -static void dispatch_legacy_unicast_packet(AvahiServer *s, AvahiDnsPacket *p, const struct sockaddr *sa, AvahiIfIndex iface, gint ttl) { +static void dispatch_legacy_unicast_packet(AvahiServer *s, AvahiDnsPacket *p, const struct sockaddr *sa, AvahiIfIndex iface) { AvahiInterface *i, *j; AvahiAddress a; - guint16 port; AvahiLegacyUnicastReflectSlot *slot; - g_assert(s); - g_assert(p); - g_assert(sa); - g_assert(iface > 0); + 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)) { + if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, avahi_af_to_proto(sa->sa_family))) || + !avahi_interface_is_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)) @@ -976,8 +973,8 @@ static void dispatch_legacy_unicast_packet(AvahiServer *s, AvahiDnsPacket *p, co 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)) || + !avahi_interface_is_relevant(j)) return; /* Patch the original ID into this response */ @@ -990,93 +987,63 @@ 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 work(AvahiServer *s) { - struct sockaddr_in6 sa6; - struct sockaddr_in sa; - AvahiAddress dest; - AvahiDnsPacket *p; - gint iface = 0; - guint8 ttl; - - g_assert(s); - - if (s->fd_ipv4 >= 0 && (s->pollfd_ipv4.revents & G_IO_IN)) { - 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); - } - } - - if (s->fd_ipv6 >= 0 && (s->pollfd_ipv6.revents & G_IO_IN)) { - dest.family = AVAHI_PROTO_INET6; - 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); - } - } - - if (s->fd_legacy_unicast_ipv4 >= 0 && (s->pollfd_legacy_unicast_ipv4.revents & G_IO_IN)) { - 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); - } - } - - if (s->fd_legacy_unicast_ipv6 >= 0 && (s->pollfd_legacy_unicast_ipv6.revents & G_IO_IN)) { - 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); - } - } -} - -static gboolean prepare_func(GSource *source, gint *timeout) { - g_assert(source); - g_assert(timeout); +static void cleanup_dead(AvahiServer *s) { + assert(s); - *timeout = -1; - return FALSE; + avahi_cleanup_dead_entries(s); + avahi_browser_cleanup(s); } -static gboolean check_func(GSource *source) { - AvahiServer* s; - gushort revents = 0; - - g_assert(source); +static void socket_event(AvahiWatch *w, int fd, AvahiWatchEvent events, void *userdata) { + AvahiServer *s = userdata; + AvahiAddress dest; + AvahiDnsPacket *p; + AvahiIfIndex iface; + uint8_t ttl; + struct sockaddr_in sa; + struct sockaddr_in6 sa6; - s = *((AvahiServer**) (((guint8*) source) + sizeof(GSource))); - g_assert(s); + assert(w); + assert(fd >= 0); - if (s->fd_ipv4 >= 0) - revents |= s->pollfd_ipv4.revents; - if (s->fd_ipv6 >= 0) - revents |= s->pollfd_ipv6.revents; - if (s->fd_legacy_unicast_ipv4 >= 0) - revents |= s->pollfd_legacy_unicast_ipv4.revents; - if (s->fd_legacy_unicast_ipv6 >= 0) - revents |= s->pollfd_legacy_unicast_ipv6.revents; + if (events & AVAHI_WATCH_IN) { - return !!(revents & (G_IO_IN | G_IO_HUP | G_IO_ERR)); -} - -static gboolean dispatch_func(GSource *source, GSourceFunc callback, gpointer user_data) { - AvahiServer* s; - g_assert(source); - - s = *((AvahiServer**) (((guint8*) source) + sizeof(GSource))); - g_assert(s); + if (fd == s->fd_ipv4) { + dest.proto = 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.proto = AVAHI_PROTO_INET6; - work(s); - cleanup_dead(s); + 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.proto = 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); + avahi_dns_packet_free(p); + } + } else if (fd == s->fd_legacy_unicast_ipv6) { + dest.proto = 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); + avahi_dns_packet_free(p); + } + } - return TRUE; + cleanup_dead(s); + } else + abort(); } static void server_set_state(AvahiServer *s, AvahiServerState state) { - g_assert(s); + assert(s); if (s->state == state) return; @@ -1088,48 +1055,40 @@ static void server_set_state(AvahiServer *s, AvahiServerState state) { } static void withdraw_host_rrs(AvahiServer *s) { - g_assert(s); + assert(s); - if (s->hinfo_entry_group) { - avahi_entry_group_free(s->hinfo_entry_group); - s->hinfo_entry_group = NULL; - } + if (s->hinfo_entry_group) + avahi_s_entry_group_reset(s->hinfo_entry_group); - if (s->browse_domain_entry_group) { - avahi_entry_group_free(s->browse_domain_entry_group); - s->browse_domain_entry_group = NULL; - } + if (s->browse_domain_entry_group) + avahi_s_entry_group_reset(s->browse_domain_entry_group); - avahi_update_host_rrs(s->monitor, TRUE); + avahi_interface_monitor_update_rrs(s->monitor, 1); s->n_host_rr_pending = 0; } void avahi_server_decrease_host_rr_pending(AvahiServer *s) { - g_assert(s); + assert(s); - g_assert(s->n_host_rr_pending > 0); + 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) { - g_assert(s); - - s->n_host_rr_pending ++; -} - -void avahi_host_rr_entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) { - g_assert(s); - g_assert(g); +void avahi_host_rr_entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, 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); @@ -1139,227 +1098,271 @@ static void register_hinfo(AvahiServer *s) { struct utsname utsname; AvahiRecord *r; - g_assert(s); + assert(s); - if (!s->config.publish_hinfo || s->hinfo_entry_group) + if (!s->config.publish_hinfo) return; - - s->hinfo_entry_group = avahi_entry_group_new(s, avahi_host_rr_entry_group_callback, NULL); + + if (s->hinfo_entry_group) + assert(avahi_s_entry_group_is_empty(s->hinfo_entry_group)); + else + s->hinfo_entry_group = avahi_s_entry_group_new(s, avahi_host_rr_entry_group_callback, NULL); + + if (!s->hinfo_entry_group) { + avahi_log_warn("Failed to create HINFO entry group: %s", avahi_strerror(s->error)); + return; + } /* Fill in HINFO rr */ - 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 = g_strdup(g_strup(utsname.machine)); - r->data.hinfo.os = g_strdup(g_strup(utsname.sysname)); - avahi_server_add(s, s->hinfo_entry_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_ENTRY_UNIQUE, r); - avahi_record_unref(r); - - avahi_entry_group_commit(s->hinfo_entry_group); + 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_PUBLISH_UNIQUE, r) < 0) { + avahi_log_warn("Failed to add HINFO RR: %s", avahi_strerror(s->error)); + return; + } + + avahi_record_unref(r); + } + + if (avahi_s_entry_group_commit(s->hinfo_entry_group) < 0) + avahi_log_warn("Failed to commit HINFO entry group: %s", avahi_strerror(s->error)); + } static void register_localhost(AvahiServer *s) { AvahiAddress a; - g_assert(s); + 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) { - g_assert(s); + assert(s); + + if (!s->config.publish_domain) + return; - if (!s->config.publish_domain || s->browse_domain_entry_group) + if (s->browse_domain_entry_group) + assert(avahi_s_entry_group_is_empty(s->browse_domain_entry_group)); + else + s->browse_domain_entry_group = avahi_s_entry_group_new(s, NULL, NULL); + + if (!s->browse_domain_entry_group) { + 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; + } - s->browse_domain_entry_group = avahi_entry_group_new(s, NULL, NULL); - 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); - avahi_entry_group_commit(s->browse_domain_entry_group); + if (avahi_s_entry_group_commit(s->browse_domain_entry_group) < 0) + avahi_log_warn("Failed to commit browse domain entry group: %s", avahi_strerror(s->error)); } static void register_stuff(AvahiServer *s) { - g_assert(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 */ + register_hinfo(s); register_browse_domain(s); - avahi_update_host_rrs(s->monitor, FALSE); + avahi_interface_monitor_update_rrs(s->monitor, 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) { - g_assert(s); - - g_assert(s->host_name); - g_assert(s->domain_name); - - g_free(s->host_name_fqdn); - s->host_name_fqdn = g_strdup_printf("%s.%s", s->host_name, s->domain_name); -} - -static void register_time_event_callback(AvahiTimeEvent *e, gpointer userdata) { - AvahiServer *s = userdata; + char *n; - g_assert(e); - g_assert(s); + assert(s); + assert(s->host_name); + assert(s->domain_name); - g_assert(e == s->register_time_event); - avahi_time_event_queue_remove(s->time_event_queue, s->register_time_event); - s->register_time_event = NULL; + if (!(n = avahi_strdup_printf("%s.%s", s->host_name, s->domain_name))) + return; /* OOM */ - if (s->state == AVAHI_SERVER_SLEEPING) - register_stuff(s); + avahi_free(s->host_name_fqdn); + s->host_name_fqdn = n; } -static void delayed_register_stuff(AvahiServer *s) { - GTimeVal tv; - - g_assert(s); +int avahi_server_set_host_name(AvahiServer *s, const char *host_name) { + assert(s); + assert(host_name); - avahi_elapse_time(&tv, AVAHI_HOST_RR_HOLDOFF_MSEC, 0); - - if (s->register_time_event) - avahi_time_event_queue_update(s->time_event_queue, s->register_time_event, &tv); - else - s->register_time_event = avahi_time_event_queue_add(s->time_event_queue, &tv, register_time_event_callback, s); -} + if (host_name && !avahi_is_valid_host_name(host_name)) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_HOST_NAME); -gint avahi_server_set_host_name(AvahiServer *s, const gchar *host_name) { - g_assert(s); - g_assert(host_name); - - server_set_state(s, AVAHI_SERVER_SLEEPING); withdraw_host_rrs(s); - g_free(s->host_name); - s->host_name = host_name ? avahi_normalize_name(host_name) : avahi_get_host_name(); + avahi_free(s->host_name); + s->host_name = host_name ? avahi_normalize_name_strdup(host_name) : avahi_get_host_name_strdup(); s->host_name[strcspn(s->host_name, ".")] = 0; update_fqdn(s); - delayed_register_stuff(s); - return 0; + register_stuff(s); + return AVAHI_OK; } -gint avahi_server_set_domain_name(AvahiServer *s, const gchar *domain_name) { - g_assert(s); - g_assert(domain_name); +int avahi_server_set_domain_name(AvahiServer *s, const char *domain_name) { + 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); - server_set_state(s, AVAHI_SERVER_SLEEPING); withdraw_host_rrs(s); - g_free(s->domain_name); - s->domain_name = domain_name ? avahi_normalize_name(domain_name) : g_strdup("local"); + avahi_free(s->domain_name); + s->domain_name = domain_name ? avahi_normalize_name_strdup(domain_name) : avahi_strdup("local"); update_fqdn(s); - delayed_register_stuff(s); - return 0; + register_stuff(s); + return AVAHI_OK; } +static int valid_server_config(const AvahiServerConfig *sc) { -static void prepare_pollfd(AvahiServer *s, GPollFD *pollfd, gint fd) { - g_assert(s); - g_assert(pollfd); - g_assert(fd >= 0); - - memset(pollfd, 0, sizeof(GPollFD)); - pollfd->fd = fd; - pollfd->events = G_IO_IN|G_IO_ERR|G_IO_HUP; - g_source_add_poll(s->source, pollfd); -} - -AvahiServer *avahi_server_new(GMainContext *c, const AvahiServerConfig *sc, AvahiServerCallback callback, gpointer userdata) { - AvahiServer *s; + if (sc->host_name && !avahi_is_valid_host_name(sc->host_name)) + return AVAHI_ERR_INVALID_HOST_NAME; - static GSourceFuncs source_funcs = { - prepare_func, - check_func, - dispatch_func, - NULL, - NULL, - NULL - }; + if (sc->domain_name && !avahi_is_valid_domain_name(sc->domain_name)) + return AVAHI_ERR_INVALID_DOMAIN_NAME; - s = g_new(AvahiServer, 1); - s->n_host_rr_pending = 0; - s->need_entry_cleanup = s->need_group_cleanup = s->need_browser_cleanup = FALSE; + return AVAHI_OK; +} - if (sc) - avahi_server_config_copy(&s->config, sc); - else - avahi_server_config_init(&s->config); +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) { - g_critical("Selected neither IPv6 nor IPv4 support, aborting.\n"); - avahi_server_config_free(&s->config); - g_free(s); - return NULL; - } + if (s->fd_ipv6 < 0 && s->fd_ipv4 < 0) + return AVAHI_ERR_NO_NETWORK; if (s->fd_ipv4 < 0 && s->config.use_ipv4) 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_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; - - 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*)); - *((AvahiServer**) (((guint8*) s->source) + sizeof(GSource))) = s; - + 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; + if (s->fd_ipv4 >= 0) - prepare_pollfd(s, &s->pollfd_ipv4, s->fd_ipv4); + s->watch_ipv4 = s->poll_api->watch_new(s->poll_api, s->fd_ipv4, AVAHI_WATCH_IN, socket_event, s); if (s->fd_ipv6 >= 0) - prepare_pollfd(s, &s->pollfd_ipv6, s->fd_ipv6); + s->watch_ipv6 = s->poll_api->watch_new(s->poll_api, s->fd_ipv6, AVAHI_WATCH_IN, socket_event, s); + if (s->fd_legacy_unicast_ipv4 >= 0) - prepare_pollfd(s, &s->pollfd_legacy_unicast_ipv4, s->fd_legacy_unicast_ipv4); + s->watch_legacy_unicast_ipv4 = s->poll_api->watch_new(s->poll_api, s->fd_legacy_unicast_ipv4, AVAHI_WATCH_IN, socket_event, s); if (s->fd_legacy_unicast_ipv6 >= 0) - prepare_pollfd(s, &s->pollfd_legacy_unicast_ipv6, s->fd_legacy_unicast_ipv6); + s->watch_legacy_unicast_ipv6 = s->poll_api->watch_new(s->poll_api, s->fd_legacy_unicast_ipv6, AVAHI_WATCH_IN, socket_event, s); + + return 0; +} + +AvahiServer *avahi_server_new(const AvahiPoll *poll_api, const AvahiServerConfig *sc, AvahiServerCallback callback, void* userdata, int *error) { + AvahiServer *s; + int e; - g_source_attach(s->source, s->context); + 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; + + return NULL; + } + + s->poll_api = poll_api; + + if (sc) + avahi_server_config_copy(&s->config, sc); + else + avahi_server_config_init(&s->config); + + if ((e = setup_sockets(s)) < 0) { + if (error) + *error = e; + + avahi_server_config_free(&s->config); + avahi_free(s); + + return NULL; + } + + + s->n_host_rr_pending = 0; + 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->callback = callback; s->userdata = userdata; + s->entries_by_key = avahi_hashmap_new((AvahiHashFunc) avahi_key_hash, (AvahiEqualFunc) avahi_key_equal, NULL, NULL); AVAHI_LLIST_HEAD_INIT(AvahiEntry, s->entries); - s->entries_by_key = g_hash_table_new((GHashFunc) avahi_key_hash, (GEqualFunc) avahi_key_equal); AVAHI_LLIST_HEAD_INIT(AvahiGroup, s->groups); - AVAHI_LLIST_HEAD_INIT(AvahiRecordBrowser, s->record_browsers); - s->record_browser_hashtable = g_hash_table_new((GHashFunc) avahi_key_hash, (GEqualFunc) avahi_key_equal); - AVAHI_LLIST_HEAD_INIT(AvahiHostNameResolver, s->host_name_resolvers); - AVAHI_LLIST_HEAD_INIT(AvahiAddressResolver, s->address_resolvers); - AVAHI_LLIST_HEAD_INIT(AvahiDomainBrowser, s->domain_browsers); - AVAHI_LLIST_HEAD_INIT(AvahiServiceTypeBrowser, s->service_type_browsers); - AVAHI_LLIST_HEAD_INIT(AvahiServiceBrowser, s->service_browsers); - AVAHI_LLIST_HEAD_INIT(AvahiServiceResolver, s->service_resolvers); - AVAHI_LLIST_HEAD_INIT(AvahiDNSServerBrowser, s->dns_server_browsers); + s->record_browser_hashmap = avahi_hashmap_new((AvahiHashFunc) avahi_key_hash, (AvahiEqualFunc) avahi_key_equal, NULL, NULL); + AVAHI_LLIST_HEAD_INIT(AvahiSRecordBrowser, s->record_browsers); + AVAHI_LLIST_HEAD_INIT(AvahiSHostNameResolver, s->host_name_resolvers); + AVAHI_LLIST_HEAD_INIT(AvahiSAddressResolver, s->address_resolvers); + AVAHI_LLIST_HEAD_INIT(AvahiSDomainBrowser, s->domain_browsers); + AVAHI_LLIST_HEAD_INIT(AvahiSServiceTypeBrowser, s->service_type_browsers); + AVAHI_LLIST_HEAD_INIT(AvahiSServiceBrowser, s->service_browsers); + AVAHI_LLIST_HEAD_INIT(AvahiSServiceResolver, s->service_resolvers); + AVAHI_LLIST_HEAD_INIT(AvahiSDNSServerBrowser, s->dns_server_browsers); s->legacy_unicast_reflect_slots = NULL; s->legacy_unicast_reflect_id = 0; + + 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); + + do { + s->local_service_cookie = (uint32_t) rand() * (uint32_t) rand(); + } while (s->local_service_cookie == AVAHI_SERVICE_COOKIE_INVALID); /* 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) : g_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(); - s->time_event_queue = avahi_time_event_queue_new(s->context, G_PRIORITY_DEFAULT+10); /* Slightly less priority than the FDs */ - s->register_time_event = NULL; - s->state = AVAHI_SERVER_INVALID; s->monitor = avahi_interface_monitor_new(s); @@ -1370,728 +1373,305 @@ AvahiServer *avahi_server_new(GMainContext *c, const AvahiServerConfig *sc, Avah 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) { - g_assert(s); - - while(s->entries) - free_entry(s, s->entries); - - avahi_interface_monitor_free(s->monitor); + assert(s); - while (s->groups) - free_group(s, s->groups); - - free_slots(s); + /* Remove all browsers */ while (s->dns_server_browsers) - avahi_dns_server_browser_free(s->dns_server_browsers); + avahi_s_dns_server_browser_free(s->dns_server_browsers); while (s->host_name_resolvers) - avahi_host_name_resolver_free(s->host_name_resolvers); + avahi_s_host_name_resolver_free(s->host_name_resolvers); while (s->address_resolvers) - avahi_address_resolver_free(s->address_resolvers); + avahi_s_address_resolver_free(s->address_resolvers); while (s->domain_browsers) - avahi_domain_browser_free(s->domain_browsers); + avahi_s_domain_browser_free(s->domain_browsers); while (s->service_type_browsers) - avahi_service_type_browser_free(s->service_type_browsers); + avahi_s_service_type_browser_free(s->service_type_browsers); while (s->service_browsers) - avahi_service_browser_free(s->service_browsers); + avahi_s_service_browser_free(s->service_browsers); while (s->service_resolvers) - avahi_service_resolver_free(s->service_resolvers); + avahi_s_service_resolver_free(s->service_resolvers); while (s->record_browsers) - avahi_record_browser_destroy(s->record_browsers); - g_hash_table_destroy(s->record_browser_hashtable); + avahi_s_record_browser_destroy(s->record_browsers); + + /* Remove all locally rgeistered stuff */ - g_hash_table_destroy(s->entries_by_key); + while(s->entries) + avahi_entry_free(s, s->entries); - if (s->register_time_event) - avahi_time_event_queue_remove(s->time_event_queue, s->register_time_event); - avahi_time_event_queue_free(s->time_event_queue); + 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); + + avahi_time_event_queue_free(s->time_event_queue); + + /* 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); - - g_free(s->host_name); - g_free(s->domain_name); - g_free(s->host_name_fqdn); - - g_source_destroy(s->source); - g_source_unref(s->source); - g_main_context_unref(s->context); - - avahi_server_config_free(&s->config); - - 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 == AVAHI_PROTO_UNSPEC || - e->protocol == AVAHI_PROTO_UNSPEC || - e->protocol == protocol) - - return -1; - - } - - return 0; -} - -gint avahi_server_add( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - AvahiEntryFlags flags, - AvahiRecord *r) { - - AvahiEntry *e, *t; - - g_assert(s); - g_assert(r); - - if (r->ttl == 0) - return -1; - - if (avahi_key_is_pattern(r->key)) - return -1; - - 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); - e->group = g; - e->interface = interface; - e->protocol = protocol; - e->flags = flags; - e->dead = FALSE; - - AVAHI_LLIST_HEAD_INIT(AvahiAnnouncement, e->announcements); - - AVAHI_LLIST_PREPEND(AvahiEntry, entries, s->entries, e); - - /* Insert into hash table indexed by name */ - t = g_hash_table_lookup(s->entries_by_key, e->record->key); - AVAHI_LLIST_PREPEND(AvahiEntry, by_key, t, e); - g_hash_table_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, AvahiEntryGroup *g, void **state) { - AvahiEntry **e = (AvahiEntry**) state; - g_assert(s); - g_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); -} - -void avahi_server_dump(AvahiServer *s, AvahiDumpCallback callback, gpointer userdata) { - AvahiEntry *e; + /* Free other stuff */ - g_assert(s); - g_assert(callback); - - callback(";;; ZONE DUMP FOLLOWS ;;;", userdata); - - for (e = s->entries; e; e = e->entries_next) { - gchar *t; - gchar ln[256]; - - if (e->dead) - continue; - - t = avahi_record_to_string(e->record); - g_snprintf(ln, sizeof(ln), "%s ; iface=%i proto=%i", t, e->interface, e->protocol); - g_free(t); + avahi_free(s->host_name); + avahi_free(s->domain_name); + avahi_free(s->host_name_fqdn); - callback(ln, userdata); - } + avahi_server_config_free(&s->config); - avahi_dump_caches(s->monitor, callback, userdata); + avahi_free(s); } -gint avahi_server_add_ptr( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - AvahiEntryFlags flags, - guint32 ttl, - const gchar *name, - const gchar *dest) { +const char* avahi_server_get_domain_name(AvahiServer *s) { + assert(s); - 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, ttl); - 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->domain_name; } -gint avahi_server_add_address( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - AvahiEntryFlags flags, - const gchar *name, - AvahiAddress *a) { - - gchar *n = NULL; - gint ret = 0; - g_assert(s); - g_assert(a); - - name = name ? (n = avahi_normalize_name(name)) : s->host_name_fqdn; - - if (a->family == AVAHI_PROTO_INET) { - gchar *reverse; - AvahiRecord *r; - - r = avahi_record_new_full(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A, AVAHI_DEFAULT_TTL_HOST_NAME); - 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); - - reverse = avahi_reverse_lookup_name_ipv4(&a->data.ipv4); - ret |= avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL_HOST_NAME, reverse, name); - g_free(reverse); - - } else { - gchar *reverse; - AvahiRecord *r; - - r = avahi_record_new_full(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA, AVAHI_DEFAULT_TTL_HOST_NAME); - 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); - - reverse = avahi_reverse_lookup_name_ipv6_arpa(&a->data.ipv6); - ret |= avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL_HOST_NAME, reverse, name); - g_free(reverse); - - reverse = avahi_reverse_lookup_name_ipv6_int(&a->data.ipv6); - ret |= avahi_server_add_ptr(s, g, interface, protocol, flags | AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL_HOST_NAME, reverse, name); - g_free(reverse); - } - - g_free(n); +const char* avahi_server_get_host_name(AvahiServer *s) { + assert(s); - return ret; + return s->host_name; } -gint avahi_server_add_txt_strlst( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - AvahiEntryFlags flags, - guint32 ttl, - const gchar *name, - AvahiStringList *strlst) { +const char* avahi_server_get_host_name_fqdn(AvahiServer *s) { + assert(s); - 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, ttl); - r->data.txt.string_list = strlst; - ret = avahi_server_add(s, g, interface, protocol, flags, r); - avahi_record_unref(r); - - return ret; + return s->host_name_fqdn; } -gint avahi_server_add_txt_va( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - AvahiEntryFlags flags, - guint32 ttl, - const gchar *name, - va_list va) { - - g_assert(s); +void* avahi_server_get_data(AvahiServer *s) { + assert(s); - return avahi_server_add_txt_strlst(s, g, interface, protocol, flags, ttl, name, avahi_string_list_new_va(va)); + return s->userdata; } -gint avahi_server_add_txt( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - AvahiEntryFlags flags, - guint32 ttl, - const gchar *name, - ...) { - - va_list va; - gint ret; - - g_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_set_data(AvahiServer *s, void* userdata) { + assert(s); - return ret; + s->userdata = userdata; } -static void escape_service_name(gchar *d, guint size, const gchar *s) { - g_assert(d); - g_assert(size); - g_assert(s); - - while (*s && size >= 2) { - if (*s == '.' || *s == '\\') { - if (size < 3) - break; - - *(d++) = '\\'; - size--; - } - - *(d++) = *(s++); - size--; - } +AvahiServerState avahi_server_get_state(AvahiServer *s) { + assert(s); - g_assert(size > 0); - *(d++) = 0; + return s->state; } -gint avahi_server_add_service_strlst( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - const gchar *name, - const gchar *type, - const gchar *domain, - const gchar *host, - guint16 port, - AvahiStringList *strlst) { - - gchar ptr_name[256], svc_name[256], ename[64], enum_ptr[256]; - gchar *t, *d; - AvahiRecord *r; - gint ret = 0; - - g_assert(s); - g_assert(type); - g_assert(name); - - escape_service_name(ename, sizeof(ename), name); - - if (domain) { - while (domain[0] == '.') - domain++; - } else - domain = s->domain_name; - - if (!host) - host = s->host_name_fqdn; - - d = avahi_normalize_name(domain); - t = avahi_normalize_name(type); - - g_snprintf(ptr_name, sizeof(ptr_name), "%s.%s", t, d); - g_snprintf(svc_name, sizeof(svc_name), "%s.%s.%s", ename, t, d); - - ret = avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, AVAHI_DEFAULT_TTL, ptr_name, svc_name); - - r = avahi_record_new_full(svc_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV, AVAHI_DEFAULT_TTL_HOST_NAME); - r->data.srv.priority = 0; - r->data.srv.weight = 0; - r->data.srv.port = port; - r->data.srv.name = avahi_normalize_name(host); - ret |= avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, r); - avahi_record_unref(r); - - ret |= avahi_server_add_txt_strlst(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL, svc_name, strlst); - - g_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); +AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) { + assert(c); - g_free(d); - g_free(t); + 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; + c->add_service_cookie = 1; + c->enable_wide_area = 0; + c->n_wide_area_servers = 0; + c->disallow_other_stacks = 0; - return ret; + return c; } -gint avahi_server_add_service_va( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - const gchar *name, - const gchar *type, - const gchar *domain, - const gchar *host, - guint16 port, - va_list va){ - - g_assert(s); - g_assert(type); - g_assert(name); - - return avahi_server_add_service_strlst(s, g, interface, protocol, name, type, domain, host, port, avahi_string_list_new_va(va)); -} +void avahi_server_config_free(AvahiServerConfig *c) { + assert(c); -gint avahi_server_add_service( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - const gchar *name, - const gchar *type, - const gchar *domain, - const gchar *host, - guint16 port, - ... ){ - - va_list va; - gint ret; - - g_assert(s); - g_assert(type); - g_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; + avahi_free(c->host_name); + avahi_free(c->domain_name); } -static void hexstring(gchar *s, size_t sl, const void *p, size_t pl) { - static const gchar hex[] = "0123456789abcdef"; - gboolean b = FALSE; - const guint8 *k = p; - - while (sl > 1 && pl > 0) { - *(s++) = hex[(b ? *k : *k >> 4) & 0xF]; - - if (b) { - k++; - pl--; +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; } - - b = !b; - - sl--; - } - - if (sl > 0) - *s = 0; -} - -gint avahi_server_add_dns_server_address( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - const gchar *domain, - AvahiDNSServerType type, - const AvahiAddress *address, - guint16 port /** should be 53 */) { - - AvahiRecord *r; - gint ret; - gchar n[64] = "ip-"; - - g_assert(s); - g_assert(address); - g_assert(type == AVAHI_DNS_SERVER_UPDATE || type == AVAHI_DNS_SERVER_RESOLVE); - g_assert(address->family == AVAHI_PROTO_INET || address->family == AVAHI_PROTO_INET6); - - 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; - } - - ret = avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE | AVAHI_ENTRY_ALLOWMUTIPLE, r); - avahi_record_unref(r); - ret |= avahi_server_add_dns_server_name(s, g, interface, protocol, domain, type, n, port); + *ret = *c; + ret->host_name = h; + ret->domain_name = d; return ret; } -gint avahi_server_add_dns_server_name( - AvahiServer *s, - AvahiEntryGroup *g, - gint interface, - guchar protocol, - const gchar *domain, - AvahiDNSServerType type, - const gchar *name, - guint16 port /** should be 53 */) { - - gint ret = -1; - gchar t[256], *d; - AvahiRecord *r; +int avahi_server_errno(AvahiServer *s) { + assert(s); - g_assert(s); - g_assert(name); - g_assert(type == AVAHI_DNS_SERVER_UPDATE || type == AVAHI_DNS_SERVER_RESOLVE); - - if (domain) { - while (domain[0] == '.') - domain++; - } else - domain = s->domain_name; - - d = avahi_normalize_name(domain); - g_snprintf(t, sizeof(t), "%s.%s", type == AVAHI_DNS_SERVER_RESOLVE ? "_domain._udp" : "_dns-update._udp", d); - g_free(d); - - r = avahi_record_new_full(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV, AVAHI_DEFAULT_TTL_HOST_NAME); - r->data.srv.priority = 0; - r->data.srv.weight = 0; - r->data.srv.port = port; - r->data.srv.name = avahi_normalize_name(name); - ret = avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_NULL, r); - avahi_record_unref(r); - - return ret; + return s->error; } -static void post_query_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata) { - AvahiKey *k = userdata; - - g_assert(m); - g_assert(i); - g_assert(k); +/* Just for internal use */ +int avahi_server_set_errno(AvahiServer *s, int error) { + assert(s); - avahi_interface_post_query(i, k, FALSE); + return s->error = error; } -void avahi_server_post_query(AvahiServer *s, gint interface, guchar protocol, AvahiKey *key) { - g_assert(s); - g_assert(key); +uint32_t avahi_server_get_local_service_cookie(AvahiServer *s) { + assert(s); - avahi_interface_monitor_walk(s->monitor, interface, protocol, post_query_callback, key); + return s->local_service_cookie; } -void avahi_entry_group_change_state(AvahiEntryGroup *g, AvahiEntryGroupState state) { - g_assert(g); - - if (g->state == state) - return; - - g->state = state; +static AvahiEntry *find_entry(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, AvahiKey *key) { + AvahiEntry *e; - if (g->callback) { - g->callback(g->server, g, state, g->userdata); - return; - } -} + assert(s); + assert(key); -AvahiEntryGroup *avahi_entry_group_new(AvahiServer *s, AvahiEntryGroupCallback callback, gpointer userdata) { - AvahiEntryGroup *g; - - g_assert(s); + for (e = avahi_hashmap_lookup(s->entries_by_key, key); e; e = e->by_key_next) + + 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)) - g = g_new(AvahiEntryGroup, 1); - g->server = s; - g->callback = callback; - g->userdata = userdata; - g->dead = FALSE; - g->state = AVAHI_ENTRY_GROUP_UNCOMMITED; - g->n_probing = 0; - AVAHI_LLIST_HEAD_INIT(AvahiEntry, g->entries); + return e; - AVAHI_LLIST_PREPEND(AvahiEntryGroup, groups, s->groups, g); - return g; + return NULL; } -void avahi_entry_group_free(AvahiEntryGroup *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; + int ret; + char n[AVAHI_DOMAIN_NAME_MAX]; - g_assert(g); - g_assert(g->server); + assert(s); + assert(name); + assert(type); + assert(ret_group); - for (e = g->entries; e; e = e->by_group_next) { - avahi_goodbye_entry(g->server, e, TRUE); - e->dead = TRUE; - } + if (!AVAHI_IF_VALID(interface)) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_INTERFACE); - g->dead = TRUE; + if (!AVAHI_IF_VALID(protocol)) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_PROTOCOL); - g->server->need_group_cleanup = TRUE; - g->server->need_entry_cleanup = TRUE; -} - -gint avahi_entry_group_commit(AvahiEntryGroup *g) { - g_assert(g); - g_assert(!g->dead); - - if (g->state != AVAHI_ENTRY_GROUP_UNCOMMITED) - return -1; - - avahi_entry_group_change_state(g, AVAHI_ENTRY_GROUP_REGISTERING); - avahi_announce_group(g->server, g); - avahi_entry_group_check_probed(g, FALSE); - - return 0; -} - -gboolean avahi_entry_commited(AvahiEntry *e) { - g_assert(e); - g_assert(!e->dead); + if (!avahi_is_valid_service_name(name)) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_SERVICE_NAME); - return !e->group || - e->group->state == AVAHI_ENTRY_GROUP_REGISTERING || - e->group->state == AVAHI_ENTRY_GROUP_ESTABLISHED; -} - -AvahiEntryGroupState avahi_entry_group_get_state(AvahiEntryGroup *g) { - g_assert(g); - g_assert(!g->dead); - - return g->state; -} - -void avahi_entry_group_set_data(AvahiEntryGroup *g, gpointer userdata) { - g_assert(g); - - g->userdata = userdata; -} + if (!avahi_is_valid_service_type_strict(type)) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_SERVICE_TYPE); -gpointer avahi_entry_group_get_data(AvahiEntryGroup *g) { - g_assert(g); + if (domain && !avahi_is_valid_domain_name(domain)) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_DOMAIN_NAME); - return g->userdata; -} - -const gchar* avahi_server_get_domain_name(AvahiServer *s) { - g_assert(s); - - return s->domain_name; -} + if ((ret = avahi_service_name_join(n, sizeof(n), name, type, domain) < 0)) + return avahi_server_set_errno(s, ret); + + if (!(key = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV))) + return avahi_server_set_errno(s, AVAHI_ERR_NO_MEMORY); -const gchar* avahi_server_get_host_name(AvahiServer *s) { - g_assert(s); + e = find_entry(s, interface, protocol, key); + avahi_key_unref(key); - return s->host_name; -} - -const gchar* avahi_server_get_host_name_fqdn(AvahiServer *s) { - g_assert(s); + if (e) { + *ret_group = e->group; + return AVAHI_OK; + } - return s->host_name_fqdn; + return avahi_server_set_errno(s, AVAHI_ERR_NOT_FOUND); } -gpointer avahi_server_get_data(AvahiServer *s) { - g_assert(s); - - return s->userdata; -} +int avahi_server_is_service_local(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, const char *name) { + AvahiKey *key = NULL; + AvahiEntry *e; -void avahi_server_set_data(AvahiServer *s, gpointer userdata) { - g_assert(s); + assert(s); + assert(name); - s->userdata = userdata; -} + if (!s->host_name_fqdn) + return 0; + + if (!(key = avahi_key_new(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV))) + return 0; -AvahiServerState avahi_server_get_state(AvahiServer *s) { - g_assert(s); + e = find_entry(s, interface, protocol, key); + avahi_key_unref(key); - return s->state; + if (!e) + return 0; + + return avahi_domain_equal(s->host_name_fqdn, e->record->data.srv.name); } -AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) { - g_assert(c); +int avahi_server_is_record_local(AvahiServer *s, AvahiIfIndex interface, AvahiProtocol protocol, AvahiRecord *record) { + AvahiEntry *e; - memset(c, 0, sizeof(AvahiServerConfig)); - c->use_ipv6 = TRUE; - c->use_ipv4 = TRUE; - c->host_name = NULL; - c->domain_name = NULL; - c->check_response_ttl = FALSE; - 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->reflect_ipv = FALSE; + assert(s); + assert(record); - return c; -} + for (e = avahi_hashmap_lookup(s->entries_by_key, record->key); e; e = e->by_key_next) -void avahi_server_config_free(AvahiServerConfig *c) { - g_assert(c); + 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; - g_free(c->host_name); - g_free(c->domain_name); + return 0; } -AvahiServerConfig* avahi_server_config_copy(AvahiServerConfig *ret, const AvahiServerConfig *c) { - g_assert(ret); - g_assert(c); - - *ret = *c; +/** Set the wide area DNS servers */ +int avahi_server_set_wide_area_servers(AvahiServer *s, const AvahiAddress *a, unsigned n) { + assert(s); - ret->host_name = g_strdup(c->host_name); - ret->domain_name = g_strdup(c->domain_name); + if (!s->wide_area_lookup_engine) + return avahi_server_set_errno(s, AVAHI_ERR_INVALID_CONFIG); - return ret; + avahi_wide_area_set_servers(s->wide_area_lookup_engine, a, n); + return AVAHI_OK; }