diff options
| author | Kurt Lidl <lidl@FreeBSD.org> | 2017-02-23 05:40:59 +0000 |
|---|---|---|
| committer | Kurt Lidl <lidl@FreeBSD.org> | 2017-02-23 05:40:59 +0000 |
| commit | 2495a63064050ff360ce2482d8b01179f9c5d48b (patch) | |
| tree | df403ea6ccf04f6b6252ce5cd9f18a596c018c87 /contrib/blacklist | |
| parent | dd165efb5a3b14767ed093d41bdd1c4cc8c86b98 (diff) | |
| download | src-test2-2495a63064050ff360ce2482d8b01179f9c5d48b.tar.gz src-test2-2495a63064050ff360ce2482d8b01179f9c5d48b.zip | |
Notes
Diffstat (limited to 'contrib/blacklist')
| -rw-r--r-- | contrib/blacklist/bin/blacklistd.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/contrib/blacklist/bin/blacklistd.c b/contrib/blacklist/bin/blacklistd.c index a497f9d74543..256ae68b61b0 100644 --- a/contrib/blacklist/bin/blacklistd.c +++ b/contrib/blacklist/bin/blacklistd.c @@ -207,7 +207,7 @@ process(bl_t bl) if (debug) { char b1[128], b2[128]; - (*lfun)(LOG_DEBUG, "%s: db state info for %s: count=%d/%d " + (*lfun)(LOG_DEBUG, "%s: initial db state for %s: count=%d/%d " "last=%s now=%s", __func__, rbuf, dbi.count, c.c_nfail, fmttime(b1, sizeof(b1), dbi.last), fmttime(b2, sizeof(b2), ts.tv_sec)); @@ -246,15 +246,24 @@ process(bl_t bl) case BL_DELETE: if (dbi.last == 0) goto out; + dbi.count = 0; dbi.last = 0; break; default: (*lfun)(LOG_ERR, "unknown message %d", bi->bi_type); } - if (state_put(state, &c, &dbi) == -1) - goto out; + state_put(state, &c, &dbi); + out: close(bi->bi_fd); + + if (debug) { + char b1[128], b2[128]; + (*lfun)(LOG_DEBUG, "%s: final db state for %s: count=%d/%d " + "last=%s now=%s", __func__, rbuf, dbi.count, c.c_nfail, + fmttime(b1, sizeof(b1), dbi.last), + fmttime(b2, sizeof(b2), ts.tv_sec)); + } } static void @@ -393,7 +402,7 @@ rules_restore(void) int main(int argc, char *argv[]) { - int c, tout, flags, flush, restore; + int c, tout, flags, flush, restore, ret; const char *spath, *blsock; setprogname(argv[0]); @@ -512,7 +521,10 @@ main(int argc, char *argv[]) readconf = 0; conf_parse(configfile); } - switch (poll(pfd, (nfds_t)nfd, tout)) { + ret = poll(pfd, (nfds_t)nfd, tout); + if (debug) + (*lfun)(LOG_DEBUG, "received %d from poll()", ret); + switch (ret) { case -1: if (errno == EINTR) continue; |