#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/byteorder.h>
#include <arpa/nameser.h>
#include <resolv.h>
#include <time.h>
static struct cache_entry*
cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
{
- struct cache_entry *s;
+ struct cache_entry *s, *t;
char *entry_buf;
char *host_buf;
char *type;
- s = avl_find_element(&entries, entry, s, avl);
- if (s)
- return s;
+ avl_for_each_element_safe(&entries, s, avl, t)
+ if (!strcmp(s->entry, entry))
+ return s;
s = calloc_a(sizeof(*s),
&entry_buf, strlen(entry) + 1,
if (!l)
return NULL;
- while (l && !avl_is_last(&records, &l->avl) && !strcmp(l->record, record)) {
+ while (l && l->record && !strcmp(l->record, record)) {
struct cache_record *r = l;
l = avl_next_element(l, avl);
char *name_buf;
void *rdata_ptr, *txt_ptr;
int host_len = 0;
-
- static char rdata_buffer[MAX_DATA_LEN + 1];
+ static char *rdata_buffer = (char *) mdns_buf;
if (!(a->class & CLASS_IN))
return;
uint8_t v = *p;
*p = '\0';
- if (v)
+ if (v && p + v < &rdata_buffer[rdlength])
p += v + 1;
} while (*p);
break;
r = cache_record_find(name, a->type, port, dlen, rdata);
if (r) {
if (!a->ttl) {
- cache_record_free(r);
DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
+ r->time = time(0) + 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);
void
cache_dump_records(struct blob_buf *buf, const char *name)
{
- struct cache_record *r, *q = avl_find_element(&records, name, r, avl);
+ struct cache_record *r, *last, *next;
const char *txt;
char buffer[INET6_ADDRSTRLEN];
- if (!q)
- return;
-
- do {
- r = q;
+ last = avl_last_element(&records, last, avl);
+ for (r = avl_find_element(&records, name, r, avl); r; r = next) {
switch (r->type) {
case TYPE_TXT:
if (r->txt && strlen(r->txt)) {
blobmsg_add_string(buf, "ipv6", buffer);
break;
}
- q = avl_next_element(r, avl);
- } while (q && !strcmp(r->record, q->record));
+
+ if (r == last)
+ break;
+
+ next = avl_next_element(r, avl);
+ if (strcmp(r->record, next->record) != 0)
+ break;
+ }
}