-
Notifications
You must be signed in to change notification settings - Fork 85
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Expose Arpv4.Make functor; require arp argument for Ipv4.connect #134
Conversation
…to separate_parsers Conflicts: _tags lib/META myocamlbuild.ml setup.ml
@@ -133,6 +133,17 @@ Library "ethif-unix" | |||
lwt, | |||
lwt.unix | |||
|
|||
Library "arpv4-unix" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we easily expose a arpv4
library without unix dependencies?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch; thanks! Fixed.
Findlibname: arpv4 | ||
Modules: Arpv4 | ||
BuildDepends: tcpip,io-page,mirage-types,ipaddr,cstruct,lwt | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you also need to remove Arpv4
from the list of modules in ipv4
Can you add |
- OCAML_VERSION=4.02 PACKAGE=tcpip MIRAGE_MODE=unix | ||
- OCAML_VERSION=4.01 PACKAGE=tcpip MIRAGE_MODE=xen | ||
- OCAML_VERSION=4.02 PACKAGE=tcpip MIRAGE_MODE=unix PINS=mirage-types:https://github.com/yomimono/mirage#separate_arp | ||
- OCAML_VERSION=4.01 PACKAGE=tcpip MIRAGE_MODE=xen PINS=mirage-types:https://github.com/yomimono/mirage#separate_arp |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the url
should be https://github.com/yomimono/mirage.git#separate_arp
(with .git
) to make opam happy.
(documentation on this appears to be here: https://github.com/ocaml/ocaml-travisci-skeleton)
I really like this restructuring/separation of the arp layer. |
Seems to compile fine but the unit tests are failing ... not sure if this is related to this PR though. |
Hm it seems that the iperf test occasionally times out. I set the timeout to 30 seconds as the test completes in 4-5 seconds here. We could try increasing it to 60 seconds to see if it helps. Would it be possible to show the verbose test output in travis? |
the Travis machine can be very slow when running the tests, so yes it would be nice to have an adaptative timeout. To see the tests in travis you can use |
PR #137 should hopefully fix the iperf/travis test problem. The timeout is increased to two minutes and only half the data is transferred. |
Thanks, @MagnusS ! We'll see whether that works a bit better. |
I'm going to close this out, clean up the history, and make a new PR for the changes. |
Pull ARP out of ipv4 and make it externally usable. Require explicit arp.t argument for Ipv4.connect .
Needs to be merged in tandem with mirage/mirage#400 .