From 6bbdf13bc5402cfac8e23a96dbd6fda523bb9861 Mon Sep 17 00:00:00 2001 From: OCamlPro-Iguernlala Date: Mon, 21 May 2018 15:44:43 +0200 Subject: [PATCH] P2p: do not send bootstrap message to peers in private mode --- src/lib_p2p/p2p_pool.ml | 15 ++++++++------- src/lib_p2p/p2p_pool.mli | 5 +++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/lib_p2p/p2p_pool.ml b/src/lib_p2p/p2p_pool.ml index 7551ecd1e..91929720a 100644 --- a/src/lib_p2p/p2p_pool.ml +++ b/src/lib_p2p/p2p_pool.ml @@ -409,13 +409,14 @@ let write_all pool msg = pool.connected_peer_ids let broadcast_bootstrap_msg pool = - P2p_peer.Table.iter - (fun _peer_id peer_info -> - match P2p_peer_state.get peer_info with - | Running { data = { conn } } -> - ignore (P2p_socket.write_now conn Bootstrap : bool tzresult ) - | _ -> ()) - pool.connected_peer_ids + if not pool.config.private_mode then + P2p_peer.Table.iter + (fun _peer_id peer_info -> + match P2p_peer_state.get peer_info with + | Running { data = { conn } } -> + ignore (P2p_socket.write_now conn Bootstrap : bool tzresult ) + | _ -> ()) + pool.connected_peer_ids (***************************************************************************) diff --git a/src/lib_p2p/p2p_pool.mli b/src/lib_p2p/p2p_pool.mli index 774895d14..db4b89d7c 100644 --- a/src/lib_p2p/p2p_pool.mli +++ b/src/lib_p2p/p2p_pool.mli @@ -292,8 +292,9 @@ val write_all: ('msg, 'peer_meta,'conn_meta) pool -> 'msg -> unit connections to [pool] in [Running] state. *) val broadcast_bootstrap_msg: ('msg, 'peer_meta,'conn_meta) pool -> unit -(** [write_all pool msg] is [P2P_connection.write_now conn Bootstrap] - for all member connections to [pool] in [Running] state. *) +(** [broadcast_bootstrap_msg pool] is [P2P_connection.write_now conn Bootstrap] + for all member connections to [pool] in [Running] state. + This behavior is deactivated if the node is in private mode *) val greylist_addr : ('msg, 'peer_meta,'conn_meta) pool -> P2p_addr.t -> unit (** [greylist_addr pool addr] adds [addr] to [pool]'s IP greylist. *)