projects
/
oweals
/
mdnsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a iface pointer to services and records
[oweals/mdnsd.git]
/
cache.c
diff --git
a/cache.c
b/cache.c
index 89bd015bb80d1748299453ac1a5e6d904906acb7..e4479226609b0b2ac69b92ec0f3755af03270ef1 100644
(file)
--- a/
cache.c
+++ b/
cache.c
@@
-24,7
+24,6
@@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#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>
#include <arpa/nameser.h>
#include <resolv.h>
#include <time.h>
@@
-42,7
+41,7
@@
#include "interface.h"
static struct uloop_timeout cache_gc;
#include "interface.h"
static struct uloop_timeout cache_gc;
-struct avl_tree
entri
es;
+struct avl_tree
servic
es;
static AVL_TREE(records, avl_strcmp, true, NULL);
static void
static AVL_TREE(records, avl_strcmp, true, NULL);
static void
@@
-54,10
+53,10
@@
cache_record_free(struct cache_record *r)
}
static void
}
static void
-cache_
entry_free(struct cache_entry
*s)
+cache_
service_free(struct cache_service
*s)
{
DBG(2, "%s\n", s->entry);
{
DBG(2, "%s\n", s->entry);
- avl_delete(&
entri
es, &s->avl);
+ avl_delete(&
servic
es, &s->avl);
free(s);
}
free(s);
}
@@
-74,17
+73,17
@@
static void
cache_gc_timer(struct uloop_timeout *timeout)
{
struct cache_record *r, *p;
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))
cache_record_free(r);
avl_for_each_element_safe(&records, r, avl, p)
if (cache_is_expired(r->time, r->ttl))
cache_record_free(r);
- avl_for_each_element_safe(&
entri
es, s, avl, t) {
+ avl_for_each_element_safe(&
servic
es, s, avl, t) {
if (!s->host)
continue;
if (cache_is_expired(s->time, s->ttl))
if (!s->host)
continue;
if (cache_is_expired(s->time, s->ttl))
- cache_
entry
_free(s);
+ cache_
service
_free(s);
}
uloop_timeout_set(timeout, 10000);
}
uloop_timeout_set(timeout, 10000);
@@
-93,7
+92,7
@@
cache_gc_timer(struct uloop_timeout *timeout)
int
cache_init(void)
{
int
cache_init(void)
{
- avl_init(&
entri
es, avl_strcmp, true, NULL);
+ avl_init(&
servic
es, avl_strcmp, true, NULL);
cache_gc.cb = cache_gc_timer;
uloop_timeout_set(&cache_gc, 10000);
cache_gc.cb = cache_gc_timer;
uloop_timeout_set(&cache_gc, 10000);
@@
-101,40
+100,42
@@
cache_init(void)
return 0;
}
return 0;
}
-void cache_cleanup(
void
)
+void cache_cleanup(
struct interface *iface
)
{
struct cache_record *r, *p;
{
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;
}
void
cache_scan(void)
{
struct interface *iface;
- struct cache_
entry
*s;
+ struct cache_
service
*s;
vlist_for_each_element(&interfaces, iface, node)
vlist_for_each_element(&interfaces, iface, node)
- avl_for_each_element(&
entri
es, s, avl)
- dns_send_question(iface, s->entry, TYPE_PTR);
+ avl_for_each_element(&
servic
es, 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
;
+ struct cache_
service *s, *t
;
char *entry_buf;
char *host_buf;
char *type;
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(&services, s, avl, t)
+
if (!strcmp(s->entry, entry)
)
+
return s;
s = calloc_a(sizeof(*s),
&entry_buf, strlen(entry) + 1,
s = calloc_a(sizeof(*s),
&entry_buf, strlen(entry) + 1,
@@
-143,6
+144,7
@@
cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
s->avl.key = s->entry = strcpy(entry_buf, entry);
s->time = time(NULL);
s->ttl = ttl;
s->avl.key = s->entry = strcpy(entry_buf, entry);
s->time = time(NULL);
s->ttl = ttl;
+ s->iface = iface;
if (hlen)
s->host = strncpy(host_buf, s->entry, hlen);
if (hlen)
s->host = strncpy(host_buf, s->entry, hlen);
@@
-152,10
+154,10
@@
cache_entry(struct interface *iface, char *entry, int hlen, int ttl)
type++;
if (type)
s->avl.key = type;
type++;
if (type)
s->avl.key = type;
- avl_insert(&
entri
es, &s->avl);
+ avl_insert(&
servic
es, &s->avl);
if (!hlen)
if (!hlen)
- dns_send_question(iface, entry, TYPE_PTR);
+ dns_send_question(iface, entry, TYPE_PTR
, !iface->multicast
);
return s;
}
return s;
}
@@
-168,7
+170,7
@@
cache_record_find(char *record, int type, int port, int rdlength, uint8_t *rdata
if (!l)
return NULL;
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);
struct cache_record *r = l;
l = avl_next_element(l, avl);
@@
-217,7
+219,7
@@
cache_host_is_known(char *record)
}
void
}
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;
{
struct dns_srv_data *dsd = (struct dns_srv_data *) rdata;
struct cache_record *r;
@@
-226,11
+228,7
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
char *name_buf;
void *rdata_ptr, *txt_ptr;
int host_len = 0;
char *name_buf;
void *rdata_ptr, *txt_ptr;
int host_len = 0;
-
- static char rdata_buffer[MAX_DATA_LEN + 1];
-
- if (!(a->class & CLASS_IN))
- return;
+ static char *rdata_buffer = (char *) mdns_buf;
nlen = strlen(name);
nlen = strlen(name);
@@
-244,7
+242,7
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
return;
}
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);
rdlength = strlen(rdata_buffer);
@@
-252,7
+250,7
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
nlen + 1 < rdlength && !strcmp(rdata_buffer + rdlength - nlen, name))
host_len = rdlength - nlen - 1;
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:
return;
case TYPE_SRV:
@@
-276,20
+274,20
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
uint8_t v = *p;
*p = '\0';
uint8_t v = *p;
*p = '\0';
- if (v)
+ if (v
&& p + v < &rdata_buffer[rdlength]
)
p += v + 1;
} while (*p);
break;
case TYPE_A:
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:
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 (a->rdlength != 16)
return;
dlen = 16;
@@
-302,8
+300,8
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
r = cache_record_find(name, a->type, port, dlen, rdata);
if (r) {
if (!a->ttl) {
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);
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);
} else {
r->ttl = a->ttl;
DBG(1, "A -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
@@
-325,6
+323,7
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
r->port = port;
r->rdlength = dlen;
r->time = time(NULL);
r->port = port;
r->rdlength = dlen;
r->time = time(NULL);
+ r->iface = iface;
if (tlen)
r->txt = memcpy(txt_ptr, rdata_buffer, tlen);
if (tlen)
r->txt = memcpy(txt_ptr, rdata_buffer, tlen);
@@
-341,15
+340,12
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
void
cache_dump_records(struct blob_buf *buf, const char *name)
{
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];
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)) {
switch (r->type) {
case TYPE_TXT:
if (r->txt && strlen(r->txt)) {
@@
-376,6
+372,12
@@
cache_dump_records(struct blob_buf *buf, const char *name)
blobmsg_add_string(buf, "ipv6", buffer);
break;
}
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;
+ }
}
}