diff options
| author | Paweł Chmielowski <pchmielowski@process-one.net> | 2015-12-07 16:08:57 +0100 |
|---|---|---|
| committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2015-12-07 16:09:48 +0100 |
| commit | 29db302808f94697689d3010b3b589f9a00333b9 (patch) | |
| tree | 0c82aa6e6f99a6bb8c188ea9995eba38e095f5d5 /src/mod_fail2ban.erl | |
| parent | Fix bug in last commit (diff) | |
More now() replacements
Diffstat (limited to '')
| -rw-r--r-- | src/mod_fail2ban.erl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl index abfd1273..523cbb3f 100644 --- a/src/mod_fail2ban.erl +++ b/src/mod_fail2ban.erl @@ -65,7 +65,7 @@ c2s_auth_result(false, _User, LServer, {Addr, _Port}) -> LServer, ?MODULE, c2s_max_auth_failures, fun(I) when is_integer(I), I > 0 -> I end, ?C2S_MAX_AUTH_FAILURES), - UnbanTS = unban_timestamp(BanLifetime), + UnbanTS = p1_time_compat:system_time(seconds) + BanLifetime, case ets:lookup(failed_auth, Addr) of [{Addr, N, _, _}] -> ets:insert(failed_auth, {Addr, N+1, UnbanTS, MaxFailures}); @@ -79,7 +79,7 @@ c2s_auth_result(true, _User, _Server, _AddrPort) -> check_bl_c2s(_Acc, Addr, Lang) -> case ets:lookup(failed_auth, Addr) of [{Addr, N, TS, MaxFailures}] when N >= MaxFailures -> - case TS > now() of + case TS > p1_time_compat:system_time(seconds) of true -> IP = jlib:ip_to_list(Addr), UnbanDate = format_date( @@ -139,7 +139,7 @@ handle_cast(_Msg, State) -> handle_info(clean, State) -> ?DEBUG("cleaning ~p ETS table", [failed_auth]), - Now = now(), + Now = p1_time_compat:system_time(seconds), ets:select_delete( failed_auth, ets:fun2ms(fun({_, _, UnbanTS, _}) -> UnbanTS =< Now end)), @@ -171,11 +171,6 @@ is_whitelisted(Host, Addr) -> none), acl:match_rule(Host, Access, Addr) == allow. -unban_timestamp(BanLifetime) -> - {MegaSecs, MSecs, USecs} = now(), - UnbanSecs = MegaSecs * 1000000 + MSecs + BanLifetime, - {UnbanSecs div 1000000, UnbanSecs rem 1000000, USecs}. - is_loaded_at_other_hosts(Host) -> lists:any( fun(VHost) when VHost == Host -> |