63ecbc6b55
The blacklistd daemon attempted to restore the filtering rules before the database of blocked addresses was opened, so no rules were being reloaded. Now the rules are properly recreated when the daemon is started with '-r'. This bug was fixed locally, and then sent upstream to NetBSD. This changeset is the import the NetBSD version of the change, which added debugging output to alert about a null database. Reviewed by: emaste Obtained from: NetBSD MFC after: 1 week Sponsored by: The FreeBSD Foundation
236 lines
5.2 KiB
C
236 lines
5.2 KiB
C
/* $NetBSD: state.c,v 1.19 2016/09/26 19:43:43 christos Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 2015 The NetBSD Foundation, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to The NetBSD Foundation
|
|
* by Christos Zoulas.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
|
|
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
|
|
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <sys/cdefs.h>
|
|
__RCSID("$NetBSD: state.c,v 1.19 2016/09/26 19:43:43 christos Exp $");
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <syslog.h>
|
|
#include <netinet/in.h>
|
|
|
|
#include "bl.h"
|
|
#include "internal.h"
|
|
#include "conf.h"
|
|
#include "support.h"
|
|
#include "state.h"
|
|
|
|
static HASHINFO openinfo = {
|
|
4096, /* bsize */
|
|
32, /* ffactor */
|
|
256, /* nelem */
|
|
8 * 1024 * 1024,/* cachesize */
|
|
NULL, /* hash() */
|
|
0 /* lorder */
|
|
};
|
|
|
|
int
|
|
state_close(DB *db)
|
|
{
|
|
if (db == NULL)
|
|
return -1;
|
|
if ((*db->close)(db) == -1) {
|
|
(*lfun)(LOG_ERR, "%s: can't close db (%m)", __func__);
|
|
return -1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
DB *
|
|
state_open(const char *dbname, int flags, mode_t perm)
|
|
{
|
|
DB *db;
|
|
|
|
#ifdef __APPLE__
|
|
flags &= O_CREAT|O_EXCL|O_EXLOCK|O_NONBLOCK|O_RDONLY|
|
|
O_RDWR|O_SHLOCK|O_TRUNC;
|
|
#endif
|
|
db = dbopen(dbname, flags, perm, DB_HASH, &openinfo);
|
|
if (db == NULL) {
|
|
if (errno == ENOENT && (flags & O_CREAT) == 0)
|
|
return NULL;
|
|
(*lfun)(LOG_ERR, "%s: can't open `%s' (%m)", __func__, dbname);
|
|
}
|
|
return db;
|
|
}
|
|
|
|
static int
|
|
state_sizecheck(const DBT *t)
|
|
{
|
|
if (sizeof(struct conf) == t->size)
|
|
return 0;
|
|
(*lfun)(LOG_ERR, "Key size mismatch %zu != %zu", sizeof(struct conf),
|
|
t->size);
|
|
return -1;
|
|
}
|
|
|
|
static void
|
|
dumpkey(const struct conf *k)
|
|
{
|
|
char buf[10240];
|
|
blhexdump(buf, sizeof(buf), __func__, k, sizeof(*k));
|
|
(*lfun)(LOG_DEBUG, "%s", buf);
|
|
(*lfun)(LOG_DEBUG, "%s: %s", __func__,
|
|
conf_print(buf, sizeof(buf), "", "", k));
|
|
|
|
}
|
|
|
|
int
|
|
state_del(DB *db, const struct conf *c)
|
|
{
|
|
int rv;
|
|
DBT k;
|
|
|
|
if (db == NULL)
|
|
return -1;
|
|
|
|
k.data = __UNCONST(c);
|
|
k.size = sizeof(*c);
|
|
|
|
switch (rv = (*db->del)(db, &k, 0)) {
|
|
case 0:
|
|
case 1:
|
|
if (debug > 1) {
|
|
(*lfun)(LOG_DEBUG, "%s: returns %d", __func__, rv);
|
|
(*db->sync)(db, 0);
|
|
}
|
|
return 0;
|
|
default:
|
|
(*lfun)(LOG_ERR, "%s: failed (%m)", __func__);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
int
|
|
state_get(DB *db, const struct conf *c, struct dbinfo *dbi)
|
|
{
|
|
int rv;
|
|
DBT k, v;
|
|
|
|
if (db == NULL)
|
|
return -1;
|
|
|
|
k.data = __UNCONST(c);
|
|
k.size = sizeof(*c);
|
|
|
|
switch (rv = (*db->get)(db, &k, &v, 0)) {
|
|
case 0:
|
|
case 1:
|
|
if (rv)
|
|
memset(dbi, 0, sizeof(*dbi));
|
|
else
|
|
memcpy(dbi, v.data, sizeof(*dbi));
|
|
if (debug > 1)
|
|
(*lfun)(LOG_DEBUG, "%s: returns %d", __func__, rv);
|
|
return 0;
|
|
default:
|
|
(*lfun)(LOG_ERR, "%s: failed (%m)", __func__);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
int
|
|
state_put(DB *db, const struct conf *c, const struct dbinfo *dbi)
|
|
{
|
|
int rv;
|
|
DBT k, v;
|
|
|
|
if (db == NULL)
|
|
return -1;
|
|
|
|
k.data = __UNCONST(c);
|
|
k.size = sizeof(*c);
|
|
v.data = __UNCONST(dbi);
|
|
v.size = sizeof(*dbi);
|
|
|
|
switch (rv = (*db->put)(db, &k, &v, 0)) {
|
|
case 0:
|
|
if (debug > 1) {
|
|
(*lfun)(LOG_DEBUG, "%s: returns %d", __func__, rv);
|
|
(*db->sync)(db, 0);
|
|
}
|
|
return 0;
|
|
case 1:
|
|
errno = EEXIST;
|
|
/*FALLTHROUGH*/
|
|
default:
|
|
(*lfun)(LOG_ERR, "%s: failed (%m)", __func__);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
int
|
|
state_iterate(DB *db, struct conf *c, struct dbinfo *dbi, unsigned int first)
|
|
{
|
|
int rv;
|
|
DBT k, v;
|
|
|
|
if (db == NULL) {
|
|
(*lfun)(LOG_ERR, "%s: called with no database file", __func__);
|
|
return -1;
|
|
}
|
|
|
|
first = first ? R_FIRST : R_NEXT;
|
|
|
|
switch (rv = (*db->seq)(db, &k, &v, first)) {
|
|
case 0:
|
|
if (state_sizecheck(&k) == -1)
|
|
return -1;
|
|
memcpy(c, k.data, sizeof(*c));
|
|
if (debug > 2)
|
|
dumpkey(c);
|
|
memcpy(dbi, v.data, sizeof(*dbi));
|
|
if (debug > 1)
|
|
(*lfun)(LOG_DEBUG, "%s: returns %d", __func__, rv);
|
|
return 1;
|
|
case 1:
|
|
if (debug > 1)
|
|
(*lfun)(LOG_DEBUG, "%s: returns %d", __func__, rv);
|
|
return 0;
|
|
default:
|
|
(*lfun)(LOG_ERR, "%s: failed (%m)", __func__);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
int
|
|
state_sync(DB *db)
|
|
{
|
|
return (*db->sync)(db, 0);
|
|
}
|