Merge pull request mirage#260 from yomimono/normalize-ipv4

depend on charrua-client for dhcp client

.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#normalize-ipv4"
   matrix:
   - OCAML_VERSION=4.02 PACKAGE=tcpip MIRAGE_MODE=unix
   - UPDATE_GCC_BINUTILS=1 OCAML_VERSION=4.02 PACKAGE=tcpip MIRAGE_MODE=xen

_oasis

@@ -55,7 +55,8 @@ Library ipv4
   Path:               lib/ipv4
   Findlibparent:      tcpip
   Findlibname:        ipv4
-  Modules:            Ipv4, Ipv4_wire, Ipv4_packet
+  Modules:            Static_ipv4, Ipv4_wire, Ipv4_packet
+  InternalModules:    Ipv4_common, Routing
   BuildDepends:       logs,io-page,mirage-types,ipaddr,cstruct.ppx,lwt,result,rresult,
                       tcpip,tcpip.ethif
 
@@ -100,23 +101,13 @@ Library tcp
                       io-page,
                       tcpip, duration, randomconv
 
-Library dhcpv4
-  CompiledObject:     best
-  Path:               lib/dhcp
-  Findlibparent:      tcpip
-  Findlibname:        dhcpv4
-  Modules:            Dhcpv4_option,Dhcp_clientv4
-  BuildDepends:       logs,io-page,mirage-types,ipaddr,cstruct,cstruct.ppx,lwt,
-                      tcpip.udp, duration, randomconv
-
 Library "tcpip-stack-direct"
   CompiledObject:     best
   Path:               lib
   Findlibparent:      tcpip
   Findlibname:        stack-direct
   Modules:            Tcpip_stack_direct
-  BuildDepends:       logs,mirage-types,ipaddr,lwt,
-                      tcpip.dhcpv4, result
+  BuildDepends:       logs,mirage-types,ipaddr,lwt,result
 
 Library "icmpv4-socket"
   CompiledObject:     best

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 932c2d4a28d84c22430fe4df82d8b59a)
+# DO NOT EDIT (digest: 61581dffdce93c14e7b62030da4e6737)
 # 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
@@ -19,6 +19,7 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: oasis_library_tcpip_ccopt
 "lib/checksum_stubs.c": oasis_library_tcpip_ccopt
 <lib/tcpip.{cma,cmxa}>: use_libtcpip_stubs
