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

P2P: Minor changes

Browse Source
This commit is contained in:
Vincent Bernardoff 2016-12-01 13:39:59 +01:00 committed by Grégoire Henry
parent bdb2d20f05
commit 1ffe2db277
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/node/net/p2p.ml
View File

@ -426,12 +426,16 @@ module Make (P: PARAMS) = struct
Lwt.pick Lwt.pick
[ ( LU.sleep limits.peer_answer_timeout >>= fun () -> Error_monad.fail Timeout ) ; [ ( LU.sleep limits.peer_answer_timeout >>= fun () -> Error_monad.fail Timeout ) ;
recv buf ] >>= function recv buf ] >>= function
| Error [Timeout] | Error [Canceled] | Error [Exn End_of_file] -> | Error [Timeout]
(* Expected errors. No logging. *) | Error [Canceled]
| Error [Exn End_of_file] ->
debug "(%a) Closed connection to %a:%d."
pp_gid my_gid Ipaddr.pp_hum addr port ;
cancel () cancel ()
| Error err -> | Error err ->
log_error "(%a) error receiving from %a:%d: %a" log_error "(%a) error receiving from %a:%d: %a"
pp_gid my_gid Ipaddr.pp_hum addr port Error_monad.pp_print_error err ; pp_gid my_gid Ipaddr.pp_hum addr port
Error_monad.pp_print_error err ;
cancel () cancel ()
| Ok (Connect { gid; port = listening_port; versions ; | Ok (Connect { gid; port = listening_port; versions ;
public_key ; proof_of_work ; message_nonce }) -> public_key ; proof_of_work ; message_nonce }) ->
@ -472,10 +476,6 @@ module Make (P: PARAMS) = struct
buf local_nonce version gid buf local_nonce version gid
public_key message_nonce listening_port public_key message_nonce listening_port
end end
| Ok (Advertise _) ->
debug "(%a) connection rejected (unauthenticated Advertise) from %a:%d"
pp_gid my_gid Ipaddr.pp_hum addr port ;
cancel ()
| Ok Disconnect -> | Ok Disconnect ->
debug "(%a) connection rejected (closed by peer or timeout) from %a:%d" debug "(%a) connection rejected (closed by peer or timeout) from %a:%d"
pp_gid my_gid Ipaddr.pp_hum addr port ; pp_gid my_gid Ipaddr.pp_hum addr port ;
@ -1065,9 +1065,9 @@ module Make (P: PARAMS) = struct
let rec peer_events () = let rec peer_events () =
let peers = PeerMap.bindings !connected in let peers = PeerMap.bindings !connected in
let current_peers_evts = let current_peers_evts =
List.map begin function filter_map begin function
| _, Some gid, p -> Lwt_pipe.values_available p.reader >|= fun () -> gid, p.reader | _, Some gid, p -> Some (Lwt_pipe.values_available p.reader >|= fun () -> gid, p.reader)
| _ -> Lwt_utils.never_ending | _ -> None
end peers end peers
in in
Lwt.choose [ Lwt.choose [