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

Shell/P2p: propagate disconnection errors through the pool.

Browse Source
This commit is contained in:
Grégoire Henry 2017-04-10 00:40:47 +02:00
parent 4523a67e7d
commit c2a4db2d81
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node/net/p2p_connection_pool.ml
View File

@ -117,7 +117,11 @@ module Answerer = struct
| Ok (size, Message msg) -> | Ok (size, Message msg) ->
st.callback.message size msg >>= fun () -> st.callback.message size msg >>= fun () ->
worker_loop st worker_loop st
| Ok (_, Disconnect) | Error [P2p_io_scheduler.Connection_closed] -> | Ok (_, Disconnect)| Error [P2p_io_scheduler.Connection_closed] ->
Canceler.cancel st.canceler >>= fun () ->
Lwt.return_unit
| Error [P2p_connection.Decoding_error] ->
(* TODO: Penalize peer... *)
Canceler.cancel st.canceler >>= fun () -> Canceler.cancel st.canceler >>= fun () ->
Lwt.return_unit Lwt.return_unit
| Error [Lwt_utils.Canceled] -> | Error [Lwt_utils.Canceled] ->
@ -916,6 +920,7 @@ and create_connection pool p2p_conn id_point point_info peer_info _version =
Lwt_condition.broadcast pool.events.too_many_connections () ; Lwt_condition.broadcast pool.events.too_many_connections () ;
log pool Too_many_connections ; log pool Too_many_connections ;
end ; end ;
Lwt_pipe.close messages ;
P2p_connection.close ~wait:conn.wait_close conn.conn P2p_connection.close ~wait:conn.wait_close conn.conn
end ; end ;
List.iter (fun f -> f peer_id conn) pool.new_connection_hook ; List.iter (fun f -> f peer_id conn) pool.new_connection_hook ;