#include "socket.h"
#include "subscribe.h"
-static void free_entry(flxServer*s, flxEntry *e) {
- flxEntry *t;
+static void free_entry(AvahiServer*s, AvahiEntry *e) {
+ AvahiEntry *t;
g_assert(s);
g_assert(e);
- flx_goodbye_entry(s, e, TRUE);
+ avahi_goodbye_entry(s, e, TRUE);
/* Remove from linked list */
- FLX_LLIST_REMOVE(flxEntry, entries, s->entries, e);
+ 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);
- FLX_LLIST_REMOVE(flxEntry, by_key, t, e);
+ AVAHI_LLIST_REMOVE(AvahiEntry, by_key, t, e);
if (t)
g_hash_table_replace(s->entries_by_key, t->record->key, t);
else
/* Remove from associated group */
if (e->group)
- FLX_LLIST_REMOVE(flxEntry, by_group, e->group->entries, e);
+ AVAHI_LLIST_REMOVE(AvahiEntry, by_group, e->group->entries, e);
- flx_record_unref(e->record);
+ avahi_record_unref(e->record);
g_free(e);
}
-static void free_group(flxServer *s, flxEntryGroup *g) {
+static void free_group(AvahiServer *s, AvahiEntryGroup *g) {
g_assert(s);
g_assert(g);
while (g->entries)
free_entry(s, g->entries);
- FLX_LLIST_REMOVE(flxEntryGroup, groups, s->groups, g);
+ AVAHI_LLIST_REMOVE(AvahiEntryGroup, groups, s->groups, g);
g_free(g);
}
-static void cleanup_dead(flxServer *s) {
- flxEntryGroup *g, *ng;
- flxEntry *e, *ne;
+static void cleanup_dead(AvahiServer *s) {
+ AvahiEntryGroup *g, *ng;
+ AvahiEntry *e, *ne;
g_assert(s);
}
}
-static void handle_query_key(flxServer *s, flxKey *k, flxInterface *i, const flxAddress *a) {
- flxEntry *e;
+static void handle_query_key(AvahiServer *s, AvahiKey *k, AvahiInterface *i, const AvahiAddress *a, guint16 port, gboolean legacy_unicast, gboolean unicast_response) {
+ AvahiEntry *e;
gchar *txt;
g_assert(s);
g_assert(i);
g_assert(a);
- g_message("Handling query: %s", txt = flx_key_to_string(k));
+ g_message("Handling query: %s", txt = avahi_key_to_string(k));
g_free(txt);
- flx_packet_scheduler_incoming_query(i->scheduler, k);
+ avahi_packet_scheduler_incoming_query(i->scheduler, k);
- if (k->type == FLX_DNS_TYPE_ANY) {
+ if (k->type == AVAHI_DNS_TYPE_ANY) {
/* Handle ANY query */
for (e = s->entries; e; e = e->entries_next)
- if (!e->dead && flx_key_pattern_match(k, e->record->key) && flx_entry_registered(s, e, i))
- flx_interface_post_response(i, a, e->record, e->flags & FLX_ENTRY_UNIQUE, FALSE);
+ if (!e->dead && avahi_key_pattern_match(k, e->record->key) && avahi_entry_registered(s, e, i))
+ avahi_interface_post_response(i, a, e->record, e->flags & AVAHI_ENTRY_UNIQUE, FALSE);
} 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 && flx_entry_registered(s, e, i))
- flx_interface_post_response(i, a, e->record, e->flags & FLX_ENTRY_UNIQUE, FALSE);
+ if (!e->dead && avahi_entry_registered(s, e, i))
+ avahi_interface_post_response(i, a, e->record, e->flags & AVAHI_ENTRY_UNIQUE, FALSE);
}
}
-static void withdraw_entry(flxServer *s, flxEntry *e) {
+static void withdraw_entry(AvahiServer *s, AvahiEntry *e) {
g_assert(s);
g_assert(e);
- e->dead = TRUE;
- s->need_entry_cleanup = TRUE;
-
- flx_goodbye_entry(s, e, FALSE);
- if (e->group)
- flx_entry_group_run_callback(e->group, FLX_ENTRY_GROUP_COLLISION);
+ 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;
+ }
+
+ avahi_entry_group_change_state(e->group, AVAHI_ENTRY_GROUP_COLLISION);
+ } else {
+ avahi_goodbye_entry(s, e, FALSE);
+ e->dead = TRUE;
+ }
+
+ s->need_entry_cleanup = TRUE;
}
-static void incoming_probe(flxServer *s, flxRecord *record, flxInterface *i) {
- flxEntry *e, *n;
+static void incoming_probe(AvahiServer *s, AvahiRecord *record, AvahiInterface *i) {
+ AvahiEntry *e, *n;
gchar *t;
g_assert(s);
g_assert(record);
g_assert(i);
- t = flx_record_to_string(record);
+ t = avahi_record_to_string(record);
+/* g_message("PROBE: [%s]", t); */
+
for (e = g_hash_table_lookup(s->entries_by_key, record->key); e; e = n) {
n = e->by_key_next;
-
- if (e->dead || !flx_record_equal_no_ttl(record, e->record))
+
+ if (e->dead || avahi_record_equal_no_ttl(record, e->record))
continue;
- if (flx_entry_registering(s, e, i)) {
-
- if (flx_record_lexicographical_compare(record, e->record) > 0) {
+ if (avahi_entry_registering(s, e, i)) {
+ gint cmp;
+
+ if ((cmp = avahi_record_lexicographical_compare(record, e->record)) > 0) {
withdraw_entry(s, e);
g_message("Recieved conflicting probe [%s]. Local host lost. Withdrawing.", t);
- } else
+ } else if (cmp < 0)
g_message("Recieved conflicting probe [%s]. Local host won.", t);
+
}
}
g_free(t);
}
-static void handle_query(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
+static void handle_query(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a, guint16 port, gboolean legacy_unicast) {
guint n;
g_assert(s);
g_assert(a);
/* Handle the questions */
- for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_QDCOUNT); n > 0; n --) {
- flxKey *key;
+ for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT); n > 0; n --) {
+ AvahiKey *key;
+ gboolean unicast_response = FALSE;
- if (!(key = flx_dns_packet_consume_key(p))) {
+ if (!(key = avahi_dns_packet_consume_key(p, &unicast_response))) {
g_warning("Packet too short (1)");
return;
}
- handle_query_key(s, key, i, a);
- flx_key_unref(key);
+ handle_query_key(s, key, i, a, port, legacy_unicast, unicast_response);
+ avahi_key_unref(key);
}
- /* Known Answer Suppresion */
- for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_ANCOUNT); n > 0; n --) {
- flxRecord *record;
+ /* 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 = flx_dns_packet_consume_record(p, &unique))) {
+ if (!(record = avahi_dns_packet_consume_record(p, &unique))) {
g_warning("Packet too short (2)");
return;
}
- flx_packet_scheduler_incoming_known_answer(i->scheduler, record, a);
- flx_record_unref(record);
+ avahi_packet_scheduler_incoming_known_answer(i->scheduler, record, a);
+ avahi_record_unref(record);
}
/* Probe record */
- for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_NSCOUNT); n > 0; n --) {
- flxRecord *record;
+ for (n = avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT); n > 0; n --) {
+ AvahiRecord *record;
gboolean unique = FALSE;
- if (!(record = flx_dns_packet_consume_record(p, &unique))) {
+ if (!(record = avahi_dns_packet_consume_record(p, &unique))) {
g_warning("Packet too short (3)");
return;
}
- if (record->key->type != FLX_DNS_TYPE_ANY)
+ if (record->key->type != AVAHI_DNS_TYPE_ANY)
incoming_probe(s, record, i);
- flx_record_unref(record);
+ avahi_record_unref(record);
}
}
-static gboolean handle_conflict(flxServer *s, flxInterface *i, flxRecord *record, const flxAddress *a) {
+static gboolean handle_conflict(AvahiServer *s, AvahiInterface *i, AvahiRecord *record, gboolean unique, const AvahiAddress *a) {
gboolean valid = TRUE;
- flxEntry *e, *n;
+ AvahiEntry *e, *n;
gchar *t;
g_assert(s);
g_assert(i);
g_assert(record);
- t = flx_record_to_string(record);
+ t = avahi_record_to_string(record);
+
+/* g_message("CHECKING FOR CONFLICT: [%s]", t); */
for (e = g_hash_table_lookup(s->entries_by_key, record->key); e; e = n) {
n = e->by_key_next;
if (e->dead)
continue;
- if (flx_entry_registered(s, e, i)) {
+ if (avahi_entry_registered(s, e, i)) {
- gboolean equal = flx_record_equal_no_ttl(record, e->record);
+ gboolean equal = avahi_record_equal_no_ttl(record, e->record);
/* Check whether there is a unique record conflict */
- if (!equal && (e->flags & FLX_ENTRY_UNIQUE)) {
+ if (!equal && ((e->flags & AVAHI_ENTRY_UNIQUE) || unique)) {
+ gint cmp;
/* The lexicographically later data wins. */
- if (flx_record_lexicographical_compare(record, e->record) > 0) {
- withdraw_entry(s, e);
+ if ((cmp = avahi_record_lexicographical_compare(record, e->record)) > 0) {
g_message("Recieved conflicting record [%s]. Local host lost. Withdrawing.", t);
- } else {
+ withdraw_entry(s, e);
+ } else if (cmp < 0) {
/* Tell the other host that our entry is lexicographically later */
- valid = FALSE;
- flx_interface_post_response(i, a, e->record, e->flags & FLX_ENTRY_UNIQUE, TRUE);
+
g_message("Recieved conflicting record [%s]. Local host won. Refreshing.", t);
+
+ valid = FALSE;
+ avahi_interface_post_response(i, a, e->record, e->flags & AVAHI_ENTRY_UNIQUE, TRUE);
}
/* Check wheter there is a TTL conflict */
} else if (equal && record->ttl <= e->record->ttl/2) {
/* Correct the TTL */
valid = FALSE;
- flx_interface_post_response(i, a, e->record, e->flags & FLX_ENTRY_UNIQUE, TRUE);
+ avahi_interface_post_response(i, a, e->record, e->flags & AVAHI_ENTRY_UNIQUE, TRUE);
g_message("Recieved record with bad TTL [%s]. Refreshing.", t);
}
+
+ } else if (avahi_entry_registering(s, e, i)) {
+
+ if (!avahi_record_equal_no_ttl(record, e->record) && ((e->flags & AVAHI_ENTRY_UNIQUE) || unique)) {
+
+ /* We are currently registering a matching record, but
+ * someone else already claimed it, so let's
+ * withdraw */
+
+ g_message("Recieved conflicting record [%s] with local record to be. Withdrawing.", t);
+ withdraw_entry(s, e);
+ }
}
}
return valid;
}
-static void handle_response(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
+static void handle_response(AvahiServer *s, AvahiDnsPacket *p, AvahiInterface *i, const AvahiAddress *a) {
guint n;
g_assert(s);
g_assert(i);
g_assert(a);
- for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_ANCOUNT) +
- flx_dns_packet_get_field(p, FLX_DNS_FIELD_ARCOUNT); n > 0; n--) {
- flxRecord *record;
+ 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;
- if (!(record = flx_dns_packet_consume_record(p, &cache_flush))) {
+ if (!(record = avahi_dns_packet_consume_record(p, &cache_flush))) {
g_warning("Packet too short (4)");
return;
}
- if (record->key->type != FLX_DNS_TYPE_ANY) {
- continue;
-
- g_message("Handling response: %s", txt = flx_record_to_string(record));
+ if (record->key->type != AVAHI_DNS_TYPE_ANY) {
+
+ g_message("Handling response: %s", txt = avahi_record_to_string(record));
g_free(txt);
- if (handle_conflict(s, i, record, a)) {
- flx_cache_update(i->cache, record, cache_flush, a);
- flx_packet_scheduler_incoming_response(i->scheduler, record);
+ if (handle_conflict(s, i, record, cache_flush, a)) {
+ avahi_cache_update(i->cache, record, cache_flush, a);
+ avahi_packet_scheduler_incoming_response(i->scheduler, record);
}
}
- flx_record_unref(record);
+ avahi_record_unref(record);
}
}
-static void dispatch_packet(flxServer *s, flxDnsPacket *p, struct sockaddr *sa, gint iface, gint ttl) {
- flxInterface *i;
- flxAddress a;
+static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, struct sockaddr *sa, gint iface, gint ttl) {
+ AvahiInterface *i;
+ AvahiAddress a;
+ guint16 port;
g_assert(s);
g_assert(p);
g_assert(sa);
g_assert(iface > 0);
- g_message("new packet recieved.");
-
- if (!(i = flx_interface_monitor_get_interface(s->monitor, iface, sa->sa_family))) {
+ if (!(i = avahi_interface_monitor_get_interface(s->monitor, iface, sa->sa_family))) {
g_warning("Recieved packet from invalid interface.");
return;
}
- if (ttl != 255) {
- g_warning("Recieved packet with invalid TTL on interface '%s.%i'.", i->hardware->name, i->protocol);
- if (!s->ignore_bad_ttl)
- return;
- }
+ g_message("new packet recieved on interface '%s.%i'.", i->hardware->name, i->protocol);
if (sa->sa_family == AF_INET6) {
- static const unsigned char ipv4_in_ipv6[] = {
+ static const guint8 ipv4_in_ipv6[] = {
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0xFF, 0xFF, 0xFF, 0xFF };
- if (memcmp(((struct sockaddr_in6*) sa)->sin6_addr.s6_addr, ipv4_in_ipv6, sizeof(ipv4_in_ipv6)) == 0) {
+ /* This is an IPv4 address encapsulated in IPv6, so let's ignore it. */
- /* This is an IPv4 address encapsulated in IPv6, so let's ignore it. */
+ if (memcmp(((struct sockaddr_in6*) sa)->sin6_addr.s6_addr, ipv4_in_ipv6, sizeof(ipv4_in_ipv6)) == 0)
return;
- }
}
- if (flx_dns_packet_check_valid(p) < 0) {
+ if (avahi_dns_packet_check_valid(p) < 0) {
g_warning("Recieved invalid packet.");
return;
}
- flx_address_from_sockaddr(sa, &a);
+ port = avahi_port_from_sockaddr(sa);
+ avahi_address_from_sockaddr(sa, &a);
- if (flx_dns_packet_is_query(p)) {
+ if (avahi_dns_packet_is_query(p)) {
+ gboolean legacy_unicast = FALSE;
- if (flx_dns_packet_get_field(p, FLX_DNS_FIELD_QDCOUNT) == 0 ||
- flx_dns_packet_get_field(p, FLX_DNS_FIELD_ARCOUNT) != 0) {
+ if (avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_QDCOUNT) == 0 ||
+ avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ARCOUNT) != 0) {
g_warning("Invalid query packet.");
return;
}
-
- handle_query(s, p, i, &a);
+
+ if (port != AVAHI_MDNS_PORT) {
+ /* Legacy Unicast */
+
+ if ((avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_ANCOUNT) != 0 ||
+ avahi_dns_packet_get_field(p, AVAHI_DNS_FIELD_NSCOUNT) != 0)) {
+ g_warning("Invalid legacy unicast query packet.");
+ return;
+ }
+
+ legacy_unicast = TRUE;
+ }
+
+ handle_query(s, p, i, &a, port, legacy_unicast);
+
g_message("Handled query");
} else {
- if (flx_dns_packet_get_field(p, FLX_DNS_FIELD_QDCOUNT) != 0 ||
- flx_dns_packet_get_field(p, FLX_DNS_FIELD_ANCOUNT) == 0 ||
- flx_dns_packet_get_field(p, FLX_DNS_FIELD_NSCOUNT) != 0) {
+
+ if (port != AVAHI_MDNS_PORT) {
+ g_warning("Recieved repsonse with invalid source port %u on interface '%s.%i'", port, i->hardware->name, i->protocol);
+ return;
+ }
+
+ if (ttl != 255) {
+ g_warning("Recieved response with invalid TTL %u on interface '%s.%i'.", ttl, i->hardware->name, i->protocol);
+ if (!s->ignore_bad_ttl)
+ 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) {
g_warning("Invalid response packet.");
return;
}
}
}
-static void work(flxServer *s) {
+static void work(AvahiServer *s) {
struct sockaddr_in6 sa6;
struct sockaddr_in sa;
- flxDnsPacket *p;
+ AvahiDnsPacket *p;
gint iface = -1;
guint8 ttl;
g_assert(s);
if (s->pollfd_ipv4.revents & G_IO_IN) {
- if ((p = flx_recv_dns_packet_ipv4(s->fd_ipv4, &sa, &iface, &ttl))) {
+ if ((p = avahi_recv_dns_packet_ipv4(s->fd_ipv4, &sa, &iface, &ttl))) {
dispatch_packet(s, p, (struct sockaddr*) &sa, iface, ttl);
- flx_dns_packet_free(p);
+ avahi_dns_packet_free(p);
}
}
if (s->pollfd_ipv6.revents & G_IO_IN) {
- if ((p = flx_recv_dns_packet_ipv6(s->fd_ipv6, &sa6, &iface, &ttl))) {
+ if ((p = avahi_recv_dns_packet_ipv6(s->fd_ipv6, &sa6, &iface, &ttl))) {
dispatch_packet(s, p, (struct sockaddr*) &sa6, iface, ttl);
- flx_dns_packet_free(p);
+ avahi_dns_packet_free(p);
}
}
}
}
static gboolean check_func(GSource *source) {
- flxServer* s;
+ AvahiServer* s;
g_assert(source);
- s = *((flxServer**) (((guint8*) source) + sizeof(GSource)));
+ s = *((AvahiServer**) (((guint8*) source) + sizeof(GSource)));
g_assert(s);
return (s->pollfd_ipv4.revents | s->pollfd_ipv6.revents) & (G_IO_IN | G_IO_HUP | G_IO_ERR);
}
static gboolean dispatch_func(GSource *source, GSourceFunc callback, gpointer user_data) {
- flxServer* s;
+ AvahiServer* s;
g_assert(source);
- s = *((flxServer**) (((guint8*) source) + sizeof(GSource)));
+ s = *((AvahiServer**) (((guint8*) source) + sizeof(GSource)));
g_assert(s);
work(s);
return TRUE;
}
-static void add_default_entries(flxServer *s) {
+static void add_default_entries(AvahiServer *s) {
gint length = 0;
struct utsname utsname;
gchar *hinfo;
- flxAddress a;
- flxRecord *r;
+ AvahiAddress a;
+ AvahiRecord *r;
g_assert(s);
/* Fill in HINFO rr */
- r = flx_record_new_full(s->hostname, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_HINFO);
+ r = avahi_record_new_full(s->hostname, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_HINFO);
uname(&utsname);
r->data.hinfo.cpu = g_strdup(g_strup(utsname.machine));
r->data.hinfo.os = g_strdup(g_strup(utsname.sysname));
- flx_server_add(s, NULL, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE | FLX_ENTRY_NOANNOUNCE | FLX_ENTRY_NOPROBE, r);
- flx_record_unref(r);
+ avahi_server_add(s, NULL, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE, r);
+ avahi_record_unref(r);
/* Add localhost entries */
- flx_address_parse("127.0.0.1", AF_INET, &a);
- flx_server_add_address(s, NULL, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE|FLX_ENTRY_NOPROBE|FLX_ENTRY_NOANNOUNCE, "localhost", &a);
+ avahi_address_parse("127.0.0.1", AF_INET, &a);
+ avahi_server_add_address(s, NULL, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE|AVAHI_ENTRY_NOPROBE|AVAHI_ENTRY_NOANNOUNCE, "localhost", &a);
- flx_address_parse("::1", AF_INET6, &a);
- flx_server_add_address(s, NULL, 0, AF_UNSPEC, FLX_ENTRY_UNIQUE|FLX_ENTRY_NOPROBE|FLX_ENTRY_NOANNOUNCE, "ip6-localhost", &a);
+ avahi_address_parse("::1", AF_INET6, &a);
+ avahi_server_add_address(s, NULL, 0, AF_UNSPEC, AVAHI_ENTRY_UNIQUE|AVAHI_ENTRY_NOPROBE|AVAHI_ENTRY_NOANNOUNCE, "ip6-localhost", &a);
}
-flxServer *flx_server_new(GMainContext *c) {
+AvahiServer *avahi_server_new(GMainContext *c) {
gchar *hn, *e;
- flxServer *s;
+ AvahiServer *s;
static GSourceFuncs source_funcs = {
prepare_func,
NULL
};
- s = g_new(flxServer, 1);
+ s = g_new(AvahiServer, 1);
s->ignore_bad_ttl = FALSE;
s->need_entry_cleanup = s->need_group_cleanup = FALSE;
- s->fd_ipv4 = flx_open_socket_ipv4();
- s->fd_ipv6 = -1 /*flx_open_socket_ipv6() */;
+ s->fd_ipv4 = avahi_open_socket_ipv4();
+ s->fd_ipv6 = avahi_open_socket_ipv6();
if (s->fd_ipv6 < 0 && s->fd_ipv4 < 0) {
g_critical("Failed to create IP sockets.\n");
else
s->context = g_main_context_default();
- FLX_LLIST_HEAD_INIT(flxEntry, s->entries);
- s->entries_by_key = g_hash_table_new((GHashFunc) flx_key_hash, (GEqualFunc) flx_key_equal);
- FLX_LLIST_HEAD_INIT(flxGroup, s->groups);
+ 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);
- FLX_LLIST_HEAD_INIT(flxSubscription, s->subscriptions);
- s->subscription_hashtable = g_hash_table_new((GHashFunc) flx_key_hash, (GEqualFunc) flx_key_equal);
+ AVAHI_LLIST_HEAD_INIT(AvahiSubscription, s->subscriptions);
+ s->subscription_hashtable = g_hash_table_new((GHashFunc) avahi_key_hash, (GEqualFunc) avahi_key_equal);
/* Get host name */
- hn = flx_get_host_name();
+ hn = avahi_get_host_name();
hn[strcspn(hn, ".")] = 0;
s->hostname = g_strdup_printf("%s.local.", hn);
g_free(hn);
- s->time_event_queue = flx_time_event_queue_new(s->context, G_PRIORITY_DEFAULT+10); /* Slightly less priority than the FDs */
- s->monitor = flx_interface_monitor_new(s);
- flx_interface_monitor_sync(s->monitor);
+ s->time_event_queue = avahi_time_event_queue_new(s->context, G_PRIORITY_DEFAULT+10); /* Slightly less priority than the FDs */
+ s->monitor = avahi_interface_monitor_new(s);
+ avahi_interface_monitor_sync(s->monitor);
add_default_entries(s);
/* Prepare IO source registration */
- s->source = g_source_new(&source_funcs, sizeof(GSource) + sizeof(flxServer*));
- *((flxServer**) (((guint8*) s->source) + sizeof(GSource))) = s;
+ s->source = g_source_new(&source_funcs, sizeof(GSource) + sizeof(AvahiServer*));
+ *((AvahiServer**) (((guint8*) s->source) + sizeof(GSource))) = s;
memset(&s->pollfd_ipv4, 0, sizeof(s->pollfd_ipv4));
s->pollfd_ipv4.fd = s->fd_ipv4;
return s;
}
-void flx_server_free(flxServer* s) {
+void avahi_server_free(AvahiServer* s) {
g_assert(s);
while(s->entries)
free_entry(s, s->entries);
- flx_interface_monitor_free(s->monitor);
+ avahi_interface_monitor_free(s->monitor);
while (s->groups)
free_group(s, s->groups);
while (s->subscriptions)
- flx_subscription_free(s->subscriptions);
+ avahi_subscription_free(s->subscriptions);
g_hash_table_destroy(s->subscription_hashtable);
g_hash_table_destroy(s->entries_by_key);
- flx_time_event_queue_free(s->time_event_queue);
+ avahi_time_event_queue_free(s->time_event_queue);
if (s->fd_ipv4 >= 0)
close(s->fd_ipv4);
g_free(s);
}
-void flx_server_add(
- flxServer *s,
- flxEntryGroup *g,
+void avahi_server_add(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
gint interface,
guchar protocol,
- flxEntryFlags flags,
- flxRecord *r) {
+ AvahiEntryFlags flags,
+ AvahiRecord *r) {
- flxEntry *e, *t;
+ AvahiEntry *e, *t;
g_assert(s);
g_assert(r);
- g_assert(r->key->type != FLX_DNS_TYPE_ANY);
+ g_assert(r->key->type != AVAHI_DNS_TYPE_ANY);
- e = g_new(flxEntry, 1);
+ e = g_new(AvahiEntry, 1);
e->server = s;
- e->record = flx_record_ref(r);
+ e->record = avahi_record_ref(r);
e->group = g;
e->interface = interface;
e->protocol = protocol;
e->flags = flags;
e->dead = FALSE;
- FLX_LLIST_HEAD_INIT(flxAnnouncement, e->announcements);
+ AVAHI_LLIST_HEAD_INIT(AvahiAnnouncement, e->announcements);
- FLX_LLIST_PREPEND(flxEntry, entries, s->entries, e);
+ 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);
- FLX_LLIST_PREPEND(flxEntry, by_key, t, e);
+ 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)
- FLX_LLIST_PREPEND(flxEntry, by_group, g->entries, e);
+ AVAHI_LLIST_PREPEND(AvahiEntry, by_group, g->entries, e);
- flx_announce_entry(s, e);
+ avahi_announce_entry(s, e);
}
-const flxRecord *flx_server_iterate(flxServer *s, flxEntryGroup *g, void **state) {
- flxEntry **e = (flxEntry**) state;
+const AvahiRecord *avahi_server_iterate(AvahiServer *s, AvahiEntryGroup *g, void **state) {
+ AvahiEntry **e = (AvahiEntry**) state;
g_assert(s);
g_assert(e);
if (!*e)
return NULL;
- return flx_record_ref((*e)->record);
+ return avahi_record_ref((*e)->record);
}
-void flx_server_dump(flxServer *s, FILE *f) {
- flxEntry *e;
+void avahi_server_dump(AvahiServer *s, FILE *f) {
+ AvahiEntry *e;
g_assert(s);
g_assert(f);
if (e->dead)
continue;
- t = flx_record_to_string(e->record);
+ t = avahi_record_to_string(e->record);
fprintf(f, "%s ; iface=%i proto=%i\n", t, e->interface, e->protocol);
g_free(t);
}
- flx_dump_caches(s->monitor, f);
+ avahi_dump_caches(s->monitor, f);
}
-void flx_server_add_ptr(
- flxServer *s,
- flxEntryGroup *g,
+void avahi_server_add_ptr(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
gint interface,
guchar protocol,
- flxEntryFlags flags,
+ AvahiEntryFlags flags,
const gchar *name,
const gchar *dest) {
- flxRecord *r;
+ AvahiRecord *r;
g_assert(dest);
- r = flx_record_new_full(name ? name : s->hostname, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_PTR);
- r->data.ptr.name = flx_normalize_name(dest);
- flx_server_add(s, g, interface, protocol, flags, r);
- flx_record_unref(r);
+ r = avahi_record_new_full(name ? name : s->hostname, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_PTR);
+ r->data.ptr.name = avahi_normalize_name(dest);
+ avahi_server_add(s, g, interface, protocol, flags, r);
+ avahi_record_unref(r);
}
-void flx_server_add_address(
- flxServer *s,
- flxEntryGroup *g,
+void avahi_server_add_address(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
gint interface,
guchar protocol,
- flxEntryFlags flags,
+ AvahiEntryFlags flags,
const gchar *name,
- flxAddress *a) {
+ AvahiAddress *a) {
gchar *n = NULL;
g_assert(s);
g_assert(a);
- name = name ? (n = flx_normalize_name(name)) : s->hostname;
+ name = name ? (n = avahi_normalize_name(name)) : s->hostname;
if (a->family == AF_INET) {
gchar *reverse;
- flxRecord *r;
+ AvahiRecord *r;
- r = flx_record_new_full(name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_A);
+ r = avahi_record_new_full(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
r->data.a.address = a->data.ipv4;
- flx_server_add(s, g, interface, protocol, flags, r);
- flx_record_unref(r);
+ avahi_server_add(s, g, interface, protocol, flags, r);
+ avahi_record_unref(r);
- reverse = flx_reverse_lookup_name_ipv4(&a->data.ipv4);
+ reverse = avahi_reverse_lookup_name_ipv4(&a->data.ipv4);
g_assert(reverse);
- flx_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
+ avahi_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
g_free(reverse);
} else {
gchar *reverse;
- flxRecord *r;
+ AvahiRecord *r;
- r = flx_record_new_full(name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_AAAA);
+ r = avahi_record_new_full(name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
r->data.aaaa.address = a->data.ipv6;
- flx_server_add(s, g, interface, protocol, flags, r);
- flx_record_unref(r);
+ avahi_server_add(s, g, interface, protocol, flags, r);
+ avahi_record_unref(r);
- reverse = flx_reverse_lookup_name_ipv6_arpa(&a->data.ipv6);
+ reverse = avahi_reverse_lookup_name_ipv6_arpa(&a->data.ipv6);
g_assert(reverse);
- flx_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
+ avahi_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
g_free(reverse);
- reverse = flx_reverse_lookup_name_ipv6_int(&a->data.ipv6);
+ reverse = avahi_reverse_lookup_name_ipv6_int(&a->data.ipv6);
g_assert(reverse);
- flx_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
+ avahi_server_add_ptr(s, g, interface, protocol, flags, reverse, name);
g_free(reverse);
}
g_free(n);
}
-void flx_server_add_text_va(
- flxServer *s,
- flxEntryGroup *g,
+void avahi_server_add_text_strlst(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
gint interface,
guchar protocol,
- flxEntryFlags flags,
+ AvahiEntryFlags flags,
const gchar *name,
- va_list va) {
+ AvahiStringList *strlst) {
- flxRecord *r;
+ AvahiRecord *r;
g_assert(s);
- r = flx_record_new_full(name ? name : s->hostname, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_TXT);
- r->data.txt.string_list = flx_string_list_new_va(va);
- flx_server_add(s, g, interface, protocol, flags, r);
- flx_record_unref(r);
+ r = avahi_record_new_full(name ? name : s->hostname, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_TXT);
+ r->data.txt.string_list = strlst;
+ avahi_server_add(s, g, interface, protocol, flags, r);
+ avahi_record_unref(r);
+}
+
+void avahi_server_add_text_va(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
+ gint interface,
+ guchar protocol,
+ AvahiEntryFlags flags,
+ const gchar *name,
+ va_list va) {
+
+ g_assert(s);
+
+ avahi_server_add_text_strlst(s, g, interface, protocol, flags, name, avahi_string_list_new_va(va));
}
-void flx_server_add_text(
- flxServer *s,
- flxEntryGroup *g,
+void avahi_server_add_text(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
gint interface,
guchar protocol,
- flxEntryFlags flags,
+ AvahiEntryFlags flags,
const gchar *name,
...) {
g_assert(s);
va_start(va, name);
- flx_server_add_text_va(s, g, interface, protocol, flags, name, va);
+ avahi_server_add_text_va(s, g, interface, protocol, flags, name, va);
va_end(va);
}
*(d++) = 0;
}
-
-void flx_server_add_service_va(
- flxServer *s,
- flxEntryGroup *g,
+void avahi_server_add_service_strlst(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
gint interface,
guchar protocol,
const gchar *type,
const gchar *domain,
const gchar *host,
guint16 port,
- va_list va) {
+ AvahiStringList *strlst) {
gchar ptr_name[256], svc_name[256], ename[64], enum_ptr[256];
- flxRecord *r;
+ AvahiRecord *r;
g_assert(s);
g_assert(type);
snprintf(ptr_name, sizeof(ptr_name), "%s.%s", type, domain);
snprintf(svc_name, sizeof(svc_name), "%s.%s.%s", ename, type, domain);
- flx_server_add_ptr(s, g, interface, protocol, FALSE, ptr_name, svc_name);
+ avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, ptr_name, svc_name);
- r = flx_record_new_full(svc_name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_SRV);
+ r = avahi_record_new_full(svc_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV);
r->data.srv.priority = 0;
r->data.srv.weight = 0;
r->data.srv.port = port;
- r->data.srv.name = flx_normalize_name(host);
- flx_server_add(s, g, interface, protocol, TRUE, r);
- flx_record_unref(r);
+ r->data.srv.name = avahi_normalize_name(host);
+ avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, r);
+ avahi_record_unref(r);
- flx_server_add_text_va(s, g, interface, protocol, FALSE, svc_name, va);
+ avahi_server_add_text_strlst(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, svc_name, strlst);
snprintf(enum_ptr, sizeof(enum_ptr), "_services._dns-sd._udp.%s", domain);
- flx_server_add_ptr(s, g, interface, protocol, FALSE, enum_ptr, ptr_name);
+ avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, enum_ptr, ptr_name);
}
-void flx_server_add_service(
- flxServer *s,
- flxEntryGroup *g,
+void avahi_server_add_service_va(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
+ gint interface,
+ guchar protocol,
+ const gchar *type,
+ const gchar *name,
+ const gchar *domain,
+ const gchar *host,
+ guint16 port,
+ va_list va){
+
+ g_assert(s);
+ g_assert(type);
+ g_assert(name);
+
+ avahi_server_add_service(s, g, interface, protocol, type, name, domain, host, port, avahi_string_list_new_va(va));
+}
+
+void avahi_server_add_service(
+ AvahiServer *s,
+ AvahiEntryGroup *g,
gint interface,
guchar protocol,
const gchar *type,
g_assert(name);
va_start(va, port);
- flx_server_add_service_va(s, g, interface, protocol, type, name, domain, host, port, va);
+ avahi_server_add_service_va(s, g, interface, protocol, type, name, domain, host, port, va);
va_end(va);
}
-static void post_query_callback(flxInterfaceMonitor *m, flxInterface *i, gpointer userdata) {
- flxKey *k = userdata;
+static void post_query_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata) {
+ AvahiKey *k = userdata;
g_assert(m);
g_assert(i);
g_assert(k);
- flx_interface_post_query(i, k, FALSE);
+ avahi_interface_post_query(i, k, FALSE);
}
-void flx_server_post_query(flxServer *s, gint interface, guchar protocol, flxKey *key) {
+void avahi_server_post_query(AvahiServer *s, gint interface, guchar protocol, AvahiKey *key) {
g_assert(s);
g_assert(key);
- flx_interface_monitor_walk(s->monitor, interface, protocol, post_query_callback, key);
+ avahi_interface_monitor_walk(s->monitor, interface, protocol, post_query_callback, key);
}
struct tmpdata {
- flxRecord *record;
+ AvahiRecord *record;
gboolean flush_cache;
};
-static void post_response_callback(flxInterfaceMonitor *m, flxInterface *i, gpointer userdata) {
+static void post_response_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata) {
struct tmpdata *tmpdata = userdata;
g_assert(m);
g_assert(i);
g_assert(tmpdata);
- flx_interface_post_response(i, NULL, tmpdata->record, tmpdata->flush_cache, FALSE);
+ avahi_interface_post_response(i, NULL, tmpdata->record, tmpdata->flush_cache, FALSE);
}
-void flx_server_post_response(flxServer *s, gint interface, guchar protocol, flxRecord *record, gboolean flush_cache) {
+void avahi_server_post_response(AvahiServer *s, gint interface, guchar protocol, AvahiRecord *record, gboolean flush_cache) {
struct tmpdata tmpdata;
g_assert(s);
tmpdata.record = record;
tmpdata.flush_cache = flush_cache;
- flx_interface_monitor_walk(s->monitor, interface, protocol, post_response_callback, &tmpdata);
+ avahi_interface_monitor_walk(s->monitor, interface, protocol, post_response_callback, &tmpdata);
}
-void flx_entry_group_run_callback(flxEntryGroup *g, flxEntryGroupStatus status) {
+void avahi_entry_group_change_state(AvahiEntryGroup *g, AvahiEntryGroupState state) {
g_assert(g);
+ g->state = state;
+
if (g->callback) {
- g->callback(g->server, g, status, g->userdata);
+ g->callback(g->server, g, state, g->userdata);
return;
}
-
- if (status == FLX_ENTRY_GROUP_COLLISION)
- flx_entry_group_free(g);
-
- /* Ignore the rest */
}
-flxEntryGroup *flx_entry_group_new(flxServer *s, flxEntryGroupCallback callback, gpointer userdata) {
- flxEntryGroup *g;
+AvahiEntryGroup *avahi_entry_group_new(AvahiServer *s, AvahiEntryGroupCallback callback, gpointer userdata) {
+ AvahiEntryGroup *g;
g_assert(s);
- g = g_new(flxEntryGroup, 1);
+ g = g_new(AvahiEntryGroup, 1);
g->server = s;
g->callback = callback;
g->userdata = userdata;
g->dead = FALSE;
- g->status = FLX_ENTRY_GROUP_UNCOMMITED;
+ g->state = AVAHI_ENTRY_GROUP_UNCOMMITED;
g->n_probing = 0;
- FLX_LLIST_HEAD_INIT(flxEntry, g->entries);
+ AVAHI_LLIST_HEAD_INIT(AvahiEntry, g->entries);
- FLX_LLIST_PREPEND(flxEntryGroup, groups, s->groups, g);
+ AVAHI_LLIST_PREPEND(AvahiEntryGroup, groups, s->groups, g);
return g;
}
-void flx_entry_group_free(flxEntryGroup *g) {
+void avahi_entry_group_free(AvahiEntryGroup *g) {
g_assert(g);
g_assert(g->server);
g->server->need_group_cleanup = TRUE;
}
-void flx_entry_group_commit(flxEntryGroup *g) {
- flxEntry *e;
+void avahi_entry_group_commit(AvahiEntryGroup *g) {
+ AvahiEntry *e;
g_assert(g);
g_assert(!g->dead);
- if (g->status != FLX_ENTRY_GROUP_UNCOMMITED)
+ if (g->state != AVAHI_ENTRY_GROUP_UNCOMMITED)
return;
- flx_entry_group_run_callback(g, g->status = FLX_ENTRY_GROUP_REGISTERING);
- flx_announce_group(g->server, g);
- flx_entry_group_check_probed(g, FALSE);
+ avahi_entry_group_change_state(g, AVAHI_ENTRY_GROUP_REGISTERING);
+ avahi_announce_group(g->server, g);
+ avahi_entry_group_check_probed(g, FALSE);
}
-gboolean flx_entry_commited(flxEntry *e) {
+gboolean avahi_entry_commited(AvahiEntry *e) {
g_assert(e);
g_assert(!e->dead);
return !e->group ||
- e->group->status == FLX_ENTRY_GROUP_REGISTERING ||
- e->group->status == FLX_ENTRY_GROUP_ESTABLISHED;
+ e->group->state == AVAHI_ENTRY_GROUP_REGISTERING ||
+ e->group->state == AVAHI_ENTRY_GROUP_ESTABLISHED;
}
-flxEntryGroupStatus flx_entry_group_get_status(flxEntryGroup *g) {
+AvahiEntryGroupState avahi_entry_group_get_state(AvahiEntryGroup *g) {
g_assert(g);
g_assert(!g->dead);
- return g->status;
+ return g->state;
}
projects / catta / blobdiff