Merge pull request #283 from yomimono/split-tcpip-module-types

Split tcpip module types

.merlin

@@ -1,7 +1,9 @@
-PKG lwt ipaddr lwt mirage-types cstruct cstruct.ppx io-page uint mirage-flow
-PKG oUnit alcotest mirage-types-lwt mirage-profile
+PKG lwt ipaddr lwt cstruct cstruct.ppx io-page uint mirage-flow
+PKG oUnit alcotest mirage-profile
 PKG mirage-vnetif pcap-format mirage-console-unix logs mirage-net-lwt
 PKG duration mirage-runtime rresult randomconv mirage-clock-unix
+PKG mirage-protocols mirage-protocols-lwt mirage-device
+PKG mirage-stack mirage-stack-lwt
 
 B _build/**
 S lib/

.travis.yml

@@ -3,7 +3,7 @@ script: bash -ex .travis-ci.sh
 sudo: required
 env:
   global:
-  - EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git"
+  - EXTRA_REMOTES="https://github.com/yomimono/mirage-dev.git#split-tcpip-module-types-consistent"
   matrix:
   - OCAML_VERSION=4.03 PACKAGE=tcpip MIRAGE_MODE=unix
   - UPDATE_GCC_BINUTILS=1 OCAML_VERSION=4.03 PACKAGE=tcpip MIRAGE_MODE=xen

_oasis

@@ -21,7 +21,8 @@ Library tcpip
   Modules:            Tcpip_checksum
   CSources:           checksum_stubs.c
   CCOpt:              -O2 -fno-stack-protector
-  BuildDepends:       mirage-types (>= 2.8.0),ipaddr,cstruct (>= 1.9.0)
+  BuildDepends:       mirage-net-lwt, mirage-protocols, mirage-protocols-lwt,
+                      ipaddr, cstruct (>= 1.9.0)
   XMETAExtraLines:    xen_linkopts = "-ltcpip_xen_stubs"
 
 Library tcpip_xen
@@ -39,16 +40,17 @@ Library ethif
   Findlibparent:      tcpip
   Findlibname:        ethif
   Modules:            Ethif, Ethif_wire, Ethif_packet
-  BuildDepends:       logs,mirage-types,mirage-types-lwt,ipaddr,cstruct,lwt,mirage-profile,result,rresult,mirage-runtime
+  BuildDepends:       logs,mirage-protocols-lwt,ipaddr,cstruct,lwt,mirage-profile,result,rresult,mirage-net-lwt
 
 Library arpv4
   CompiledObject:     best
   Path:               lib/arpv4
   Findlibparent:      tcpip
   Findlibname:        arpv4
   Modules:            Arpv4, Arpv4_wire, Arpv4_packet
-  BuildDepends:       mirage-types,logs,ipaddr,cstruct,cstruct.ppx,lwt,
-                      result,rresult,tcpip.ethif,duration,fmt
+  BuildDepends:       mirage-protocols-lwt,logs,ipaddr,cstruct,cstruct.ppx,lwt,
+                      result,rresult,tcpip.ethif,duration,fmt,
+                      mirage-clock-lwt, mirage-time-lwt
 
 Library ipv4
   CompiledObject:     best
@@ -57,8 +59,7 @@ Library ipv4
   Findlibname:        ipv4
   Modules:            Static_ipv4, Ipv4_wire, Ipv4_packet
   InternalModules:    Ipv4_common, Routing
-  BuildDepends:       logs,io-page,mirage-types,ipaddr,cstruct.ppx,lwt,result,rresult,
-                      mirage-runtime,
+  BuildDepends:       logs,io-page,mirage-protocols,ipaddr,cstruct.ppx,lwt,result,rresult,
                       tcpip,tcpip.ethif,
                       tcpip.udp, tcpip.tcp
 
@@ -68,28 +69,30 @@ Library ipv6
   Findlibparent:      tcpip
   Findlibname:        ipv6
   Modules:            Ipv6, Ndpv6, Ipv6_wire
-  BuildDepends:       logs,io-page,mirage-types,ipaddr,cstruct,cstruct.ppx,lwt,
-                      tcpip,tcpip.ethif, duration,mirage-runtime
+  BuildDepends:       logs,io-page,mirage-protocols-lwt,ipaddr,cstruct,cstruct.ppx,lwt,
+                      tcpip,tcpip.ethif, duration,
+                      mirage-time-lwt, mirage-clock-lwt
 
 Library icmpv4
   CompiledObject:     best
   Path:               lib/icmp
   Findlibparent:      tcpip
   Findlibname:        icmpv4
   Modules:            Icmpv4, Icmpv4_packet, Icmpv4_wire
-  BuildDepends:       logs,mirage-types,mirage-types-lwt,cstruct,
+  BuildDepends:       logs,mirage-protocols,mirage-protocols-lwt,cstruct,
                       cstruct.ppx,lwt,ipaddr,result,rresult,mirage-profile,
-                      tcpip,mirage-runtime,fmt
+                      tcpip,fmt
 
 Library udp
   CompiledObject:     best
   Path:               lib/udp
   Findlibparent:      tcpip
   Findlibname:        udp
   Modules:            Udp, Udp_wire, Udp_packet
-  BuildDepends:       logs,mirage-types,mirage-types-lwt,ipaddr,cstruct,
+  BuildDepends:       logs,ipaddr,cstruct,
                       cstruct.ppx,lwt,result,rresult,mirage-profile,
-                      tcpip,mirage-runtime,randomconv,fmt
+                      tcpip,randomconv,fmt,
+                      mirage-protocols,mirage-protocols-lwt,mirage-random
 
 Library tcp
   CompiledObject:     best
@@ -101,18 +104,22 @@ Library tcp
                       Window,Segment,User_buffer,Pcb,Flow,
                       Stats, Wire,
                       Tcp_wire, Tcp_packet
-  BuildDepends:       logs,mirage-types,mirage-types-lwt,ipaddr,cstruct,
+  BuildDepends:       logs,mirage-protocols,mirage-protocols-lwt,ipaddr,cstruct,
                       cstruct.ppx,lwt,result,rresult,mirage-profile,io-page,
-                      tcpip,duration,randomconv,mirage-runtime,fmt
+                      tcpip,duration,randomconv,fmt,
+                      mirage-time-lwt,mirage-clock,mirage-random
 
 Library "tcpip-stack-direct"
   CompiledObject:     best
   Path:               lib
   Findlibparent:      tcpip
   Findlibname:        stack-direct
   Modules:            Tcpip_stack_direct
-  BuildDepends:       logs,mirage-types,mirage-types-lwt,ipaddr,lwt,result,fmt,
-                      mirage-runtime,mirage-net-lwt
+  BuildDepends:       logs,ipaddr,lwt,result,fmt,
+                      mirage-protocols,mirage-protocols-lwt,
+                      mirage-stack-lwt,
+                      mirage-net-lwt,
+                      mirage-time,mirage-random,mirage-device
 
 Library "icmpv4-socket"
   CompiledObject:     best
@@ -126,23 +133,25 @@ Library "icmpv4-socket"
                       cstruct.lwt,
                       io-page.unix,
                       tcpip.icmpv4,
-                      mirage-runtime
+                      mirage-protocols,mirage-protocols-lwt
 
 Library "udpv4-socket"
   CompiledObject:     best
   Path:               unix
   Findlibparent:      tcpip
   Findlibname:        udpv4-socket
   Modules:            Udpv4_socket
-  BuildDepends:       lwt,ipaddr.unix,cstruct.lwt,fmt
+  BuildDepends:       lwt,ipaddr.unix,cstruct.lwt,fmt,
+                      mirage-protocols,mirage-protocols-lwt
 
 Library "udpv6-socket"
   CompiledObject:     best
   Path:               unix
   Findlibparent:      tcpip
   Findlibname:        udpv6-socket
   Modules:            Udpv6_socket
-  BuildDepends:       lwt,lwt.unix,ipaddr.unix,cstruct.lwt,io-page.unix
+  BuildDepends:       lwt,lwt.unix,ipaddr.unix,cstruct.lwt,io-page.unix,
+                      mirage-protocols,mirage-protocols-lwt
 
 Library "tcpv4-socket"
   CompiledObject:     best
@@ -151,8 +160,8 @@ Library "tcpv4-socket"
   Findlibname:        tcpv4-socket
   Modules:            Tcpv4_socket
   InternalModules:    Tcp_socket
-  BuildDepends:       lwt,lwt.unix,ipaddr.unix,cstruct.lwt,io-page.unix,
-                      mirage-types-lwt,mirage-types,mirage-runtime,fmt
+  BuildDepends:       lwt,lwt.unix,ipaddr.unix,cstruct.lwt,io-page.unix,fmt,
+                      mirage-protocols,mirage-protocols-lwt
 
 Library "tcpv6-socket"
   CompiledObject:     best
@@ -161,15 +170,18 @@ Library "tcpv6-socket"
   Findlibname:        tcpv6-socket
   InternalModules:    Tcp_socket
   Modules:            Tcpv6_socket
-  BuildDepends:       lwt,lwt.unix,ipaddr.unix,cstruct.lwt,io-page.unix
+  BuildDepends:       lwt,lwt.unix,ipaddr.unix,cstruct.lwt,io-page.unix,
+                      mirage-protocols,mirage-protocols-lwt
 
 Library "tcpip-stack-socket"
   CompiledObject:     best
   Path:               unix
   Findlibparent:      tcpip
   Findlibname:        stack-socket
   Modules:            Tcpip_stack_socket, Ipv4_socket, Ipv6_socket
-  BuildDepends:       lwt,lwt.unix,ipaddr.unix,io-page.unix,logs,mirage-runtime
+  BuildDepends:       lwt,lwt.unix,ipaddr.unix,io-page.unix,logs,
+                      mirage-protocols,mirage-protocols-lwt,
+                      mirage-stack-lwt
 
 Executable test
   CompiledObject:     best
@@ -185,7 +197,8 @@ Executable test
                       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,
-                      mirage-stdlib-random, result, rresult
+                      mirage-stdlib-random, result, rresult,
+                      mirage-protocols, mirage-protocols-lwt,  mirage-stack-lwt
 
 Test test
   Run$:               flag(tests)