+<lib/*.ml{,i,y}>: pkg_cstruct
 "lib/checksum_stubs.c": pkg_cstruct
 "lib/checksum_stubs.c": pkg_ipaddr
 "lib/checksum_stubs.c": pkg_mirage-types
@@ -132,39 +133,13 @@ true: annot, bin_annot
 <lib/tcp/*.ml{,i,y}>: pkg_result
 <lib/tcp/*.ml{,i,y}>: pkg_rresult
 <lib/tcp/*.ml{,i,y}>: use_tcpip
-# Library dhcpv4
-"lib/dhcp/dhcpv4.cmxs": use_dhcpv4
-<lib/dhcp/*.ml{,i,y}>: pkg_cstruct
-<lib/dhcp/*.ml{,i,y}>: pkg_cstruct.ppx
-<lib/dhcp/*.ml{,i,y}>: pkg_duration
-<lib/dhcp/*.ml{,i,y}>: pkg_io-page
-<lib/dhcp/*.ml{,i,y}>: pkg_ipaddr
-<lib/dhcp/*.ml{,i,y}>: pkg_logs
-<lib/dhcp/*.ml{,i,y}>: pkg_lwt
-<lib/dhcp/*.ml{,i,y}>: pkg_mirage-profile
-<lib/dhcp/*.ml{,i,y}>: pkg_mirage-types
-<lib/dhcp/*.ml{,i,y}>: pkg_randomconv
-<lib/dhcp/*.ml{,i,y}>: pkg_result
-<lib/dhcp/*.ml{,i,y}>: pkg_rresult
-<lib/dhcp/*.ml{,i,y}>: use_tcpip
-<lib/dhcp/*.ml{,i,y}>: use_udp
 # Library tcpip-stack-direct
 "lib/tcpip-stack-direct.cmxs": use_tcpip-stack-direct
-<lib/*.ml{,i,y}>: pkg_cstruct
-<lib/*.ml{,i,y}>: pkg_cstruct.ppx
-<lib/*.ml{,i,y}>: pkg_duration
-<lib/*.ml{,i,y}>: pkg_io-page
 <lib/*.ml{,i,y}>: pkg_ipaddr
 <lib/*.ml{,i,y}>: pkg_logs
 <lib/*.ml{,i,y}>: pkg_lwt
-<lib/*.ml{,i,y}>: pkg_mirage-profile
 <lib/*.ml{,i,y}>: pkg_mirage-types
-<lib/*.ml{,i,y}>: pkg_randomconv
 <lib/*.ml{,i,y}>: pkg_result
-<lib/*.ml{,i,y}>: pkg_rresult
-<lib/*.ml{,i,y}>: use_dhcpv4
-<lib/*.ml{,i,y}>: use_tcpip
-<lib/*.ml{,i,y}>: use_udp
 # Library icmpv4-socket
 "unix/icmpv4-socket.cmxs": use_icmpv4-socket
 <unix/*.ml{,i,y}>: pkg_cstruct
@@ -220,7 +195,6 @@ true: annot, bin_annot
 <lib_test/test.{native,byte}>: pkg_result
 <lib_test/test.{native,byte}>: pkg_rresult
 <lib_test/test.{native,byte}>: use_arpv4
-<lib_test/test.{native,byte}>: use_dhcpv4
 <lib_test/test.{native,byte}>: use_ethif
 <lib_test/test.{native,byte}>: use_icmpv4
 <lib_test/test.{native,byte}>: use_ipv4
@@ -257,7 +231,6 @@ true: annot, bin_annot
 <lib_test/*.ml{,i,y}>: pkg_result
 <lib_test/*.ml{,i,y}>: pkg_rresult
 <lib_test/*.ml{,i,y}>: use_arpv4
-<lib_test/*.ml{,i,y}>: use_dhcpv4
 <lib_test/*.ml{,i,y}>: use_ethif
 <lib_test/*.ml{,i,y}>: use_icmpv4
 <lib_test/*.ml{,i,y}>: use_ipv4

lib/META

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 0289584629c88bb3ad579364942336e4)
+# DO NOT EDIT (digest: 19248bdbc381f553626b53890e652d93)
 version = "2.8.0"
 description =
 "Implementations for network-related module types from MirageOS."
@@ -112,7 +112,7 @@ package "stack-direct" (
  version = "2.8.0"
  description =
  "Implementations for network-related module types from MirageOS."
- requires = "logs mirage-types ipaddr lwt tcpip.dhcpv4 result"
+ requires = "logs mirage-types ipaddr lwt result"
  archive(byte) = "tcpip-stack-direct.cma"
  archive(byte, plugin) = "tcpip-stack-direct.cma"
  archive(native) = "tcpip-stack-direct.cmxa"
@@ -184,19 +184,6 @@ package "ethif" (
  exists_if = "ethif.cma"
 )
 
-package "dhcpv4" (
- version = "2.8.0"
- description =
- "Implementations for network-related module types from MirageOS."
- requires =
- "logs io-page mirage-types ipaddr cstruct cstruct.ppx lwt tcpip.udp duration randomconv"
- archive(byte) = "dhcpv4.cma"
- archive(byte, plugin) = "dhcpv4.cma"
- archive(native) = "dhcpv4.cmxa"
- archive(native, plugin) = "dhcpv4.cmxs"
- exists_if = "dhcpv4.cma"
-)
-
 package "arpv4" (
  version = "2.8.0"
  description =