Merge pull request #161 from samoht/master

Prepare the release

CHANGES

@@ -1,3 +1,17 @@
+2.5.1 (2015-07-07)
+
+* Fix regression introduced in 2.5.0 where packet loss could lead to the
+  connection to become very slow (#157, MagnusS, @talex5, @yomimono and
+  @balrajsingh)
+* Improve the tests: more logging, more tracing and compile to native code when
+  available, etc (@MagnusS and @talex5)
+* Do not raise `Invalid_argument("Lwt.wakeup_result")` everytime a connection
+  is closed. Also now pass the raised exceptions to `Lwt.async_exception_hook`
+  instead of ignoring them transparently, so the user can decide to shutdown
+  its application if something wrong happens (#153, #156, @yomomino and @talex5)
+* The `channel` library now lives in a separate repository and is released
+  separately (#159, @samoht)
+
 2.5.0 (2015-06-10)
 * The test runs now produce `.pcap` files (#141, by @MagnusS)
 * Strip trailing bytes from network packets (#145, by @talex5)

_oasis

@@ -1,9 +1,10 @@
 OASISFormat: 0.4
 Name:        tcpip
-Version:     2.5.0
+Version:     2.5.1
 Synopsis:    Ethernet, TCP/IPv4 and DHCPv4 library
 Authors:     Anil Madhavapeddy, Balraj Singh, Richard Mortier,
-             Nicolas Ojeda Bar, Thomas Gazagnaire
+             Nicolas Ojeda Bar, Thomas Gazagnaire, Vincent Bernardoff,
+             Magnus Skjegstad, Mindy Preston, Thomas Leonard
 License:     ISC
 Plugins:     META (0.4), DevFiles (0.4)
 BuildTools:  ocamlbuild
@@ -291,15 +292,15 @@ Library "tcpip-stack-socket"
                       io-page.unix
 
 Executable test
-  CompiledObject:     native
-  Build$: flag(tests)
-  Path: lib_test
-  MainIs: test.ml
-  ByteOpt: -g
-  BuildDepends: alcotest, oUnit, lwt, lwt.unix, io-page.unix, channel, mirage-profile,
-                mirage-flow, mirage-vnetif, mirage-console.unix, tcpip.ethif, 
-                tcpip.tcp, pcap-format
+  CompiledObject:     best
+  Build$:             flag(tests)
+  install:            false
+  Path:               lib_test/
+  MainIs:             test.ml
+  BuildDepends:       alcotest, oUnit, lwt, lwt.unix, io-page.unix,
+                      mirage-profile, mirage-flow, mirage-vnetif,
+                      mirage-console.unix, tcpip.ethif, tcpip.tcp, pcap-format
 
 Test test
-  Run$: flag(tests)
-  Command: $test -q
+  Run$:               flag(tests)
+  Command:            $test -q

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: c29853b44d503443994beb236b619204)
+# DO NOT EDIT (digest: 6b9cf3043caf636197595a91784e90f6)
 # 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
@@ -153,32 +153,28 @@ true: annot, bin_annot
 <unix/*.ml{,i,y}>: use_udpv4-socket
 <unix/*.ml{,i,y}>: use_udpv6-socket
 # Executable test
-"lib_test/test.native": oasis_executable_test_byte
-<lib_test/*.ml{,i,y}>: oasis_executable_test_byte
-"lib_test/test.native": pkg_alcotest
-"lib_test/test.native": pkg_bytes
-"lib_test/test.native": pkg_channel
-"lib_test/test.native": pkg_cstruct
-"lib_test/test.native": pkg_io-page
-"lib_test/test.native": pkg_io-page.unix
-"lib_test/test.native": pkg_ipaddr
-"lib_test/test.native": pkg_lwt
-"lib_test/test.native": pkg_lwt.unix
-"lib_test/test.native": pkg_mirage-console.unix
-"lib_test/test.native": pkg_mirage-flow
-"lib_test/test.native": pkg_mirage-profile
-"lib_test/test.native": pkg_mirage-types
-"lib_test/test.native": pkg_mirage-vnetif
-"lib_test/test.native": pkg_oUnit
-"lib_test/test.native": pkg_pcap-format
-"lib_test/test.native": use_ethif
-"lib_test/test.native": use_ipv4
-"lib_test/test.native": use_ipv6
-"lib_test/test.native": use_tcp
-"lib_test/test.native": use_tcpip
+<lib_test/test.{native,byte}>: pkg_alcotest
+<lib_test/test.{native,byte}>: pkg_bytes
+<lib_test/test.{native,byte}>: pkg_cstruct
+<lib_test/test.{native,byte}>: pkg_io-page
+<lib_test/test.{native,byte}>: pkg_io-page.unix
+<lib_test/test.{native,byte}>: pkg_ipaddr
+<lib_test/test.{native,byte}>: pkg_lwt
+<lib_test/test.{native,byte}>: pkg_lwt.unix
+<lib_test/test.{native,byte}>: pkg_mirage-console.unix
+<lib_test/test.{native,byte}>: pkg_mirage-flow
+<lib_test/test.{native,byte}>: pkg_mirage-profile
+<lib_test/test.{native,byte}>: pkg_mirage-types
+<lib_test/test.{native,byte}>: pkg_mirage-vnetif
+<lib_test/test.{native,byte}>: pkg_oUnit
+<lib_test/test.{native,byte}>: pkg_pcap-format
+<lib_test/test.{native,byte}>: use_ethif
+<lib_test/test.{native,byte}>: use_ipv4
+<lib_test/test.{native,byte}>: use_ipv6
+<lib_test/test.{native,byte}>: use_tcp
+<lib_test/test.{native,byte}>: use_tcpip
 <lib_test/*.ml{,i,y}>: pkg_alcotest
 <lib_test/*.ml{,i,y}>: pkg_bytes
-<lib_test/*.ml{,i,y}>: pkg_channel
 <lib_test/*.ml{,i,y}>: pkg_cstruct
 <lib_test/*.ml{,i,y}>: pkg_io-page
 <lib_test/*.ml{,i,y}>: pkg_io-page.unix

lib/META

@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 82241de1434b6baba6806f051e2e5673)
-version = "2.5.0"
+# DO NOT EDIT (digest: 6aa06eed53e9ce5c406bb78c559f0b39)
+version = "2.5.1"
 description = "Ethernet, TCP/IPv4 and DHCPv4 library"
 requires = "io-page mirage-types ipaddr cstruct mirage-profile bytes"
 archive(byte) = "tcpip.cma"
@@ -10,7 +10,7 @@ archive(native, plugin) = "tcpip.cmxs"
 xen_linkopts = "-ltcpip_xen_stubs"
 exists_if = "tcpip.cma"
 package "xen" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  archive(byte) = "tcpip_xen.cma"
  archive(byte, plugin) = "tcpip_xen.cma"
@@ -20,7 +20,7 @@ package "xen" (
 )
 
 package "udpv6-unix" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.udp tcpip.ipv6-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -32,7 +32,7 @@ package "udpv6-unix" (
 )
 
 package "udpv6-socket" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.udp lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "udpv6-socket.cma"
@@ -43,7 +43,7 @@ package "udpv6-socket" (
 )
 
 package "udpv4-unix" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.udp tcpip.ipv4-unix lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -55,7 +55,7 @@ package "udpv4-unix" (
 )
 
 package "udpv4-socket" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.udp lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "udpv4-socket.cma"
@@ -66,7 +66,7 @@ package "udpv4-socket" (
 )
 
 package "udp" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "udp.cma"
@@ -77,7 +77,7 @@ package "udp" (
 )
 
 package "tcpv6-unix" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.tcp tcpip.ipv6-unix channel lwt lwt.unix mirage-unix mirage-clock-unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -89,7 +89,7 @@ package "tcpv6-unix" (
 )
 
 package "tcpv6-socket" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "tcpv6-socket.cma"
@@ -100,7 +100,7 @@ package "tcpv6-socket" (
 )
 
 package "tcpv4-unix" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.tcp tcpip.ipv4-unix channel lwt lwt.unix mirage-unix mirage-clock-unix ipaddr.unix cstruct.lwt io-page.unix"
@@ -112,7 +112,7 @@ package "tcpv4-unix" (
 )
 
 package "tcpv4-socket" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "lwt lwt.unix ipaddr.unix cstruct.lwt io-page.unix"
  archive(byte) = "tcpv4-socket.cma"
@@ -123,7 +123,7 @@ package "tcpv4-socket" (
 )
 
 package "tcp" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "io-page mirage-types ipaddr cstruct lwt tcpip tcpip.ipv4 tcpip.ipv6 mirage-profile"
@@ -135,7 +135,7 @@ package "tcp" (
 )
 
 package "stack-unix" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.udpv4-unix tcpip.tcpv4-unix tcpip.udpv6-unix tcpip.tcpv6-unix tcpip.stack-direct lwt lwt.unix ipaddr.unix mirage-unix mirage-clock-unix mirage-console.unix mirage-types.lwt io-page.unix"
@@ -147,7 +147,7 @@ package "stack-unix" (
 )
 
 package "stack-socket" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "tcpip.udpv4-socket tcpip.udpv6-socket tcpip.tcpv4-socket tcpip.tcpv6-socket lwt lwt.unix ipaddr.unix io-page.unix"
@@ -159,7 +159,7 @@ package "stack-socket" (
 )
 
 package "stack-direct" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires =
  "io-page mirage-types ipaddr cstruct lwt tcpip.ethif tcpip.udp tcpip.tcp tcpip.dhcpv4"
@@ -171,7 +171,7 @@ package "stack-direct" (
 )
 
 package "ipv6-unix" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.ethif-unix tcpip.ipv6 lwt lwt.unix"
  archive(byte) = "ipv6-unix.cma"
@@ -182,7 +182,7 @@ package "ipv6-unix" (
 )
 
 package "ipv6" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "ipv6.cma"
@@ -193,7 +193,7 @@ package "ipv6" (
 )
 
 package "ipv4-unix" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.ethif-unix tcpip.ipv4 lwt lwt.unix"
  archive(byte) = "ipv4-unix.cma"
@@ -204,7 +204,7 @@ package "ipv4-unix" (
 )
 
 package "ipv4" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page mirage-types ipaddr cstruct lwt tcpip"
  archive(byte) = "ipv4.cma"
@@ -215,7 +215,7 @@ package "ipv4" (
 )
 
 package "ethif-unix" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip.ethif mirage-net-unix lwt lwt.unix"
  archive(byte) = "ethif-unix.cma"
@@ -226,7 +226,7 @@ package "ethif-unix" (
 )
 
 package "ethif" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "tcpip io-page mirage-types ipaddr cstruct lwt"
  archive(byte) = "ethif.cma"
@@ -237,7 +237,7 @@ package "ethif" (
 )
 
 package "dhcpv4" (
- version = "2.5.0"
+ version = "2.5.1"
  description = "Ethernet, TCP/IPv4 and DHCPv4 library"
  requires = "io-page bytes mirage-types ipaddr cstruct lwt tcpip.udp"
  archive(byte) = "dhcpv4.cma"

lib_test/test.ml

@@ -15,7 +15,6 @@
  *)
 
 let suite = [
-  "channel", Test_channel.suite ;
   "connect", Test_connect.suite ;
   "iperf"  , Test_iperf.suite   ;
 ]