#include <arpa/inet.h>
#include <string.h>
#include <sys/utsname.h>
+#include <unistd.h>
#include "server.h"
#include "util.h"
#include "iface.h"
+#include "socket.h"
+#include "subscribe.h"
-static gint timeval_cmp(const GTimeVal *a, const GTimeVal *b) {
+static void handle_query_key(flxServer *s, flxKey *k, flxInterface *i, const flxAddress *a) {
+ flxServerEntry *e;
+ gchar *txt;
+
+ g_assert(s);
+ g_assert(k);
+ g_assert(i);
g_assert(a);
- g_assert(b);
- if (a->tv_sec < b->tv_sec)
- return -1;
+ g_message("Handling query: %s", txt = flx_key_to_string(k));
+ g_free(txt);
- if (a->tv_sec > b->tv_sec)
- return 1;
+ flx_packet_scheduler_incoming_query(i->scheduler, k);
- if (a->tv_usec < b->tv_usec)
- return -1;
+ if (k->type == FLX_DNS_TYPE_ANY) {
- if (a->tv_usec > b->tv_usec)
- return 1;
+ /* Handle ANY query */
+
+ for (e = s->entries; e; e = e->entry_next)
+ if (flx_key_pattern_match(k, e->record->key))
+ if (flx_interface_match(i, e->interface, e->protocol) && flx_entry_established(s, e, i))
+ flx_interface_post_response(i, a, e->record, e->flags & FLX_SERVER_ENTRY_UNIQUE, FALSE);
+ } else {
- return 0;
+ /* Handle all other queries */
+
+ for (e = g_hash_table_lookup(s->rrset_by_key, k); e; e = e->by_key_next)
+ if (flx_interface_match(i, e->interface, e->protocol) && flx_entry_established(s, e, i))
+ flx_interface_post_response(i, a, e->record, e->flags & FLX_SERVER_ENTRY_UNIQUE, FALSE);
+ }
}
-static gint query_job_instance_compare(gpointer a, gpointer b) {
- flxQueryJobInstance *j = a, *k = b;
- g_assert(j);
- g_assert(k);
+static void handle_query(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
+ guint n;
+
+ g_assert(s);
+ g_assert(p);
+ g_assert(i);
+ g_assert(a);
+
+ for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_QDCOUNT); n > 0; n --) {
+ flxKey *key;
- return timeval_cmp(&j->job->time, &k->job->time);
+ if (!(key = flx_dns_packet_consume_key(p))) {
+ g_warning("Packet too short");
+ return;
+ }
+
+ handle_query_key(s, key, i, a);
+ flx_key_unref(key);
+ }
+
+ /* Known Answer Suppresion */
+ for (n = flx_dns_packet_get_field(p, FLX_DNS_FIELD_ANCOUNT); n > 0; n --) {
+ flxRecord *record;
+ gboolean unique = FALSE;
+
+ if (!(record = flx_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);
+ }
}
-static gint response_job_instance_compare(gpointer a, gpointer b) {
- flxResponseJobInstance *j = a, *k = b;
- g_assert(j);
- g_assert(k);
+static void handle_response(flxServer *s, flxDnsPacket *p, flxInterface *i, const flxAddress *a) {
+ guint n;
+
+ g_assert(s);
+ g_assert(p);
+ 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;
+ gboolean cache_flush = FALSE;
+ gchar *txt;
+
+ if (!(record = flx_dns_packet_consume_record(p, &cache_flush))) {
+ g_warning("Packet too short (3)");
+ return;
+ }
- return timeval_cmp(&j->job->time, &k->job->time);
+ if (record->key->type == FLX_DNS_TYPE_ANY)
+ continue;
+
+ g_message("Handling response: %s", txt = flx_record_to_string(record));
+ g_free(txt);
+
+ flx_cache_update(i->cache, record, cache_flush, a);
+
+ flx_packet_scheduler_incoming_response(i->scheduler, record);
+ flx_record_unref(record);
+ }
}
-flxServer *flx_server_new(GMainContext *c) {
- gchar *hn, *e, *hinfo;
+static void dispatch_packet(flxServer *s, flxDnsPacket *p, struct sockaddr *sa, gint iface, gint ttl) {
+ flxInterface *i;
+ flxAddress a;
+
+ 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))) {
+ 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);
+ return;
+ }
+
+ if (sa->sa_family == AF_INET6) {
+ static const unsigned char 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. */
+ return;
+ }
+ }
+
+ if (flx_dns_packet_check_valid(p) < 0) {
+ g_warning("Recieved invalid packet.");
+ return;
+ }
+
+ flx_address_from_sockaddr(sa, &a);
+
+ if (flx_dns_packet_is_query(p)) {
+
+ if (flx_dns_packet_get_field(p, FLX_DNS_FIELD_QDCOUNT) == 0 ||
+ flx_dns_packet_get_field(p, FLX_DNS_FIELD_ARCOUNT) != 0) {
+ g_warning("Invalid query packet.");
+ return;
+ }
+
+ handle_query(s, p, i, &a);
+ 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) {
+ g_warning("Invalid response packet.");
+ return;
+ }
+
+ handle_response(s, p, i, &a);
+ g_message("Handled response");
+ }
+}
+
+static gboolean work(flxServer *s) {
+ struct sockaddr_in6 sa6;
+ struct sockaddr_in sa;
+ flxDnsPacket *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))) {
+ dispatch_packet(s, p, (struct sockaddr*) &sa, iface, ttl);
+ flx_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))) {
+ dispatch_packet(s, p, (struct sockaddr*) &sa6, iface, ttl);
+ flx_dns_packet_free(p);
+ }
+ }
+
+ return TRUE;
+}
+
+static gboolean prepare_func(GSource *source, gint *timeout) {
+ g_assert(source);
+ g_assert(timeout);
+
+ *timeout = -1;
+ return FALSE;
+}
+
+static gboolean check_func(GSource *source) {
+ flxServer* s;
+ g_assert(source);
+
+ s = *((flxServer**) (((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;
+ g_assert(source);
+
+ s = *((flxServer**) (((guint8*) source) + sizeof(GSource)));
+ g_assert(s);
+
+ return work(s);
+}
+
+static void add_default_entries(flxServer *s) {
+ gint length = 0;
struct utsname utsname;
- gint length;
+ gchar *hinfo;
flxAddress a;
- flxServer *s = g_new(flxServer, 1);
+ flxRecord *r;
+
+ g_assert(s);
+
+ /* Fill in HINFO rr */
+ r = flx_record_new_full(s->hostname, FLX_DNS_CLASS_IN, FLX_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, 0, 0, AF_UNSPEC, FLX_SERVER_ENTRY_UNIQUE, r);
+ flx_record_unref(r);
- if (c) {
- g_main_context_ref(c);
- s->context = c;
- } else
+ /* Add localhost entries */
+ flx_address_parse("127.0.0.1", AF_INET, &a);
+ flx_server_add_address(s, 0, 0, AF_UNSPEC, FLX_SERVER_ENTRY_UNIQUE|FLX_SERVER_ENTRY_NOPROBE|FLX_SERVER_ENTRY_NOANNOUNCE, "localhost", &a);
+
+ flx_address_parse("::1", AF_INET6, &a);
+ flx_server_add_address(s, 0, 0, AF_UNSPEC, FLX_SERVER_ENTRY_UNIQUE|FLX_SERVER_ENTRY_NOPROBE|FLX_SERVER_ENTRY_NOANNOUNCE, "ip6-localhost", &a);
+}
+
+flxServer *flx_server_new(GMainContext *c) {
+ gchar *hn, *e;
+ flxServer *s;
+
+ static GSourceFuncs source_funcs = {
+ prepare_func,
+ check_func,
+ dispatch_func,
+ NULL,
+ NULL,
+ NULL
+ };
+
+ s = g_new(flxServer, 1);
+
+ s->fd_ipv4 = flx_open_socket_ipv4();
+ s->fd_ipv6 = flx_open_socket_ipv6();
+
+ if (s->fd_ipv6 < 0 && s->fd_ipv4 < 0) {
+ g_critical("Failed to create sockets.\n");
+ g_free(s);
+ return NULL;
+ }
+
+ if (s->fd_ipv4 < 0)
+ g_message("Failed to create IPv4 socket, proceeding in IPv6 only mode");
+ else if (s->fd_ipv6 < 0)
+ g_message("Failed to create IPv6 socket, proceeding in IPv4 only mode");
+
+ if (c)
+ g_main_context_ref(s->context = c);
+ else
s->context = g_main_context_default();
s->current_id = 1;
+
+ FLX_LLIST_HEAD_INIT(flxServerEntry, s->entries);
s->rrset_by_id = g_hash_table_new(g_int_hash, g_int_equal);
- s->rrset_by_name = g_hash_table_new(g_str_hash, g_str_equal);
- s->entries = NULL;
+ s->rrset_by_key = g_hash_table_new((GHashFunc) flx_key_hash, (GEqualFunc) flx_key_equal);
- s->query_job_queue = flx_prio_queue_new(query_job_instance_compare);
- s->response_job_queue = flx_prio_queue_new(response_job_instance_compare);
-
- s->monitor = flx_interface_monitor_new(s);
+ FLX_LLIST_HEAD_INIT(flxSubscription, s->subscriptions);
+ s->subscription_hashtable = g_hash_table_new((GHashFunc) flx_key_hash, (GEqualFunc) flx_key_equal);
+ s->monitor = flx_interface_monitor_new(s);
+ s->time_event_queue = flx_time_event_queue_new(s->context);
+
/* Get host name */
hn = flx_get_host_name();
- if ((e = strchr(hn, '.')))
- *e = 0;
+ hn[strcspn(hn, ".")] = 0;
- s->hostname = g_strdup_printf("%s.local.", hn);
+ s->hostname = g_strdup_printf("%slocal.", hn);
g_free(hn);
- /* Fill in HINFO rr */
- s->hinfo_rr_id = flx_server_get_next_id(s);
-
- uname(&utsname);
- hinfo = g_strdup_printf("%s%c%s%n", g_strup(utsname.machine), 0, g_strup(utsname.sysname), &length);
-
- flx_server_add(s, s->hinfo_rr_id, 0, AF_UNSPEC,
- s->hostname, FLX_DNS_TYPE_HINFO, hinfo, length+1);
-
+ add_default_entries(s);
- /* Add localhost entries */
- flx_address_parse("127.0.0.1", AF_INET, &a);
- flx_server_add_address(s, 0, 0, AF_UNSPEC, "localhost", &a);
+ s->source = g_source_new(&source_funcs, sizeof(GSource) + sizeof(flxServer*));
+ *((flxServer**) (((guint8*) s->source) + sizeof(GSource))) = s;
- flx_address_parse("::1", AF_INET6, &a);
- flx_server_add_address(s, 0, 0, AF_UNSPEC, "ip6-localhost", &a);
+ memset(&s->pollfd_ipv4, 0, sizeof(s->pollfd_ipv4));
+ s->pollfd_ipv4.fd = s->fd_ipv4;
+ s->pollfd_ipv4.events = G_IO_IN|G_IO_ERR|G_IO_HUP;
+ g_source_add_poll(s->source, &s->pollfd_ipv4);
+
+ memset(&s->pollfd_ipv6, 0, sizeof(s->pollfd_ipv6));
+ s->pollfd_ipv6.fd = s->fd_ipv6;
+ s->pollfd_ipv6.events = G_IO_IN|G_IO_ERR|G_IO_HUP;
+ g_source_add_poll(s->source, &s->pollfd_ipv6);
+ g_source_attach(s->source, s->context);
+
return s;
}
void flx_server_free(flxServer* s) {
g_assert(s);
- while (s->query_job_queue->last)
- flx_server_remove_query_job_instance(s, s->query_job_queue->last->data);
-
- flx_prio_queue_free(s->query_job_queue);
- flx_prio_queue_free(s->response_job_queue);
-
flx_interface_monitor_free(s->monitor);
flx_server_remove(s, 0);
+
+ while (s->subscriptions)
+ flx_subscription_free(s->subscriptions);
+ g_hash_table_destroy(s->subscription_hashtable);
g_hash_table_destroy(s->rrset_by_id);
- g_hash_table_destroy(s->rrset_by_name);
- g_main_context_unref(s->context);
+ g_hash_table_destroy(s->rrset_by_key);
+ flx_time_event_queue_free(s->time_event_queue);
+
+ if (s->fd_ipv4 >= 0)
+ close(s->fd_ipv4);
+ if (s->fd_ipv6 >= 0)
+ close(s->fd_ipv6);
+
g_free(s->hostname);
+
+ g_source_destroy(s->source);
+ g_source_unref(s->source);
+ g_main_context_unref(s->context);
+
g_free(s);
}
return s->current_id++;
}
-void flx_server_add_rr(flxServer *s, gint id, gint interface, guchar protocol, const flxRecord *rr) {
- flxEntry *e;
+void flx_server_add(
+ flxServer *s,
+ gint id,
+ gint interface,
+ guchar protocol,
+ flxServerEntryFlags flags,
+ flxRecord *r) {
+
+ flxServerEntry *e, *t;
g_assert(s);
- g_assert(rr);
- g_assert(rr->name);
- g_assert(rr->data);
- g_assert(rr->size);
+ g_assert(r);
+
+ g_assert(r->key->type != FLX_DNS_TYPE_ANY);
- e = g_new(flxEntry, 1);
- flx_record_copy_normalize(&e->rr, rr);
+ e = g_new(flxServerEntry, 1);
+ e->record = flx_record_ref(r);
e->id = id;
e->interface = interface;
e->protocol = protocol;
+ e->flags = flags;
- /* Insert into linked list */
- e->prev = NULL;
- if ((e->next = s->entries))
- e->next->prev = e;
- s->entries = e;
+ FLX_LLIST_HEAD_INIT(flxAnnouncement, e->announcements);
- /* Insert into hash table indexed by id */
- e->prev_by_id = NULL;
- if ((e->next_by_id = g_hash_table_lookup(s->rrset_by_id, &id)))
- e->next_by_id->prev = e;
- g_hash_table_replace(s->rrset_by_id, &e->id, e);
+ FLX_LLIST_PREPEND(flxServerEntry, entry, s->entries, e);
+ /* Insert into hash table indexed by id */
+ t = g_hash_table_lookup(s->rrset_by_id, &e->id);
+ FLX_LLIST_PREPEND(flxServerEntry, by_id, t, e);
+ g_hash_table_replace(s->rrset_by_id, &e->id, t);
+
/* Insert into hash table indexed by name */
- e->prev_by_name = NULL;
- if ((e->next_by_name = g_hash_table_lookup(s->rrset_by_name, e->rr.name)))
- e->next_by_name->prev = e;
- g_hash_table_replace(s->rrset_by_name, e->rr.name, e);
-}
-
-void flx_server_add(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, guint16 type, gconstpointer data, guint size) {
- flxRecord rr;
- g_assert(s);
- g_assert(name);
- g_assert(data);
- g_assert(size);
+ t = g_hash_table_lookup(s->rrset_by_key, e->record->key);
+ FLX_LLIST_PREPEND(flxServerEntry, by_key, t, e);
+ g_hash_table_replace(s->rrset_by_key, e->record->key, t);
- rr.name = (gchar*) name;
- rr.type = type;
- rr.class = FLX_DNS_CLASS_IN;
- rr.data = (gpointer) data;
- rr.size = size;
- rr.ttl = FLX_DEFAULT_TTL;
- flx_server_add_rr(s, id, interface, protocol, &rr);
+ flx_announce_entry(s, e);
}
-
const flxRecord *flx_server_iterate(flxServer *s, gint id, void **state) {
- flxEntry **e = (flxEntry**) state;
+ flxServerEntry **e = (flxServerEntry**) state;
g_assert(s);
g_assert(e);
if (e)
- *e = id > 0 ? (*e)->next_by_id : (*e)->next;
+ *e = id > 0 ? (*e)->by_id_next : (*e)->entry_next;
else
*e = id > 0 ? g_hash_table_lookup(s->rrset_by_id, &id) : s->entries;
if (!*e)
return NULL;
- return &(*e)->rr;
+ return flx_record_ref((*e)->record);
}
-static void free_entry(flxServer*s, flxEntry *e) {
+static void free_entry(flxServer*s, flxServerEntry *e) {
+ flxServerEntry *t;
+
g_assert(e);
+ flx_goodbye_entry(s, e, TRUE);
+
/* Remove from linked list */
- if (e->prev)
- e->prev->next = e->next;
- else
- s->entries = e->next;
-
- if (e->next)
- e->next->prev = e->prev;
+ FLX_LLIST_REMOVE(flxServerEntry, entry, s->entries, e);
/* Remove from hash table indexed by id */
- if (e->prev_by_id)
- e->prev_by_id = e->next_by_id;
- else {
- if (e->next_by_id)
- g_hash_table_replace(s->rrset_by_id, &e->next_by_id->id, e->next_by_id);
- else
- g_hash_table_remove(s->rrset_by_id, &e->id);
- }
-
- if (e->next_by_id)
- e->next_by_id->prev_by_id = e->prev_by_id;
-
- /* Remove from hash table indexed by name */
- if (e->prev_by_name)
- e->prev_by_name = e->next_by_name;
- else {
- if (e->next_by_name)
- g_hash_table_replace(s->rrset_by_name, &e->next_by_name->rr.name, e->next_by_name);
- else
- g_hash_table_remove(s->rrset_by_name, &e->rr.name);
- }
+ t = g_hash_table_lookup(s->rrset_by_id, &e->id);
+ FLX_LLIST_REMOVE(flxServerEntry, by_id, t, e);
+ if (t)
+ g_hash_table_replace(s->rrset_by_id, &t->id, t);
+ else
+ g_hash_table_remove(s->rrset_by_id, &e->id);
- if (e->next_by_name)
- e->next_by_name->prev_by_name = e->prev_by_name;
+ /* Remove from hash table indexed by name */
+ t = g_hash_table_lookup(s->rrset_by_key, e->record->key);
+ FLX_LLIST_REMOVE(flxServerEntry, by_key, t, e);
+ if (t)
+ g_hash_table_replace(s->rrset_by_key, t->record->key, t);
+ else
+ g_hash_table_remove(s->rrset_by_key, e->record->key);
+
+ flx_record_unref(e->record);
+ g_free(e);
}
void flx_server_remove(flxServer *s, gint id) {
while (s->entries)
free_entry(s, s->entries);
} else {
- flxEntry *e;
+ flxServerEntry *e;
while ((e = g_hash_table_lookup(s->rrset_by_id, &id)))
free_entry(s, e);
}
}
-flxRecord *flx_record_copy_normalize(flxRecord *ret_dest, const flxRecord*src) {
- g_assert(ret_dest);
- g_assert(src);
-
- *ret_dest = *src;
- ret_dest->name = flx_normalize_name(src->name);
- ret_dest->data = g_memdup(src->data, src->size);
-
- return ret_dest;
-}
+void flx_server_dump(flxServer *s, FILE *f) {
+ flxServerEntry *e;
+ g_assert(s);
+ g_assert(f);
-static const gchar *dns_class_to_string(guint16 class) {
- if (class == FLX_DNS_CLASS_IN)
- return "IN";
+ fprintf(f, "\n;;; ZONE DUMP FOLLOWS ;;;\n");
- return NULL;
-}
+ for (e = s->entries; e; e = e->entry_next) {
+ gchar *t;
-static const gchar *dns_type_to_string(guint16 type) {
- switch (type) {
- case FLX_DNS_TYPE_A:
- return "A";
- case FLX_DNS_TYPE_AAAA:
- return "AAAA";
- case FLX_DNS_TYPE_PTR:
- return "PTR";
- case FLX_DNS_TYPE_HINFO:
- return "HINFO";
- case FLX_DNS_TYPE_TXT:
- return "TXT";
- default:
- return NULL;
+ t = flx_record_to_string(e->record);
+ fprintf(f, "%s\n", t);
+ g_free(t);
}
+
+ flx_dump_caches(s->monitor, f);
}
-void flx_server_dump(flxServer *s, FILE *f) {
- flxEntry *e;
- g_assert(s);
- g_assert(f);
+void flx_server_add_ptr(
+ flxServer *s,
+ gint id,
+ gint interface,
+ guchar protocol,
+ flxServerEntryFlags flags,
+ const gchar *name,
+ const gchar *dest) {
- for (e = s->entries; e; e = e->next) {
- char t[256];
- fprintf(f, "%i.%u: %-40s %-8s %-8s ", e->interface, e->protocol, e->rr.name, dns_class_to_string(e->rr.class), dns_type_to_string(e->rr.type));
+ flxRecord *r;
- t[0] = 0;
-
- if (e->rr.class == FLX_DNS_CLASS_IN) {
- if (e->rr.type == FLX_DNS_TYPE_A)
- inet_ntop(AF_INET, e->rr.data, t, sizeof(t));
- else if (e->rr.type == FLX_DNS_TYPE_AAAA)
- inet_ntop(AF_INET6, e->rr.data, t, sizeof(t));
- else if (e->rr.type == FLX_DNS_TYPE_PTR)
- g_strlcpy(t, e->rr.data, sizeof(t));
- else if (e->rr.type == FLX_DNS_TYPE_HINFO) {
- char *s2;
-
- if ((s2 = memchr(e->rr.data, 0, e->rr.size))) {
- s2++;
- if (memchr(s2, 0, e->rr.size - ((char*) s2 - (char*) e->rr.data)))
- snprintf(t, sizeof(t), "'%s' '%s'", (char*) e->rr.data, s2);
- }
-
- } else if (e->rr.type == FLX_DNS_TYPE_TXT) {
- size_t l;
+ g_assert(dest);
- l = e->rr.size;
- if (l > sizeof(t)-1)
- l = sizeof(t)-1;
+ 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, id, interface, protocol, flags, r);
+ flx_record_unref(r);
- memcpy(t, e->rr.data, l);
- t[l] = 0;
- }
- }
-
- fprintf(f, "%s\n", t);
- }
}
-void flx_server_add_address(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, flxAddress *a) {
- gchar *n;
+void flx_server_add_address(
+ flxServer *s,
+ gint id,
+ gint interface,
+ guchar protocol,
+ flxServerEntryFlags flags,
+ const gchar *name,
+ flxAddress *a) {
+
+ gchar *n = NULL;
g_assert(s);
g_assert(a);
- n = flx_normalize_name(name ? name : s->hostname);
+ name = name ? (n = flx_normalize_name(name)) : s->hostname;
if (a->family == AF_INET) {
- gchar *r;
-
- flx_server_add(s, id, interface, protocol, n, FLX_DNS_TYPE_A, &a->ipv4, sizeof(a->ipv4));
+ gchar *reverse;
+ flxRecord *r;
- r = flx_reverse_lookup_name_ipv4(&a->ipv4);
- g_assert(r);
- flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
- g_free(r);
+ r = flx_record_new_full(name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_A);
+ r->data.a.address = a->data.ipv4;
+ flx_server_add(s, id, interface, protocol, flags, r);
+ flx_record_unref(r);
+
+ reverse = flx_reverse_lookup_name_ipv4(&a->data.ipv4);
+ g_assert(reverse);
+ flx_server_add_ptr(s, id, interface, protocol, flags, reverse, name);
+ g_free(reverse);
} else {
- gchar *r;
+ gchar *reverse;
+ flxRecord *r;
- flx_server_add(s, id, interface, protocol, n, FLX_DNS_TYPE_AAAA, &a->ipv6, sizeof(a->ipv6));
-
- r = flx_reverse_lookup_name_ipv6_arpa(&a->ipv6);
- g_assert(r);
- flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
- g_free(r);
+ r = flx_record_new_full(name, FLX_DNS_CLASS_IN, FLX_DNS_TYPE_AAAA);
+ r->data.aaaa.address = a->data.ipv6;
+ flx_server_add(s, id, interface, protocol, flags, r);
+ flx_record_unref(r);
+
+ reverse = flx_reverse_lookup_name_ipv6_arpa(&a->data.ipv6);
+ g_assert(reverse);
+ flx_server_add_ptr(s, id, interface, protocol, flags, reverse, name);
+ g_free(reverse);
- r = flx_reverse_lookup_name_ipv6_int(&a->ipv6);
- g_assert(r);
- flx_server_add(s, id, interface, protocol, r, FLX_DNS_TYPE_PTR, n, strlen(n)+1);
- g_free(r);
+ reverse = flx_reverse_lookup_name_ipv6_int(&a->data.ipv6);
+ g_assert(reverse);
+ flx_server_add_ptr(s, id, interface, protocol, flags, reverse, name);
+ g_free(reverse);
}
g_free(n);
}
-void flx_server_add_text(flxServer *s, gint id, gint interface, guchar protocol, const gchar *name, const gchar *text) {
- gchar *n;
- g_assert(s);
- g_assert(text);
+void flx_server_add_text_va(
+ flxServer *s,
+ gint id,
+ gint interface,
+ guchar protocol,
+ flxServerEntryFlags flags,
+ const gchar *name,
+ va_list va) {
- n = flx_normalize_name(name ? name : s->hostname);
- flx_server_add(s, id, interface, protocol, n, FLX_DNS_TYPE_TXT, text, strlen(text));
- g_free(n);
+ flxRecord *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, id, interface, protocol, flags, r);
+ flx_record_unref(r);
}
+void flx_server_add_text(
+ flxServer *s,
+ gint id,
+ gint interface,
+ guchar protocol,
+ flxServerEntryFlags flags,
+ const gchar *name,
+ ...) {
-flxQueryJob* flx_query_job_new(void) {
- flxQueryJob *job = g_new(flxQueryJob, 1);
- job->query.name = NULL;
- job->query.class = 0;
- job->query.type = 0;
- job->ref = 1;
- job->time.tv_sec = 0;
- job->time.tv_usec = 0;
- return job;
-}
-
-flxQueryJob* flx_query_job_ref(flxQueryJob *job) {
- g_assert(job);
- g_assert(job->ref >= 1);
- job->ref++;
- return job;
-}
+ va_list va;
+
+ g_assert(s);
-void flx_query_job_unref(flxQueryJob *job) {
- g_assert(job);
- g_assert(job->ref >= 1);
- if (!(--job->ref))
- g_free(job);
+ va_start(va, name);
+ flx_server_add_text_va(s, id, interface, protocol, flags, name, va);
+ va_end(va);
}
-static gboolean query_job_exists(flxServer *s, gint interface, guchar protocol, flxQuery *q) {
- flxPrioQueueNode *n;
+static void escape_service_name(gchar *d, guint size, const gchar *s) {
+ g_assert(d);
+ g_assert(size);
g_assert(s);
- g_assert(q);
- for (n = s->query_job_queue->root; n; n = n->next)
- if (flx_query_equal(&((flxQueryJobInstance*) n->data)->job->query, q))
- return TRUE;
+ while (*s && size >= 2) {
+ if (*s == '.' || *s == '\\') {
+ if (size < 3)
+ break;
- return FALSE;
+ *(d++) = '\\';
+ size--;
+ }
+
+ *(d++) = *(s++);
+ size--;
+ }
+
+ g_assert(size > 0);
+ *(d++) = 0;
}
-static void post_query_job(flxServer *s, gint interface, guchar protocol, flxQueryJob *job) {
+
+void flx_server_add_service_va(
+ flxServer *s,
+ gint id,
+ gint interface,
+ guchar protocol,
+ const gchar *type,
+ const gchar *name,
+ const gchar *domain,
+ const gchar *host,
+ guint16 port,
+ va_list va) {
+
+ gchar ptr_name[256], svc_name[256], ename[64], enum_ptr[256];
+ flxRecord *r;
+
g_assert(s);
- g_assert(job);
+ g_assert(type);
+ g_assert(name);
- if (interface <= 0) {
- const flxInterface *i;
-
- for (i = flx_interface_monitor_get_first(s->monitor); i; i = i->next)
- post_query_job(s, i->index, protocol, job);
- } else if (protocol == AF_UNSPEC) {
- post_query_job(s, interface, AF_INET, job);
- post_query_job(s, interface, AF_INET6, job);
- } else {
- flxQueryJobInstance *i;
+ escape_service_name(ename, sizeof(ename), name);
- if (query_job_exists(s, interface, protocol, &job->query))
- return;
-
- i = g_new(flxQueryJobInstance, 1);
- i->job = flx_query_job_ref(job);
- i->interface = interface;
- i->protocol = protocol;
- i->node = flx_prio_queue_put(s->query_job_queue, i);
- }
+ if (domain) {
+ while (domain[0] == '.')
+ domain++;
+ } else
+ domain = "local";
+
+ if (!host)
+ host = s->hostname;
+
+ 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, id, interface, protocol, FALSE, ptr_name, svc_name);
+
+ r = flx_record_new_full(svc_name, FLX_DNS_CLASS_IN, FLX_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, id, interface, protocol, TRUE, r);
+ flx_record_unref(r);
+
+ flx_server_add_text_va(s, id, interface, protocol, FALSE, svc_name, va);
+
+ snprintf(enum_ptr, sizeof(enum_ptr), "_services._dns-sd._udp.%s", domain);
+ flx_server_add_ptr(s, id, interface, protocol, FALSE, enum_ptr, ptr_name);
}
-void flx_server_post_query_job(flxServer *s, gint interface, guchar protocol, const GTimeVal *tv, const flxQuery *q) {
- flxQueryJob *job;
+void flx_server_add_service(
+ flxServer *s,
+ gint id,
+ 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(q);
-
- job = flx_query_job_new();
- job->query.name = g_strdup(q->name);
- job->query.class = q->class;
- job->query.type = q->type;
- if (tv)
- job->time = *tv;
- post_query_job(s, interface, protocol, job);
+ g_assert(type);
+ g_assert(name);
+
+ va_start(va, port);
+ flx_server_add_service_va(s, id, interface, protocol, type, name, domain, host, port, va);
+ va_end(va);
}
-void flx_server_drop_query_job(flxServer *s, gint interface, guchar protocol, const flxQuery *q) {
- flxPrioQueueNode *n, *next;
- g_assert(s);
- g_assert(interface > 0);
- g_assert(protocol != AF_UNSPEC);
- g_assert(q);
+static void post_query_callback(flxInterfaceMonitor *m, flxInterface *i, gpointer userdata) {
+ flxKey *k = userdata;
- for (n = s->query_job_queue->root; n; n = next) {
- next = n->next;
-
- if (flx_query_equal(&((flxQueryJobInstance*) n->data)->job->query, q))
- flx_server_remove_query_job_instance(s, n->data);
- }
+ g_assert(m);
+ g_assert(i);
+ g_assert(k);
+
+ flx_interface_post_query(i, k, FALSE);
}
-void flx_server_remove_query_job_instance(flxServer *s, flxQueryJobInstance *i) {
+void flx_server_post_query(flxServer *s, gint interface, guchar protocol, flxKey *key) {
g_assert(s);
- g_assert(i);
- g_assert(i->node);
+ g_assert(key);
- flx_prio_queue_remove(s->query_job_queue, i->node);
- flx_query_job_unref(i->job);
- g_free(i);
+ flx_interface_monitor_walk(s->monitor, interface, protocol, post_query_callback, key);
}
-gboolean flx_query_equal(const flxQuery *a, const flxQuery *b) {
- return strcmp(a->name, b->name) == 0 && a->type == b->type && a->class == b->class;
+struct tmpdata {
+ flxRecord *record;
+ gboolean flush_cache;
+};
+
+static void post_response_callback(flxInterfaceMonitor *m, flxInterface *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);
}
+void flx_server_post_response(flxServer *s, gint interface, guchar protocol, flxRecord *record, gboolean flush_cache) {
+ struct tmpdata tmpdata;
+
+ g_assert(s);
+ g_assert(record);
+
+ tmpdata.record = record;
+ tmpdata.flush_cache = flush_cache;
+
+ flx_interface_monitor_walk(s->monitor, interface, protocol, post_response_callback, &tmpdata);
+}
projects / catta / blobdiff