Merge pull request #11 from hannesm/less-types

remove netif and 'netif config types, also ip is no longer part of UDP/TCP

.travis.yml

@@ -6,7 +6,7 @@ env:
   global:
   - EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
   - PACKAGE="mirage-stack"
-  - PINS="mirage-stack-lwt:."
+  - PINS="mirage-stack:. mirage-stack-lwt:."
   - REVDEPS=true
   - DEPOPTS="mirage-stack-lwt"
   matrix:

CHANGES.md

@@ -1,16 +1,19 @@
-v1.2.0 2017-09-06
------------------
+### v1.3.0 2018-09-15
+
+- remove unused type `netif` and `'netif config` from V4 signature
+- remove `'netif stackv4_config` and `socket_stack_config`
+- adjust to mirage-protocols 1.4.0: remove `ip` from UDPV4 and TCPV4
+
+### v1.2.0 2017-09-06
 
 - add an optional argument ?keepalive to `listen_tcpv4` which allows TCP
   keepalives on accepted connections.
 - jbuilder is now a build dependency
 
-v1.1.0 2017-06-16
------------------
+### v1.1.0 2017-06-16
 
 - port to Jbuilder
 
-v1.0.0 2016-12-29
------------------
+### v1.0.0 2016-12-29
 
 - import V4 module type from mirage-types and mirage-types-lwt, where it was STACKV4

lwt/mirage_stack_lwt.ml

@@ -1,15 +1,6 @@
-type 'netif stackv4_config = {
-  name: string;
-  interface: 'netif;
-}
-
-type socket_stack_config =
-  Ipaddr.V4.t list
-
 module type V4 = sig
   include Mirage_stack.V4
   with type 'a io = 'a Lwt.t
-   and type 'a config = 'a stackv4_config
    and type ipv4addr = Ipaddr.V4.t
    and type buffer = Cstruct.t
 end

mirage-stack-lwt.opam

@@ -9,13 +9,13 @@ bug-reports:  "https://github.com/mirage/mirage-stack/issues"
 tags:         ["org:mirage"]
 
 build: [
-  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "subst" "-p" name ] {pinned}
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 
 depends: [
   "jbuilder" {build & >="1.0+beta9"}
-  "mirage-stack" {>= "1.0.0"}
+  "mirage-stack" {>= "1.3.0"}
   "ipaddr"
   "lwt"
   "cstruct" {>= "2.4.0"}

mirage-stack.opam

@@ -9,14 +9,14 @@ bug-reports:  "https://github.com/mirage/mirage-stack/issues"
 tags:         ["org:mirage"]
 
 build: [
-  [ "jbuilder" "subst" ] {pinned}
+  [ "jbuilder" "subst" "-p" name ] {pinned}
   [ "jbuilder" "build" "-p" name "-j" jobs ]
 ]
 
 depends: [
   "jbuilder" {build & >="1.0+beta9"}
   "mirage-device" {>= "1.0.0"}
-  "mirage-protocols" {>= "1.3.0"}
+  "mirage-protocols" {>= "1.4.0"}
   "fmt"
 ]
 

src/mirage_stack.ml

@@ -1,12 +1,4 @@
 module type V4 = sig
-  type netif
-  (** The type for network interface that is used to transmit and
-      receive traffic associated with this stack. *)
-
-  type 'netif config
-  (** The type for the collection of user configuration specified to
-      construct a stack. *)
-
   type ipv4addr
   (** The type for IPv4 addresses. *)
 
@@ -29,14 +21,12 @@ module type V4 = sig
      and type ipaddr = ipv4addr
      and type buffer = buffer
      and type t = udpv4
-     and type ip = ipv4
 
   module TCPV4: Mirage_protocols.TCP
     with type +'a io = 'a io
      and type ipaddr = ipv4addr
      and type buffer = buffer
      and type t = tcpv4
-     and type ip = ipv4
 
   module IPV4: Mirage_protocols.IPV4
     with type +'a io = 'a io