Skip to content

Commit

Permalink
Remove the Hyper-V socket "shutdown" protocol
Browse files Browse the repository at this point in the history
Previously we used a custom protocol on top of Hyper-V sockets because
they didn't support `shutdown`. With modern Windows and modern Linux the
`shutdown` works (at least when the connections are initiated from the
host) and therefore the Go `linuxkit/virtsock` library has dropped the
custom protocol. Since we're talking to `vpnkit-forwarder` using
`linuxkit/virtsock` we must drop the custom protocol too.

This uses an experimental version of `mirage/ocaml-hvsock` with support
for syscall-based `shutdown`.

Signed-off-by: David Scott <dave.scott@docker.com>
  • Loading branch information
djs55 committed Sep 13, 2018
1 parent 6d00b09 commit 18e360b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bin/connect.ml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module Hvsock = struct
(* Avoid using `detach` because we don't want to exhaust the
thread pool since this will block the main TCP/IP stack. *)
module F =
Flow_lwt_hvsock_shutdown.Make(Host.Time)
Flow_lwt_hvsock.Make(Host.Time)
(Lwt_hvsock_main_thread.Make(Host.Main))

type flow = {
Expand Down

0 comments on commit 18e360b

Please sign in to comment.