projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add entry deprecation in greylist.
[apps/pfixtools.git]
/
postlicyd
/
rbl.c
diff --git
a/postlicyd/rbl.c
b/postlicyd/rbl.c
index
1bae4d8
..
1341f02
100644
(file)
--- a/
postlicyd/rbl.c
+++ b/
postlicyd/rbl.c
@@
-62,7
+62,6
@@
enum {
struct rbldb_t {
A(uint32_t) ips;
struct rbldb_t {
A(uint32_t) ips;
- bool locked;
};
ARRAY(rbldb_t)
};
ARRAY(rbldb_t)
@@
-156,8
+155,7
@@
rbldb_t *rbldb_create(const char *file, bool lock)
/* Lookup may perform serveral I/O, so avoid swap.
*/
array_adjust(db->ips);
/* Lookup may perform serveral I/O, so avoid swap.
*/
array_adjust(db->ips);
- db->locked = lock && array_lock(db->ips);
- if (lock && !db->locked) {
+ if (lock && !array_lock(db->ips)) {
UNIXERR("mlock");
}
UNIXERR("mlock");
}
@@
-175,9
+173,6
@@
rbldb_t *rbldb_create(const char *file, bool lock)
static void rbldb_wipe(rbldb_t *db)
{
static void rbldb_wipe(rbldb_t *db)
{
- if (db->locked) {
- array_unlock(db->ips);
- }
array_wipe(db->ips);
}
array_wipe(db->ips);
}
@@
-357,7
+352,7
@@
static filter_result_t rbl_filter(const filter_t *filter, const query_t *query)
query->client_address);
return HTK_ERROR;
}
query->client_address);
return HTK_ERROR;
}
- for (
in
t i = 0 ; i < data->rbls.len ; ++i) {
+ for (
uint32_
t i = 0 ; i < data->rbls.len ; ++i) {
const rbldb_t *rbl = array_elt(data->rbls, i);
int weight = array_elt(data->weights, i);
if (rbldb_ipv4_lookup(rbl, ip)) {
const rbldb_t *rbl = array_elt(data->rbls, i);
int weight = array_elt(data->weights, i);
if (rbldb_ipv4_lookup(rbl, ip)) {