atmos
/
ban2fail
mirror of https://github.com/jrbrtsn/ban2fail
1
1
Fork 0
Code Issues Releases Wiki Activity

fixing commit issue

This commit is contained in:
john 2019-11-26 13:18:38 -05:00
parent c45038209c
commit bdd3eb76bc
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ban2fail.c
View File

@ -86,7 +86,7 @@ struct Global G= {
.version= { .version= {
.major= 0, .major= 0,
.minor= 10, .minor= 10,
.patch= 2 .patch= 3
} }
}; };
@ -352,26 +352,27 @@ main(int argc, char **argv)
if(IPTABLES_is_currently_blocked(e->addr)) if(IPTABLES_is_currently_blocked(e->addr))
flags |= BLOCKED_FLG; flags |= BLOCKED_FLG;
int nAllowed= MAXOFF_allowed(e->addr); int nAllowed= MAXOFF_allowed(e->addr);
if(-1 == nAllowed) if(-1 == nAllowed)
flags |= WHITELIST_FLG; flags |= WHITELIST_FLG;
if((-1 == nAllowed || e->count <= nAllowed) && if((flags & WHITELIST_FLG || e->count <= nAllowed) &&
(flags & BLOCKED_FLG)) { (flags & BLOCKED_FLG))
{
flags |= UNJUST_BLOCK_FLG; flags |= UNJUST_BLOCK_FLG;
PTRVEC_addTail(&S.toUnblock_vec, e->addr); PTRVEC_addTail(&S.toUnblock_vec, e->addr);
} }
if(!(flags & BLOCKED_FLG) && if(!(flags & BLOCKED_FLG) &&
-1 != nAllowed && !(flags & WHITELIST_FLG) &&
e->count > nAllowed) e->count > nAllowed)
{ {
flags |= WOULD_BLOCK_FLG; flags |= WOULD_BLOCK_FLG;
PTRVEC_addTail(&S.toBlock_vec, e->addr); PTRVEC_addTail(&S.toBlock_vec, e->addr);
} }
/* Print out only for list option */ /* Print out only for list option */
if(G.flags & GLB_LIST_ADDR_FLG) { if(G.flags & GLB_LIST_ADDR_FLG) {