Merge pull request #196 from hannesm/easy

adapt to MirageOS 3.7.0 changes
mirage · Nov 1, 2019 · 6c895bc · 6c895bc
2 parents 9b41963 + b1d523b
commit 6c895bc
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 29 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,17 @@
+### v4.1.0 (2019-11-01)
+
+* Client improvements (#191 #192 @olleolleolle @linse @cfcs @hannesm in marrakesh September)
+ - new sublibrary dns.cache providing an LRU cache, mostly copied from resolver
+ - it uses a LRU cache now (defaults to 32 entries) from dns.cache
+   - since #195 a mutable LRU.M.t
+ - tests were added
+ - Dns_client_flow has been migrated to Dns_client
+ - various code cleanups (extracted functions), better naming, improved docstrings
+ - Uflow is now known as Transport
+ - requires a monotonic clock on creation
+* adapt to x509 0.8.0 API changes (#193 @hannesm)
+* adapt to newer MirageOS interfaces (#196 @hannesm)
+
 ### v4.0.0 (2019-08-15)
 
 * Switch to uDNS implementation, developed from scratch since 2017, primarily

diff --git a/dns-certify.opam b/dns-certify.opam
@@ -18,10 +18,10 @@ depends: [
   "x509" {>= "0.8.0"}
   "lwt" {>= "4.2.1"}
   "tls" {>= "0.10.3"}
-  "mirage-random" {>= "1.2.0"}
-  "mirage-time-lwt" {>= "1.3.0"}
-  "mirage-clock-lwt" {>= "2.0.0"}
-  "mirage-stack-lwt" {>= "1.4.0"}
+  "mirage-random" {>= "2.0.0"}
+  "mirage-time" {>= "2.0.0"}
+  "mirage-clock" {>= "3.0.0"}
+  "mirage-stack" {>= "2.0.0"}
 ]
 
 build: [

diff --git a/dns-client.opam b/dns-client.opam
@@ -23,8 +23,9 @@ depends: [
   "domain-name" {>= "0.3.0"}
   "ipaddr" {>= "4.0.0"}
   "lwt" {>= "4.2.1"}
-  "mirage-stack-lwt" {>= "1.4.0"}
-  "mirage-random" {>= "1.2.0"}
+  "mirage-stack" {>= "2.0.0"}
+  "mirage-random" {>= "2.0.0"}
+  "mirage-clock" {>= "3.0.0"}
   "mtime" {>= "1.2.0"}
 ]
 synopsis: "Pure DNS resolver API"

diff --git a/dns-mirage.opam b/dns-mirage.opam
@@ -13,7 +13,7 @@ depends: [
   "dns" {= version}
   "ipaddr" {>= "4.0.0"}
   "lwt" {>= "4.2.1"}
-  "mirage-stack-lwt" {>= "1.4.0"}
+  "mirage-stack" {>= "2.0.0"}
 ]
 
 build: [

diff --git a/dns-resolver.opam b/dns-resolver.opam
@@ -17,10 +17,10 @@ depends: [
   "duration" {>= "0.1.2"}
   "randomconv" {>= "0.1.2"}
   "lwt" {>= "4.2.1"}
-  "mirage-time-lwt" {>= "1.3.0"}
-  "mirage-clock-lwt" {>= "2.0.0"}
-  "mirage-random" {>= "1.2.0"}
-  "mirage-stack-lwt" {>= "1.4.0"}
+  "mirage-time" {>= "2.0.0"}
+  "mirage-clock" {>= "3.0.0"}
+  "mirage-random" {>= "2.0.0"}
+  "mirage-stack" {>= "2.0.0"}
   "alcotest" {with-test}
 ]
 

diff --git a/dns-server.opam b/dns-server.opam
@@ -15,9 +15,9 @@ depends: [
   "randomconv" {>= "0.1.2"}
   "duration" {>= "0.1.2"}
   "lwt" {>= "4.2.1"}
-  "mirage-time-lwt" {>= "1.3.0"}
-  "mirage-clock-lwt" {>= "2.0.0"}
-  "mirage-stack-lwt" {>= "1.4.0"}
+  "mirage-time" {>= "2.0.0"}
+  "mirage-clock" {>= "3.0.0"}
+  "mirage-stack" {>= "2.0.0"}
   "nocrypto" {with-test}
   "alcotest" {with-test}
   "dns-tsig" {with-test}

diff --git a/mirage/certify/dns_certify_mirage.ml b/mirage/certify/dns_certify_mirage.ml
@@ -5,7 +5,7 @@ open Lwt.Infix
 let src = Logs.Src.create "dns_certify_mirage" ~doc:"effectful DNS certify"
 module Log = (val Logs.src_log src : Logs.LOG)
 
-module Make (R : Mirage_random.C) (P : Mirage_clock_lwt.PCLOCK) (TIME : Mirage_time_lwt.S) (S : Mirage_stack_lwt.V4) = struct
+module Make (R : Mirage_random.S) (P : Mirage_clock.PCLOCK) (TIME : Mirage_time.S) (S : Mirage_stack.V4) = struct
 
   module D = Dns_mirage.Make(S)
 

diff --git a/mirage/certify/dns_certify_mirage.mli b/mirage/certify/dns_certify_mirage.mli
@@ -1,5 +1,5 @@
 (* (c) 2017, 2018 Hannes Mehnert, all rights reserved *)
-module Make (R : Mirage_random.C) (P : Mirage_clock_lwt.PCLOCK) (T : Mirage_time_lwt.S) (S : Mirage_stack_lwt.V4) : sig
+module Make (R : Mirage_random.S) (P : Mirage_clock.PCLOCK) (T : Mirage_time.S) (S : Mirage_stack.V4) : sig
 
   val retrieve_certificate :
     ?ca:[ `Production | `Staging ] ->

diff --git a/mirage/certify/dune b/mirage/certify/dune
@@ -2,4 +2,4 @@
  (name dns_certify_mirage)
  (public_name dns-certify.mirage)
  (wrapped false)
- (libraries dns dns-mirage dns-certify tls lwt duration mirage-random mirage-time-lwt mirage-clock-lwt mirage-stack-lwt))
+ (libraries dns dns-mirage dns-certify tls lwt duration mirage-random mirage-time mirage-clock mirage-stack))
diff --git a/mirage/client/dns_client_mirage.ml b/mirage/client/dns_client_mirage.ml
@@ -3,7 +3,7 @@ open Lwt.Infix
 let src = Logs.Src.create "dns_client_mirage" ~doc:"effectful DNS client layer"
 module Log = (val Logs.src_log src : Logs.LOG)
 
-module Make (R : Mirage_random.C) (S : Mirage_stack_lwt.V4) = struct
+module Make (R : Mirage_random.S) (C : Mirage_clock.MCLOCK) (S : Mirage_stack.V4) = struct
 
   module Transport : Dns_client.S
     with type flow = S.TCPV4.flow
@@ -59,6 +59,8 @@ module Make (R : Mirage_random.C) (S : Mirage_stack_lwt.V4) = struct
 
   include Dns_client.Make(Transport)
 
+  let create ?size ?nameserver stack =
+    create ?size ~rng:R.generate ?nameserver ~clock:C.elapsed_ns stack
 end
 
 (*

diff --git a/mirage/client/dns_client_mirage.mli b/mirage/client/dns_client_mirage.mli
@@ -1,12 +1,17 @@
 
-module Make (R : Mirage_random.C) (S : Mirage_stack_lwt.V4) : sig
+module Make (R : Mirage_random.S) (C : Mirage_clock.MCLOCK) (S : Mirage_stack.V4) : sig
   module Transport : Dns_client.S
     with type flow = S.TCPV4.flow
      and type io_addr = Ipaddr.V4.t * int
      and type +'a io = 'a Lwt.t
      and type stack = S.t
 
   include module type of Dns_client.Make(Transport)
+
+  val create : ?size:int -> ?nameserver:Transport.ns_addr -> S.t -> t
+  (** [create ~size ~nameserver stack] uses [R.generate] and [C.elapsed_ns] as
+      random number generator and timestamp source, and calls the generic
+      [Dns_client.Make.create]. *)
 end
 
 (*

diff --git a/mirage/client/dune b/mirage/client/dune
@@ -1,5 +1,5 @@
 (library
   (name        dns_client_mirage)
   (public_name dns-client.mirage)
-  (libraries   domain-name ipaddr mirage-random mirage-stack-lwt dns-client)
+  (libraries   domain-name ipaddr mirage-random mirage-stack mirage-clock dns-client)
   (wrapped     false))
diff --git a/mirage/dns_mirage.ml b/mirage/dns_mirage.ml
@@ -5,7 +5,7 @@ open Lwt.Infix
 let src = Logs.Src.create "dns_mirage" ~doc:"effectful DNS layer"
 module Log = (val Logs.src_log src : Logs.LOG)
 
-module Make (S : Mirage_stack_lwt.V4) = struct
+module Make (S : Mirage_stack.V4) = struct
 
   module IS = Set.Make(Ipaddr.V4)
 

diff --git a/mirage/dns_mirage.mli b/mirage/dns_mirage.mli
@@ -1,6 +1,6 @@
 (* (c) 2017, 2018 Hannes Mehnert, all rights reserved *)
 
-module Make (S : Mirage_stack_lwt.V4) : sig
+module Make (S : Mirage_stack.V4) : sig
 
   module IS : Set.S with type elt = Ipaddr.V4.t
   (** [IS] is a set of [ipaddr]. *)

diff --git a/mirage/dune b/mirage/dune
@@ -2,4 +2,4 @@
  (name dns_mirage)
  (public_name dns-mirage)
  (wrapped false)
- (libraries dns mirage-stack-lwt ipaddr lwt))
+ (libraries dns mirage-stack ipaddr lwt))
diff --git a/mirage/resolver/dns_resolver_mirage.ml b/mirage/resolver/dns_resolver_mirage.ml
@@ -5,7 +5,7 @@ open Lwt.Infix
 let src = Logs.Src.create "dns_resolver_mirage" ~doc:"effectful DNS resolver"
 module Log = (val Logs.src_log src : Logs.LOG)
 
-module Make (R : Mirage_random.C) (P : Mirage_clock_lwt.PCLOCK) (M : Mirage_clock_lwt.MCLOCK) (TIME : Mirage_time_lwt.S) (S : Mirage_stack_lwt.V4) = struct
+module Make (R : Mirage_random.S) (P : Mirage_clock.PCLOCK) (M : Mirage_clock.MCLOCK) (TIME : Mirage_time.S) (S : Mirage_stack.V4) = struct
 
   module Dns = Dns_mirage.Make(S)
 

diff --git a/mirage/resolver/dns_resolver_mirage.mli b/mirage/resolver/dns_resolver_mirage.mli
@@ -1,6 +1,6 @@
 (* (c) 2017, 2018 Hannes Mehnert, all rights reserved *)
 
-module Make (R : Mirage_random.C) (P : Mirage_clock_lwt.PCLOCK) (M : Mirage_clock_lwt.MCLOCK) (T : Mirage_time_lwt.S) (S : Mirage_stack_lwt.V4) : sig
+module Make (R : Mirage_random.S) (P : Mirage_clock.PCLOCK) (M : Mirage_clock.MCLOCK) (T : Mirage_time.S) (S : Mirage_stack.V4) : sig
 
   val resolver : S.t -> ?root:bool -> ?timer:int -> ?port:int -> Dns_resolver.t -> unit
   (** [resolver stack ~root ~timer ~port resolver] registers a caching resolver

diff --git a/mirage/resolver/dune b/mirage/resolver/dune
@@ -2,4 +2,4 @@
  (name dns_resolver_mirage)
  (public_name dns-resolver.mirage)
  (wrapped false)
- (libraries dns dns-resolver dns-server dns-mirage lwt duration mirage-time-lwt mirage-clock-lwt mirage-stack-lwt mirage-random))
+ (libraries dns dns-resolver dns-server dns-mirage lwt duration mirage-time mirage-clock mirage-stack mirage-random))
diff --git a/mirage/server/dns_server_mirage.ml b/mirage/server/dns_server_mirage.ml
@@ -5,7 +5,7 @@ open Lwt.Infix
 let src = Logs.Src.create "dns_server_mirage" ~doc:"effectful DNS server"
 module Log = (val Logs.src_log src : Logs.LOG)
 
-module Make (P : Mirage_clock_lwt.PCLOCK) (M : Mirage_clock_lwt.MCLOCK) (TIME : Mirage_time_lwt.S) (S : Mirage_stack_lwt.V4) = struct
+module Make (P : Mirage_clock.PCLOCK) (M : Mirage_clock.MCLOCK) (TIME : Mirage_time.S) (S : Mirage_stack.V4) = struct
 
   module Dns = Dns_mirage.Make(S)
 

diff --git a/mirage/server/dns_server_mirage.mli b/mirage/server/dns_server_mirage.mli
@@ -1,6 +1,6 @@
 (* (c) 2017, 2018 Hannes Mehnert, all rights reserved *)
 
-module Make (P : Mirage_clock_lwt.PCLOCK) (M : Mirage_clock_lwt.MCLOCK) (T : Mirage_time_lwt.S) (S : Mirage_stack_lwt.V4) : sig
+module Make (P : Mirage_clock.PCLOCK) (M : Mirage_clock.MCLOCK) (T : Mirage_time.S) (S : Mirage_stack.V4) : sig
 
   val primary : ?on_update:(old:Dns_trie.t -> Dns_server.Primary.s -> unit Lwt.t) ->
     ?on_notify:([ `Notify of Dns.Soa.t option | `Signed_notify of Dns.Soa.t option ] ->

diff --git a/mirage/server/dune b/mirage/server/dune
@@ -2,4 +2,4 @@
  (name dns_server_mirage)
  (public_name dns-server.mirage)
  (wrapped false)
- (libraries dns dns-server dns-mirage lwt duration randomconv mirage-time-lwt mirage-clock-lwt mirage-stack-lwt))
+ (libraries dns dns-server dns-mirage lwt duration randomconv mirage-time mirage-clock mirage-stack))