#include "interface.h"
static struct uloop_timeout cache_gc;
-struct avl_tree entries;
+struct avl_tree services;
static AVL_TREE(records, avl_strcmp, true, NULL);
static void
}
static void
-cache_entry_free(struct cache_entry *s)
+cache_service_free(struct cache_service *s)
{
DBG(2, "%s\n", s->entry);
- avl_delete(&entries, &s->avl);
+ avl_delete(&services, &s->avl);
free(s);
}
static int
-cache_is_expired(time_t t, uint32_t ttl)
+cache_is_expired(time_t t, uint32_t ttl, int frac)
{
- if (time(NULL) - t >= ttl)
+ if (monotonic_time() - t >= ttl * frac / 100)
return 1;
return 0;
cache_gc_timer(struct uloop_timeout *timeout)
{
struct cache_record *r, *p;
- struct cache_entry *s, *t;
+ struct cache_service *s, *t;
avl_for_each_element_safe(&records, r, avl, p)
- if (cache_is_expired(r->time, r->ttl))
+ if (cache_is_expired(r->time, r->ttl, 100))
cache_record_free(r);
- avl_for_each_element_safe(&entries, s, avl, t) {
+ avl_for_each_element_safe(&services, s, avl, t) {
if (!s->host)
continue;
- if (cache_is_expired(s->time, s->ttl))
- cache_entry_free(s);
+ if (!cache_is_expired(s->time, s->ttl, s->refresh))
+ continue;
+ if (s->refresh >= 100) {
+ cache_service_free(s);
+ continue;
+ }
+ s->refresh += 50;
+ dns_send_question(s->iface, s->entry, TYPE_PTR, 1);
}
uloop_timeout_set(timeout, 10000);
int
cache_init(void)
{
- avl_init(&entries, avl_strcmp, true, NULL);
+ avl_init(&services, avl_strcmp, true, NULL);
cache_gc.cb = cache_gc_timer;
uloop_timeout_set(&cache_gc, 10000);
return 0;
}
-void cache_cleanup(void)
+void cache_cleanup(struct interface *iface)
{
struct cache_record *r, *p;
- struct cache_entry *s, *t;
+ struct cache_service *s, *t;
- avl_for_each_element_safe(&records, r, avl, p)
- cache_record_free(r);
+ avl_for_each_element_safe(&services, s, avl, t)
+ if (!iface || iface == s->iface)
+ cache_service_free(s);
- avl_for_each_element_safe(&entries, s, avl, t)
- cache_entry_free(s);
+ avl_for_each_element_safe(&records, r, avl, p)
+ if (!iface || iface == r->iface)
+ cache_record_free(r);
}
void
cache_scan(void)
{
struct interface *iface;
- struct cache_entry *s;
+ struct cache_service *s;
vlist_for_each_element(&interfaces, iface, node)
- avl_for_each_element(&entries, s, avl)
- dns_send_question(iface, s->entry, TYPE_PTR);
+ avl_for_each_element(&services, s, avl)
+ dns_send_question(iface, s->entry, TYPE_PTR, 1);
}
-static struct cache_entry*
-cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
+static struct cache_service*
+cache_service(struct interface *iface, char *entry, int hlen, int ttl)
{
- struct cache_entry *s, *t;
+ struct cache_service *s, *t;
char *entry_buf;
char *host_buf;
char *type;
- avl_for_each_element_safe(&entries, s, avl, t)
- if (!strcmp(s->entry, entry))
+ avl_for_each_element_safe(&services, s, avl, t)
+ if (!strcmp(s->entry, entry)) {
+ s->refresh = 50;
+ s->time = monotonic_time();
return s;
+ }
s = calloc_a(sizeof(*s),
&entry_buf, strlen(entry) + 1,
&host_buf, hlen ? hlen + 1 : 0);
s->avl.key = s->entry = strcpy(entry_buf, entry);
- s->time = time(NULL);
+ s->time = monotonic_time();
s->ttl = ttl;
+ s->iface = iface;
+ s->refresh = 50;
if (hlen)
s->host = strncpy(host_buf, s->entry, hlen);
type++;
if (type)
s->avl.key = type;
- avl_insert(&entries, &s->avl);
+ avl_insert(&services, &s->avl);
if (!hlen)
- dns_send_question(iface, entry, TYPE_PTR);
+ dns_send_question(iface, entry, TYPE_PTR, !iface->multicast);
return s;
}
if (!l)
return NULL;
- while (l && !strcmp(l->record, record)) {
+ while (l && l->record && !strcmp(l->record, record)) {
struct cache_record *r = l;
l = avl_next_element(l, avl);
}
void
-cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struct dns_answer *a, uint8_t *rdata)
+cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struct dns_answer *a, uint8_t *rdata, int flush)
{
struct dns_srv_data *dsd = (struct dns_srv_data *) rdata;
struct cache_record *r;
int host_len = 0;
static char *rdata_buffer = (char *) mdns_buf;
- if (!(a->class & CLASS_IN))
- return;
-
nlen = strlen(name);
switch (a->type) {
return;
}
- DBG(1, "A -> %s %s %s\n", dns_type_string(a->type), name, rdata_buffer);
+ DBG(1, "A -> %s %s %s ttl:%d\n", dns_type_string(a->type), name, rdata_buffer, a->ttl);
rdlength = strlen(rdata_buffer);
nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
host_len = rdlength - nlen - 1;
- cache_entry(iface, rdata_buffer, host_len, a->ttl);
+ cache_service(iface, rdata_buffer, host_len, a->ttl);
return;
case TYPE_SRV:
uint8_t v = *p;
*p = '\0';
- if (v)
+ if (v && p + v < &rdata_buffer[rdlength])
p += v + 1;
} while (*p);
break;
case TYPE_A:
- cache_entry(iface, name, strlen(name), a->ttl);
+ cache_service(iface, name, strlen(name), a->ttl);
if (a->rdlength != 4)
return;
dlen = 4;
break;
case TYPE_AAAA:
- cache_entry(iface, name, strlen(name), a->ttl);
+ cache_service(iface, name, strlen(name), a->ttl);
if (a->rdlength != 16)
return;
dlen = 16;
if (r) {
if (!a->ttl) {
DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
- cache_record_free(r);
+ r->time = monotonic_time() + 1 - r->ttl;
} else {
r->ttl = a->ttl;
DBG(1, "A -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
r->ttl = a->ttl;
r->port = port;
r->rdlength = dlen;
- r->time = time(NULL);
+ r->time = monotonic_time();
+ r->iface = iface;
if (tlen)
r->txt = memcpy(txt_ptr, rdata_buffer, tlen);
projects / project / mdnsd.git / blobdiff