-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add more windows tests and fix network code
- Loading branch information
1 parent
695499e
commit f3d7051
Showing
5 changed files
with
139 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| open Eio.Std | ||
|
|
||
| let read_all flow = | ||
| let b = Buffer.create 100 in | ||
| Eio.Flow.copy flow (Eio.Flow.buffer_sink b); | ||
| Buffer.contents b | ||
|
|
||
| let run_client ~sw ~net ~addr = | ||
| traceln "Connecting to server..."; | ||
| let flow = Eio.Net.connect ~sw net addr in | ||
| Eio.traceln "connected"; | ||
| Eio.Flow.copy_string "Hello from client" flow; | ||
| Eio.Flow.shutdown flow `Send; | ||
| let msg = read_all flow in | ||
| msg | ||
|
|
||
| let run_server ~sw msg socket = | ||
| Eio.Net.accept_fork socket ~sw (fun flow _addr -> | ||
| traceln "Server accepted connection from client"; | ||
| Fun.protect (fun () -> | ||
| let msg = read_all flow in | ||
| traceln "Server received: %S" msg | ||
| ) ~finally:(fun () -> Eio.Flow.copy_string msg flow) | ||
| ) | ||
| ~on_error:(function | ||
| | ex -> traceln "Error handling connection: %s" (Printexc.to_string ex) | ||
| ) | ||
|
|
||
| let test_client_server env addr () = | ||
| Eio.Switch.run @@ fun sw -> | ||
| let server = Eio.Net.listen env#net ~sw ~reuse_addr:true ~backlog:5 addr in | ||
| let msg = "From the server" in | ||
| Fiber.both | ||
| (fun () -> run_server ~sw msg server) | ||
| (fun () -> | ||
| let client_msg = run_client ~sw ~net:env#net ~addr in | ||
| Alcotest.(check string) "same message" msg client_msg | ||
| ) | ||
|
|
||
| let run_dgram addr ~net sw msg = | ||
| let e1 = `Udp (addr, 8081) in | ||
| let e2 = `Udp (addr, 8082) in | ||
| let listening_socket = Eio.Net.datagram_socket ~sw net e2 in | ||
| Fiber.both | ||
| (fun () -> | ||
| let buf = Cstruct.create 20 in | ||
| traceln "Waiting to receive data on %a" Eio.Net.Sockaddr.pp e2; | ||
| let addr, recv = Eio.Net.recv listening_socket buf in | ||
| traceln "Received message from %a" | ||
| Eio.Net.Sockaddr.pp addr; | ||
| Alcotest.(check string) "same udp msg" msg (Cstruct.(to_string (sub buf 0 recv))) | ||
| ) | ||
| (fun () -> | ||
| let e = Eio.Net.datagram_socket ~sw net e1 in | ||
| traceln "Sending data from %a to %a" Eio.Net.Sockaddr.pp e1 Eio.Net.Sockaddr.pp e2; | ||
| Eio.Net.send e e2 (Cstruct.of_string msg)) | ||
|
|
||
| let test_udp env addr () = | ||
| Eio.Switch.run @@ fun sw -> | ||
| run_dgram addr ~net:env#net sw "UDP on Windows" | ||
|
|
||
| let test_fd env addr () = | ||
| Eio.Switch.run @@ fun sw -> | ||
| let addr = `Tcp (addr, 8081) in | ||
| let server = Eio.Net.listen env#net ~sw ~reuse_addr:true ~backlog:5 addr in | ||
| Alcotest.(check bool) "Listening socket has Unix FD" (Eio_unix.Resource.fd_opt server <> None) true; | ||
| let have_client, have_server = | ||
| Fiber.pair | ||
| (fun () -> | ||
| let flow = Eio.Net.connect ~sw env#net addr in | ||
| (Eio_unix.Resource.fd_opt flow <> None) | ||
| ) | ||
| (fun () -> | ||
| let flow, _addr = Eio.Net.accept ~sw server in | ||
| (Eio_unix.Resource.fd_opt flow <> None) | ||
| ) | ||
| in | ||
| Alcotest.(check bool) "Client-side socket has Unix FD" have_client true; | ||
| Alcotest.(check bool) "Server-side socket has Unix FD" have_server true | ||
|
|
||
| let test_wrap_socket pipe_or_socketpair () = | ||
| Switch.run @@ fun sw -> | ||
| let r, w = | ||
| match pipe_or_socketpair with | ||
| | `Pipe -> Unix.pipe () | ||
| | `Socketpair -> Unix.socketpair Unix.PF_UNIX Unix.SOCK_STREAM 0 | ||
| in | ||
| let source = (Eio_unix.import_socket_stream ~sw ~close_unix:true r :> Eio.Flow.source) in | ||
| let sink = (Eio_unix.import_socket_stream ~sw ~close_unix:true w :> Eio.Flow.sink) in | ||
| let msg = "Hello" in | ||
| Fiber.both | ||
| (fun () -> Eio.Flow.copy_string (msg ^ "\n") sink) | ||
| (fun () -> | ||
| let b = Eio.Buf_read.of_flow source ~max_size:1000 in | ||
| Alcotest.(check string) "same message" (Eio.Buf_read.line b) msg | ||
| ) | ||
|
|
||
| let test_eio_socketpair () = | ||
| Switch.run @@ fun sw -> | ||
| let a, b = Eio_unix.socketpair ~sw () in | ||
| ignore (Eio_unix.Resource.fd a : Eio_unix.Fd.t); | ||
| ignore (Eio_unix.Resource.fd b : Eio_unix.Fd.t); | ||
| Eio.Flow.copy_string "foo" a; | ||
| Eio.Flow.close a; | ||
| let msg = Eio.Buf_read.of_flow b ~max_size:10 |> Eio.Buf_read.take_all in | ||
| Alcotest.(check string) "same messagw" "foo" msg | ||
|
|
||
| let tests env = [ | ||
| "tcp-ip4", `Quick, test_client_server env (`Tcp (Eio.Net.Ipaddr.V4.loopback, 8081)); | ||
| "tcp-ip6", `Quick, test_client_server env (`Tcp (Eio.Net.Ipaddr.V6.loopback, 8081)); | ||
| "unix", `Quick, test_client_server env (`Unix "eio-test.sock"); | ||
| "udp-ip4", `Quick, test_udp env Eio.Net.Ipaddr.V4.loopback; | ||
| "udp-ip6", `Quick, test_udp env Eio.Net.Ipaddr.V6.loopback; | ||
| "fds", `Quick, test_fd env Eio.Net.Ipaddr.V4.loopback; | ||
| "wrap-pipe", `Quick, test_wrap_socket `Pipe; | ||
| "wrap-socketpair", `Quick, test_wrap_socket `Socketpair; | ||
| "eio-socketpair", `Quick, test_eio_socketpair | ||
| ] |