#include "str.h"
#include "file.h"
#include "array.h"
+#include "resources.h"
#include "rbl.h"
#define IPv4_BITS 5
};
struct rbldb_t {
- A(uint16_t) ips[1 << 16];
+ char *filename;
+ A(uint16_t) *ips;
};
ARRAY(rbldb_t)
+typedef struct rbldb_resource_t {
+ time_t mtime;
+ off_t size;
+ A(uint16_t) ips[1 << 16];
+} rbldb_resource_t;
+
+static void rbldb_resource_wipe(rbldb_resource_t *res)
+{
+ for (int i = 0 ; i < 1 << 16 ; ++i) {
+ array_wipe(res->ips[i]);
+ }
+ p_delete(&res);
+}
+
static int get_o(const char *s, const char **out)
{
int res = 0;
return NULL;
}
+ rbldb_resource_t *res = resource_get("iplist", file);
+ if (res == NULL) {
+ debug("No resource found");
+ res = p_new(rbldb_resource_t, 1);
+ resource_set("iplist", file, res, (resource_destructor_t)rbldb_resource_wipe);
+ }
+
+ db = p_new(rbldb_t, 1);
+ db->filename = m_strdup(file);
+ db->ips = res->ips;
+ if (map.st.st_size == res->size && map.st.st_mtime == res->mtime) {
+ info("rbl %s up to date", file);
+ file_map_close(&map);
+ return db;
+ }
+ debug("mtime %d/%d, size %d/%d", (int)map.st.st_mtime, (int)res->mtime, (int)map.st.st_size, (int)res->size);
+ res->size = map.st.st_size;
+ res->mtime = map.st.st_mtime;
+
p = map.map;
end = map.end;
while (end > p && end[-1] != '\n') {
file);
}
- db = p_new(rbldb_t, 1);
while (p < end) {
uint32_t ip;
if (parse_ipv4(p, &p, &ip) < 0) {
p = (char *)memchr(p, '\n', end - p) + 1;
} else {
- array_add(db->ips[ip >> 16], ip & 0xffff);
+ array_add(res->ips[ip >> 16], ip & 0xffff);
++ips;
}
}
/* Lookup may perform serveral I/O, so avoid swap.
*/
for (int i = 0 ; i < 1 << 16 ; ++i) {
- array_adjust(db->ips[i]);
- if (lock && !array_lock(db->ips[i])) {
+ array_adjust(res->ips[i]);
+ if (lock && !array_lock(res->ips[i])) {
UNIXERR("mlock");
}
- if (db->ips[i].len) {
+ if (res->ips[i].len) {
# define QSORT_TYPE uint16_t
-# define QSORT_BASE db->ips[i].data
-# define QSORT_NELT db->ips[i].len
+# define QSORT_BASE res->ips[i].data
+# define QSORT_NELT res->ips[i].len
# define QSORT_LT(a,b) *a < *b
# include "qsort.c"
}
static void rbldb_wipe(rbldb_t *db)
{
- for (int i = 0 ; i < 1 << 16 ; ++i) {
- array_wipe(db->ips[i]);
- }
+ resource_release("iplist", db->filename);
+ p_delete(&db->filename);
+ db->ips = NULL;
}
void rbldb_delete(rbldb_t **db)
#include "str.h"
#include "rbl.h"
#include "policy_tokens.h"
+#include "resources.h"
+
+typedef struct strlist_local_t {
+ char *filename;
+ trie_t **db;
+ int weight;
+ unsigned reverse :1;
+ unsigned partial :1;
+} strlist_local_t;
+ARRAY(strlist_local_t)
+
+typedef struct strlist_resource_t {
+ off_t size;
+ time_t mtime;
+ trie_t *trie1;
+ trie_t *trie2;
+} strlist_resource_t;
typedef struct strlist_config_t {
- PA(trie_t) tries;
- A(int) weights;
- A(bool) reverses;
- A(bool) partiales;
+ A(strlist_local_t) locals;
A(char) hosts;
A(int) host_offsets;
static filter_type_t filter_type = FTK_UNKNOWN;
+static void strlist_local_wipe(strlist_local_t *entry)
+{
+ if (entry->filename != NULL) {
+ resource_release("strlist", entry->filename);
+ p_delete(&entry->filename);
+ }
+}
+
+static void strlist_resource_wipe(strlist_resource_t *res)
+{
+ trie_delete(&res->trie1);
+ trie_delete(&res->trie2);
+ p_delete(&res);
+}
+
static strlist_config_t *strlist_config_new(void)
{
return p_new(strlist_config_t, 1);
static void strlist_config_delete(strlist_config_t **config)
{
if (*config) {
- array_deep_wipe((*config)->tries, trie_delete);
- array_wipe((*config)->weights);
- array_wipe((*config)->reverses);
- array_wipe((*config)->partiales);
+ array_deep_wipe((*config)->locals, strlist_local_wipe);
array_wipe((*config)->hosts);
array_wipe((*config)->host_offsets);
array_wipe((*config)->host_weights);
}
-static trie_t *strlist_create(const char *file, bool reverse, bool lock)
+static bool strlist_create(strlist_local_t *local,
+ const char *file, int weight,
+ bool reverse, bool partial, bool lock)
{
- trie_t *db;
file_map_t map;
const char *p, *end;
char line[BUFSIZ];
uint32_t count = 0;
if (!file_map_open(&map, file, false)) {
- return NULL;
+ return false;
}
p = map.map;
end = map.end;
file);
}
- db = trie_new();
+ strlist_resource_t *res = resource_get("strlist", file);
+ if (res == NULL) {
+ res = p_new(strlist_resource_t, 1);
+ resource_set("strlist", file, res, (resource_destructor_t)strlist_resource_wipe);
+ } else if (res->trie2 != NULL) {
+ err("A file (%s) cannot be used as a rbldns zone file and a strlist file at the same time",
+ file);
+ resource_release("strlist", file);
+ file_map_close(&map);
+ return false;
+ }
+
+ p_clear(local, 1);
+ local->filename = m_strdup(file);
+ local->db = &res->trie1;
+ local->weight = weight;
+ local->reverse = reverse;
+ local->partial = partial;
+ if (res->size == map.st.st_size && res->mtime == map.st.st_mtime) {
+ info("strlist %s up to date", file);
+ file_map_close(&map);
+ return true;
+ }
+ trie_delete(&res->trie1);
+ res->trie1 = trie_new();
+ res->size = map.st.st_size;
+ res->mtime = map.st.st_mtime;
+
while (p < end && p != NULL) {
const char *eol = (char *)memchr(p, '\n', end - p);
if (eol == NULL) {
if (eol - p >= BUFSIZ) {
err("unreasonnable long line");
file_map_close(&map);
- trie_delete(&db);
- return NULL;
+ trie_delete(&res->trie1);
+ strlist_local_wipe(local);
+ return false;
}
if (*p != '#') {
const char *eos = eol;
}
if (p < eos) {
strlist_copy(line, p, eos - p, reverse);
- trie_insert(db, line);
+ trie_insert(res->trie1, line);
++count;
}
}
p = eol + 1;
}
file_map_close(&map);
- trie_compile(db, lock);
+ trie_compile(res->trie1, lock);
info("%s loaded, %u entries", file, count);
- return db;
+ return true;
}
-static bool strlist_create_from_rhbl(const char *file, bool lock,
- trie_t **phosts, trie_t **pdomains)
+static bool strlist_create_from_rhbl(strlist_local_t *hosts, strlist_local_t *domains,
+ const char *file, int weight, bool lock)
{
- trie_t *hosts, *domains;
uint32_t host_count, domain_count;
file_map_t map;
const char *p, *end;
file);
}
- hosts = trie_new();
+
+ strlist_resource_t *res = resource_get("strlist", file);
+ if (res == NULL) {
+ res = p_new(strlist_resource_t, 1);
+ resource_set("strlist", file, res, (resource_destructor_t)strlist_resource_wipe);
+ } else if (res->trie2 == NULL) {
+ err("A file (%s) cannot be used as a rbldns zone file and a strlist file at the same time",
+ file);
+ resource_release("strlist", file);
+ file_map_close(&map);
+ return false;
+ }
+
+ p_clear(hosts, 1);
+ hosts->filename = m_strdup(file);
+ hosts->db = &res->trie1;
+ hosts->weight = weight;
+ hosts->reverse = true;
host_count = 0;
- domains = trie_new();
+
+ p_clear(domains, 1);
+ /* don't set filename */
+ domains->db = &res->trie2;
+ domains->weight = weight;
+ domains->reverse = true;
+ domains->partial = true;
domain_count = 0;
+
+ if (map.st.st_size == res->size && map.st.st_mtime == res->mtime) {
+ info("rbldns %s up to date", file);
+ file_map_close(&map);
+ return true;
+ }
+
+ trie_delete(&res->trie1);
+ trie_delete(&res->trie2);
+ res->trie1 = trie_new();
+ res->trie2 = trie_new();
+ res->size = map.st.st_size;
+ res->mtime = map.st.st_mtime;
+
while (p < end && p != NULL) {
const char *eol = (char *)memchr(p, '\n', end - p);
if (eol == NULL) {
if (eol - p >= BUFSIZ) {
err("unreasonnable long line");
file_map_close(&map);
- trie_delete(&hosts);
- trie_delete(&domains);
+ trie_delete(&res->trie1);
+ trie_delete(&res->trie2);
+ strlist_local_wipe(hosts);
return false;
}
if (*p != '#') {
if (p < eos) {
if (isalnum(*p)) {
strlist_copy(line, p, eos - p, true);
- trie_insert(hosts, line);
+ trie_insert(res->trie1, line);
++host_count;
} else if (*p == '*') {
++p;
strlist_copy(line, p, eos - p, true);
- trie_insert(domains, line);
+ trie_insert(res->trie2, line);
++domain_count;
}
}
}
file_map_close(&map);
if (host_count > 0) {
- trie_compile(hosts, lock);
- *phosts = hosts;
+ trie_compile(res->trie1, lock);
} else {
- trie_delete(&hosts);
- *phosts = NULL;
+ trie_delete(&res->trie1);
}
if (domain_count > 0) {
- trie_compile(domains, lock);
- *pdomains = domains;
+ trie_compile(res->trie2, lock);
} else {
- trie_delete(&domains);
- *pdomains = NULL;
+ trie_delete(&res->trie2);
}
info("rhbl %s loaded, %u hosts, %u domains", file, host_count, domain_count);
- return hosts != NULL || domains != NULL;
-
+ if (res->trie1 == NULL && res->trie2 == NULL) {
+ strlist_local_wipe(hosts);
+ return false;
+ }
+ return true;
}
int weight = 0;
bool reverse = false;
bool partial = false;
- trie_t *trie = NULL;
const char *current = param->value;
const char *p = m_strchrnul(param->value, ':');
char *next = NULL;
(int)(p - current), current);
break;
- case 3:
- trie = strlist_create(current, reverse, lock);
- PARSE_CHECK(trie != NULL,
+ case 3: {
+ strlist_local_t entry;
+ PARSE_CHECK(strlist_create(&entry, current, weight,
+ reverse, partial, lock),
"cannot load string list from %s", current);
- array_add(config->tries, trie);
- array_add(config->weights, weight);
- array_add(config->reverses, reverse);
- array_add(config->partiales, partial);
- break;
+ array_add(config->locals, entry);
+ } break;
}
if (i != 3) {
current = p + 1;
case ATK_RBLDNS: {
bool lock = false;
int weight = 0;
- trie_t *trie_hosts = NULL;
- trie_t *trie_domains = NULL;
const char *current = param->value;
const char *p = m_strchrnul(param->value, ':');
char *next = NULL;
(int)(p - current), current);
break;
- case 2:
- PARSE_CHECK(strlist_create_from_rhbl(current, lock,
- &trie_hosts, &trie_domains),
+ case 2: {
+ strlist_local_t trie_hosts, trie_domains;
+ PARSE_CHECK(strlist_create_from_rhbl(&trie_hosts, &trie_domains,
+ current, weight, lock),
"cannot load string list from rhbl %s", current);
- if (trie_hosts != NULL) {
- array_add(config->tries, trie_hosts);
- array_add(config->weights, weight);
- array_add(config->reverses, true);
- array_add(config->partiales, false);
+ if (trie_hosts.db != NULL) {
+ array_add(config->locals, trie_hosts);
}
- if (trie_domains != NULL) {
- array_add(config->tries, trie_domains);
- array_add(config->weights, weight);
- array_add(config->reverses, true);
- array_add(config->partiales, true);
+ if (trie_domains.db != NULL) {
+ array_add(config->locals, trie_domains);
}
config->is_hostname = true;
- break;
+ } break;
}
if (i != 2) {
current = p + 1;
PARSE_CHECK(config->is_email != config->is_hostname,
"matched field MUST be emails XOR hostnames");
- PARSE_CHECK(config->tries.len || config->host_offsets.len,
+ PARSE_CHECK(config->locals.len || config->host_offsets.len,
"no file parameter in the filter %s", filter->name);
filter->data = config;
return true;
const int len = m_strlen(query->Field); \
strlist_copy(normal, query->Field, len, false); \
strlist_copy(reverse, query->Field, len, true); \
- for (uint32_t i = 0 ; i < config->tries.len ; ++i) { \
- const int weight = array_elt(config->weights, i); \
- const trie_t *trie = array_elt(config->tries, i); \
- const bool rev = array_elt(config->reverses, i); \
- const bool part = array_elt(config->partiales, i); \
- if ((!part && trie_lookup(trie, rev ? reverse : normal)) \
- || (part && trie_prefix(trie, rev ? reverse : normal))) { \
- async->sum += weight; \
+ foreach (strlist_local_t *entry, config->locals) { \
+ if ((!entry->partial && trie_lookup(*(entry->db), \
+ entry->reverse ? reverse : normal)) \
+ || (entry->partial && trie_prefix(*(entry->db), \
+ entry->reverse ? reverse : normal))) { \
+ async->sum += entry->weight; \
if (async->sum >= (uint32_t)config->hard_threshold) { \
return HTK_HARD_MATCH; \
} \
} \
async->error = false; \
- } \
+ }} \
}
#define DNS(Flag, Field) \
if (config->match_ ## Flag) { \
projects / apps / pfixtools.git / commitdiff