Skip to content

In Tls_lwt dont throw EPIPE error if we got close_notify #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rymdhund wants to merge 1 commit into from
Closed

In Tls_lwt dont throw EPIPE error if we got close_notify #371

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lwt/tls_lwt.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,19 @@ let gettimeofday = Unix.gettimeofday

module Lwt_cs = struct

let naked ~name f fd cs =
let naked ~name f fd state cs =
Cstruct.(f fd cs.buffer cs.off cs.len) >>= fun res ->
match Lwt_unix.getsockopt_error fd with
| None -> return res
| Some err -> fail @@ Unix.Unix_error (err, name, "")
match (Lwt_unix.getsockopt_error fd, state) with
| (None, _) -> return res
| (Some Unix.EPIPE, `Eof) -> return res
| (Some err, _) -> fail @@ Unix.Unix_error (err, name, "")

let write = naked ~name:"Tls_lwt.write" Lwt_bytes.write
and read = naked ~name:"Tls_lwt.read" Lwt_bytes.read

let rec write_full fd = function
let rec write_full fd state = function
| cs when Cstruct.len cs = 0 -> return_unit
| cs -> write fd cs >>= o (write_full fd) (Cstruct.shift cs)
| cs -> write fd state cs >>= o (write_full fd state) (Cstruct.shift cs)
end

module Unix = struct
Expand All @@ -53,7 +54,7 @@ module Unix = struct
let (read_t, write_t) =
let recording_errors op t cs =
Lwt.catch
(fun () -> op t.fd cs)
(fun () -> op t.fd t.state cs)
(fun exn ->
t.state <- `Error exn ;
fail exn)
Expand Down