projects
/
project
/
mdnsd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
entry->service
[project/mdnsd.git]
/
cache.c
diff --git
a/cache.c
b/cache.c
index
cdc4a79
..
190290a
100644
(file)
--- a/
cache.c
+++ b/
cache.c
@@
-41,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
@@
-53,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);
}
@@
-73,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);
@@
-92,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);
@@
-103,35
+103,35
@@
cache_init(void)
void cache_cleanup(void)
{
struct cache_record *r, *p;
void cache_cleanup(void)
{
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(&records, r, avl, p)
cache_record_free(r);
- avl_for_each_element_safe(&
entri
es, s, avl, t)
- cache_
entry
_free(s);
+ avl_for_each_element_safe(&
servic
es, s, avl, t)
+ cache_
service
_free(s);
}
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, *t;
+ struct cache_
service
*s, *t;
char *entry_buf;
char *host_buf;
char *type;
char *entry_buf;
char *host_buf;
char *type;
- avl_for_each_element_safe(&
entri
es, s, avl, t)
+ avl_for_each_element_safe(&
servic
es, s, avl, t)
if (!strcmp(s->entry, entry))
return s;
if (!strcmp(s->entry, entry))
return s;
@@
-151,10
+151,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;
}
@@
-167,7
+167,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 && !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);
@@
-216,7
+216,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;
@@
-227,9
+227,6
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
int host_len = 0;
static char *rdata_buffer = (char *) mdns_buf;
int host_len = 0;
static char *rdata_buffer = (char *) mdns_buf;
- if (!(a->class & CLASS_IN))
- return;
-
nlen = strlen(name);
switch (a->type) {
nlen = strlen(name);
switch (a->type) {
@@
-242,7
+239,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);
@@
-250,7
+247,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:
@@
-280,14
+277,14
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
break;
case TYPE_A:
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;
@@
-301,7
+298,7
@@
cache_answer(struct interface *iface, uint8_t *base, int blen, char *name, struc
if (r) {
if (!a->ttl) {
DBG(1, "D -> %s %s ttl:%d\n", dns_type_string(r->type), r->record, r->ttl);
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 = 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);