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

P2P: recv: return size read

Browse Source
This commit is contained in:
Vincent Bernardoff 2016-12-01 17:10:14 +01:00
parent 2b27a1ffbe
commit 92f78b29e4
1 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,12 +402,10 @@ module Make (P: PARAMS) = struct
(* a non exception-based cancelation mechanism *) (* a non exception-based cancelation mechanism *)
let cancelation, cancel, on_cancel = Lwt_utils.canceler () in let cancelation, cancel, on_cancel = Lwt_utils.canceler () in
(* a cancelable encrypted reception *) (* a cancelable encrypted reception *)
let recv ?received ?uncrypt buf = let recv ?uncrypt buf =
Lwt.pick [ recv_msg ?uncrypt socket buf ; Lwt.pick [ recv_msg ?uncrypt socket buf ;
(cancelation () >>= fun () -> Error_monad.fail Canceled) ] (cancelation () >>= fun () -> Error_monad.fail Canceled) ]
>>=? fun (size, message) -> in
Utils.iter_option received ~f:(fun r -> r := !r + size) ;
return message in
(* First step: send and receive credentials, makes no difference (* First step: send and receive credentials, makes no difference
whether we're trying to connect to a peer or checking an incoming whether we're trying to connect to a peer or checking an incoming
connection, both parties must first present themselves. *) connection, both parties must first present themselves. *)
@ -434,8 +432,8 @@ module Make (P: PARAMS) = struct
pp_gid my_gid Ipaddr.pp_hum addr port pp_gid my_gid Ipaddr.pp_hum addr port
Error_monad.pp_print_error err ; 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 })) ->
debug "(%a) connection requested from %a @@ %a:%d" debug "(%a) connection requested from %a @@ %a:%d"
pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ; pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ;
let work_proved = let work_proved =
@ -473,11 +471,11 @@ 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 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 ;
cancel () cancel ()
| Ok _ -> | _ ->
debug "(%a) connection rejected (bad connection request) from %a:%d" debug "(%a) connection rejected (bad connection request) from %a:%d"
pp_gid my_gid Ipaddr.pp_hum addr port ; pp_gid my_gid Ipaddr.pp_hum addr port ;
cancel () cancel ()
@ -535,24 +533,28 @@ module Make (P: PARAMS) = struct
| Some _ as res -> res in | Some _ as res -> res in
(* The message reception loop. *) (* The message reception loop. *)
let rec receiver () = let rec receiver () =
recv ~received ~uncrypt buf >>= function recv ~uncrypt buf >>= function
| Error err -> | Error err ->
debug "(%a) error receiving: %a" debug "(%a) error receiving: %a"
pp_gid my_gid Error_monad.pp_print_error err ; pp_gid my_gid Error_monad.pp_print_error err ;
cancel () cancel ()
| Ok Connect _ | Ok (size, msg) ->
| Ok Disconnect -> received := !received + size;
match msg with
| Connect _
| Disconnect ->
debug "(%a) disconnected (by peer) %a @@ %a:%d" debug "(%a) disconnected (by peer) %a @@ %a:%d"
pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ; pp_gid my_gid pp_gid gid Ipaddr.pp_hum addr port ;
cancel () cancel ()
| Ok Bootstrap -> Lwt_pipe.push reader (Bootstrap peer) >>= receiver | Bootstrap -> Lwt_pipe.push reader (Bootstrap peer) >>= receiver
| Ok Advertise peers -> Lwt_pipe.push reader (Peers peers) >>= receiver | Advertise peers -> Lwt_pipe.push reader (Peers peers) >>= receiver
| Ok Message msg -> Lwt_pipe.push reader (Recv (peer, msg)) >>= receiver | Message msg -> Lwt_pipe.push reader (Recv (peer, msg)) >>= receiver
in in
let rec sender () = let rec sender () =
Lwt_pipe.pop peer.writer >>= fun msg -> Lwt_pipe.pop peer.writer >>= fun msg ->
send_msg ~crypt socket buf msg >>= function send_msg ~crypt socket buf msg >>= function
| Ok _nb_sent -> | Ok size ->
sent := !sent + size;
sender () sender ()
| Error err -> | Error err ->
debug "(%a) error sending to %a: %a" debug "(%a) error sending to %a: %a"