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

P2p: do not broadcast private peers

Browse Source
This commit is contained in:
OCamlPro-Iguernlala 2018-05-31 19:07:14 +02:00 committed by Grégoire Henry
parent 6b287ba98e
commit d08cd57c69
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib_p2p/p2p_pool.ml
View File

@ -876,7 +876,7 @@ and create_connection pool p2p_conn id_point point_info peer_info _version =
advertise = advertise =
(fun points -> register_new_points pool conn points ) ; (fun points -> register_new_points pool conn points ) ;
bootstrap = bootstrap =
(fun () -> list_known_points pool conn () ) ; (fun () -> list_known_points ~ignore_private:true pool conn) ;
swap_request = swap_request =
(fun point peer_id -> swap_request pool conn point peer_id ) ; (fun point peer_id -> swap_request pool conn point peer_id ) ;
swap_ack = swap_ack =
@ -979,14 +979,22 @@ and register_new_point pool _source_peer_id point =
if not (P2p_point.Table.mem pool.my_id_points point) then if not (P2p_point.Table.mem pool.my_id_points point) then
ignore (register_point pool _source_peer_id point) ignore (register_point pool _source_peer_id point)
and list_known_points pool _conn () = and list_known_points ?(ignore_private = false) pool conn =
let knowns = if P2p_socket.private_node conn.conn then
P2p_point.Table.fold private_node_warn "Private peer (%a) asked other peers addresses"
(fun _ point_info acc -> point_info :: acc) P2p_peer.Id.pp (P2p_peer_state.Info.peer_id conn.peer_info) >>= fun () ->
pool.known_points [] in Lwt.return []
let best_knowns = else
List.take_n ~compare:compare_known_point_info 50 knowns in let knowns =
Lwt.return (List.map P2p_point_state.Info.point best_knowns) P2p_point.Table.fold
(fun _ point_info acc ->
if ignore_private &&
not (P2p_point_state.Info.known_public point_info) then acc
else point_info :: acc)
pool.known_points [] in
let best_knowns =
List.take_n ~compare:compare_known_point_info 50 knowns in
Lwt.return (List.map P2p_point_state.Info.point best_knowns)
and active_connections pool = P2p_peer.Table.length pool.connected_peer_ids and active_connections pool = P2p_peer.Table.length pool.connected_peer_ids