Merge pull request mirage#254 from hannesm/fix-random

tests need stdlibrandom as well

_oasis

@@ -184,7 +184,8 @@ Executable test
                       mirage-clock-unix,pcap-format,
                       tcpip.ethif,tcpip.arpv4,tcpip.ipv4,tcpip.tcp,tcpip.udp,
                       tcpip.stack-direct,tcpip.icmpv4,
-                      tcpip.udpv4-socket, tcpip.tcpv4-socket, tcpip.stack-socket, duration
+                      tcpip.udpv4-socket, tcpip.tcpv4-socket, tcpip.stack-socket, duration,
+                      mirage-stdlib-random
 
 Test test
   Run$:               flag(tests)

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: bb445ce5e2101b5879bf9a10a8602530)
+# DO NOT EDIT (digest: 932c2d4a28d84c22430fe4df82d8b59a)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -210,6 +210,7 @@ true: annot, bin_annot
 <lib_test/test.{native,byte}>: pkg_mirage-clock-unix
 <lib_test/test.{native,byte}>: pkg_mirage-flow
 <lib_test/test.{native,byte}>: pkg_mirage-profile
+<lib_test/test.{native,byte}>: pkg_mirage-stdlib-random
 <lib_test/test.{native,byte}>: pkg_mirage-types
 <lib_test/test.{native,byte}>: pkg_mirage-types.lwt
 <lib_test/test.{native,byte}>: pkg_mirage-vnetif
@@ -246,6 +247,7 @@ true: annot, bin_annot
 <lib_test/*.ml{,i,y}>: pkg_mirage-clock-unix
 <lib_test/*.ml{,i,y}>: pkg_mirage-flow
 <lib_test/*.ml{,i,y}>: pkg_mirage-profile
+<lib_test/*.ml{,i,y}>: pkg_mirage-stdlib-random
 <lib_test/*.ml{,i,y}>: pkg_mirage-types
 <lib_test/*.ml{,i,y}>: pkg_mirage-types.lwt
 <lib_test/*.ml{,i,y}>: pkg_mirage-vnetif

lib/tcp/pcb.ml

@@ -416,7 +416,8 @@ struct
     Logs.(log_with_stats Debug "process-syn" t);
     match listeners @@ WIRE.src_port_of_id id with
     | Some pushf ->
-      let tx_isn = Sequence.of_int32 (Randomconv.int32 Random.generate) in
+      (* XXX: I've no clue why this is the way it is, static 16 bits plus some random -- hannes *)
+      let tx_isn = Sequence.of_int ((Randomconv.int ~bound:65535 Random.generate) + 0x1AFE0000) in
       (* TODO: make this configurable per listener *)
       let rx_wnd = 65535 in
       let rx_wnd_scaleoffer = wscale_default in
@@ -581,7 +582,8 @@ struct
 
   let connect t ~dst ~dst_port =
     let id = getid t dst dst_port in
-    let tx_isn = Sequence.of_int32 (Randomconv.int32 Random.generate) in
+    (* XXX: I've no clue why this is the way it is, static 16 bits plus some random -- hannes *)
+    let tx_isn = Sequence.of_int ((Randomconv.int ~bound:65535 Random.generate) + 0x1BCD0000) in
     (* TODO: This is hardcoded for now - make it configurable *)
     let rx_wnd_scaleoffer = wscale_default in
     let options =

lib_test/test.ml

@@ -31,6 +31,8 @@ let run test () =
   Lwt_main.run (test ())
 
 let () =
+  (* someone has to call Stdlibrandom.initialize () *)
+  Stdlibrandom.initialize ();
   (* enable logging to stdout for all modules *)
   Logs.set_reporter (Logs_fmt.reporter ());
   Logs.set_level ~all:true (Some Logs.Debug);

lib_test/vnetif_common.ml

@@ -56,9 +56,9 @@ module VNETIF_STACK ( B : Vnetif_backends.Backend) : (VNETIF_STACK with type bac
   module Ip = Ipv4.Make(E)(A)
   module Icmp = Icmpv4.Make(Ip)
   module U = Udp.Make(Ip)
-  module T = Tcp.Flow.Make(Ip)(Time)(Clock)(Random)
+  module T = Tcp.Flow.Make(Ip)(Time)(Clock)(Stdlibrandom)
   module Stackv4 =
-    Tcpip_stack_direct.Make(Time)(Random)(V)(E)(A)(Ip)(Icmp)(U)(T)
+    Tcpip_stack_direct.Make(Time)(Stdlibrandom)(V)(E)(A)(Ip)(Icmp)(U)(T)
 
   let create_backend () =
     B.create ()