test, test_tuntap: update tests

Signed-off-by: Marcello Seri <[email protected]>

Author: Marcello Seri

test/test.ml

@@ -3,16 +3,16 @@ open Fd_send_recv
 
 let t_receivefd fd =
   Printf.printf "[receiver] t_receivedfd thread started!\n%!";
-  let buf = "**" in
+  let buf = Bytes.of_string "**" in
   let nb_read, remote_saddr, fd_recv = recv_fd fd buf 0 2 [] in
   Printf.printf "[receiver] Received %d bytes, received fd = %d\n%!" nb_read (int_of_fd fd_recv);
   let message = "[receiver] I'm the receiver, and I'm writing into the fd you passed to me :p\n" in
-  let nb_written = write fd_recv message 0 (String.length message) in
+  let nb_written = write fd_recv (Bytes.unsafe_of_string message) 0 (String.length message) in
   assert (nb_written = String.length message)
 
 let t_sendfd fd =
   let fd_to_send = stdout in
-  let buf = "  " in
+  let buf = Bytes.of_string "  " in
   let nb_sent = send_fd fd buf 0 2 [] fd_to_send in
   Printf.printf "[sender] sent %d bytes, sent fd = %d\n%!" nb_sent (int_of_fd fd_to_send)
 

test/test_fork.ml

@@ -3,16 +3,16 @@ open Fd_send_recv
 
 let t_receivefd fd =
   Printf.printf "[receiver] t_receivedfd thread started!\n%!";
-  let buf = "**" in
+  let buf = Bytes.of_string "**" in
   let nb_read, remote_saddr, fd_recv = recv_fd fd buf 0 2 [] in
   Printf.printf "[receiver] Received %d bytes, received fd = %d\n%!" nb_read (int_of_fd fd_recv);
   let message = "[receiver] I'm the receiver, and I'm writing into the fd you passed to me :p\n" in
-  let nb_written = write fd_recv message 0 (String.length message) in
+  let nb_written = write fd_recv (Bytes.unsafe_of_string message) 0 (String.length message) in
   assert (nb_written = String.length message)
 
 let t_sendfd fd =
   let fd_to_send = stdout in
-  let buf = "  " in
+  let buf = Bytes.of_string "  " in
   let nb_sent = send_fd fd buf 0 2 [] fd_to_send in
   Printf.printf "[sender] sent %d bytes, sent fd = %d\n%!" nb_sent (int_of_fd fd_to_send)
 

test_tuntap/test_tuntap.ml

@@ -3,14 +3,14 @@ open Fd_send_recv
 
 let t_receivefd fd =
   Printf.printf "[receiver] t_receivedfd thread started!\n%!";
-  let buf = String.make (Tuntap.get_ifnamsiz ()) '\000' in
-  let nb_read, remote_saddr, fd_recv = recv_fd fd buf 0 (String.length buf) [] in
+  let buf = Bytes.make (Tuntap.get_ifnamsiz ()) '\000' in
+  let nb_read, remote_saddr, fd_recv = recv_fd fd buf 0 (Bytes.length buf) [] in
   Printf.printf "[receiver] Received %d bytes [%s], received fd = %d\n%!" 
-    nb_read (String.sub buf 0 nb_read) (int_of_fd fd_recv)
+    nb_read (Bytes.sub_string buf 0 nb_read) (int_of_fd fd_recv)
 
 let t_sendfd fd =
   let fd_to_send, iface_name = Tuntap.opentap () in
-  let nb_sent = send_fd fd iface_name 0 (String.length iface_name) [] fd_to_send in
+  let nb_sent = send_fd fd (Bytes.unsafe_of_string iface_name) 0 (String.length iface_name) [] fd_to_send in
   Printf.printf "[sender] sent %d bytes [%s], sent fd = %d\n%!" nb_sent
     (String.sub iface_name 0 nb_sent) (int_of_fd fd_to_send)