static struct uloop_timeout cache_gc;
struct avl_tree records, entries, hosts;
-static struct blob_buf b;
-
-static struct kvlist types;
static void
-cache_record_free(struct cache_record *r, int rem)
+cache_record_free(struct cache_record *r)
{
DBG(2, "%s %s\n", dns_type_string(r->type), r->record);
- if (rem)
- avl_delete(&records, &r->avl);
+ avl_delete(&records, &r->avl);
free(r);
}
avl_for_each_element_safe(&records, r, avl, p)
if (cache_is_expired(r->time, r->ttl))
- cache_record_free(r, 1);
+ cache_record_free(r);
avl_for_each_element_safe(&entries, s, avl, t) {
if (!s->host)
uloop_timeout_set(timeout, 10000);
}
-static void
-cache_load_services(void)
-{
- struct blob_attr *cur;
- int rem;
-
- blob_buf_init(&b, 0);
-
- if (!blobmsg_add_json_from_file(&b, "/lib/mdns/service-types"))
- return;
-
- blob_for_each_attr(cur, b.head, rem)
- kvlist_set(&types, blobmsg_name(cur), blobmsg_get_string(cur));
-}
-
-char*
-cache_lookup_name(const char *key)
-{
- return kvlist_get(&types, key);
-}
-
int
cache_init(void)
{
- kvlist_init(&types, kvlist_strlen);
avl_init(&entries, avl_strcmp, true, NULL);
avl_init(&records, avl_strcmp, true, NULL);
cache_gc.cb = cache_gc_timer;
uloop_timeout_set(&cache_gc, 10000);
- cache_load_services();
return 0;
}
struct cache_entry *s, *t;
avl_for_each_element_safe(&records, r, avl, p)
- cache_record_free(r, 1);
+ cache_record_free(r);
avl_for_each_element_safe(&entries, s, avl, t)
cache_entry_free(s);
char *p = NULL;
char *name_buf;
void *rdata_ptr, *txt_ptr;
+ int host_len = 0;
if (!(a->class & CLASS_IN))
return;
rdlength = strlen(rdata_buffer);
- if (!strcmp(C_DNS_SD, name)) {
- cache_entry(u, rdata_buffer, 0, a->ttl);
- return;
- }
-
- if ((rdlength < nlen) && (rdlength - nlen - 1 > 0))
- return;
+ if (strcmp(C_DNS_SD, name) != 0 &&
+ nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
+ host_len = rdlength - nlen - 1;
- cache_entry(u, rdata_buffer, rdlength - nlen - 1, a->ttl);
+ cache_entry(u, rdata_buffer, host_len, a->ttl);
return;
case TYPE_SRV:
r = cache_record_find(name, a->type, port, dlen, rdata);
if (r) {
if (!a->ttl) {
- cache_record_free(r, 1);
+ cache_record_free(r);
DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
} else {
r->ttl = a->ttl;