balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

P2p_maintenance.connectable: ignore non-trusted points if option --closed is set

Browse Source
This commit is contained in:
OCamlPro-Iguernlala 2018-05-03 18:20:28 +02:00 committed by Grégoire Henry
parent f0612a96ea
commit 6b8c3f7d31
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib_p2p/p2p_maintenance.ml
View File

@ -27,10 +27,11 @@ type 'meta t = {
mutable maintain_worker : unit Lwt.t ;
}
(** Select [expected] points amongst the disconnected known points.
(** Select [expected] points among the disconnected known points.
It ignores points which are greylisted, or for which a connection
failed after [start_time] and the pointes that are banned. It
first selects points with the oldest last tentative. *)
first selects points with the oldest last tentative.
Non-trusted points are also ignored if option --closed is set. *)
let connectable st start_time expected =
let Pool pool = st.pool in
let now = Time.now () in
@ -45,18 +46,22 @@ let connectable st start_time expected =
| Some t1, Some t2 -> Time.compare t2 t1
end) in
let acc = Bounded_point_info.create expected in
let closed = (P2p_pool.config pool).P2p_pool.closed_network in
P2p_pool.Points.fold_known pool ~init:()
~f:begin fun point pi () ->
match P2p_point_state.get pi with
| Disconnected -> begin
match P2p_point_state.Info.last_miss pi with
| Some last when Time.(start_time < last)
|| P2p_point_state.Info.greylisted ~now pi -> ()
| _ when (P2p_pool.Points.banned pool point) -> ()
| last ->
Bounded_point_info.insert (last, point) acc
end
| _ -> ()
(* consider the point only if --closed is not set, or if pi is
trusted *)
if not closed || P2p_point_state.Info.trusted pi then
match P2p_point_state.get pi with
| Disconnected -> begin
match P2p_point_state.Info.last_miss pi with
| Some last when Time.(start_time < last)
|| P2p_point_state.Info.greylisted ~now pi -> ()
| _ when (P2p_pool.Points.banned pool point) -> ()
| last ->
Bounded_point_info.insert (last, point) acc
end
| _ -> ()
end ;
List.map snd (Bounded_point_info.get acc)