-
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
Changes from 24 commits
12529f3
7ac2bf6
52379e5
d311339
5c70157
a1ffbee
74a357e
2cf27ad
7d1e00b
2c8a648
6c356db
70e1c03
96236df
584f7da
1917f36
14483b7
cce86e3
145938e
c70aee0
fc487d4
0c83955
a5cb873
34f84f0
6ddcb08
c3f140f
310c4a1
1912e86
996198e
734d1cb
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
language: c | ||
script: bash -ex .travis-ci.sh | ||
env: | ||
- 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 | ||
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,12 +40,20 @@ Library ethif | |
Modules: Ethif | ||
BuildDepends: tcpip,io-page,mirage-types,ipaddr,cstruct,lwt | ||
|
||
Library arpv4 | ||
CompiledObject: best | ||
Path: lib | ||
Findlibparent: tcpip | ||
Findlibname: arpv4 | ||
Modules: Arpv4, Arpv4_wire | ||
BuildDepends: tcpip,io-page,mirage-types,ipaddr,cstruct,lwt,cstruct.syntax | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you also need to remove |
||
Library ipv4 | ||
CompiledObject: best | ||
Path: lib | ||
Findlibparent: tcpip | ||
Findlibname: ipv4 | ||
Modules: Ipv4, Arpv4 | ||
Modules: Ipv4 | ||
BuildDepends: io-page,mirage-types,ipaddr,cstruct,lwt,tcpip | ||
|
||
Library ipv6 | ||
|
@@ -118,6 +126,7 @@ Library "tcpip-stack-direct" | |
cstruct, | ||
lwt, | ||
tcpip.ethif, | ||
tcpip.arpv4, | ||
tcpip.udp, | ||
tcpip.tcp, | ||
tcpip.dhcpv4 | ||
|
@@ -133,6 +142,17 @@ Library "ethif-unix" | |
lwt, | ||
lwt.unix | ||
|
||
Library "arpv4-unix" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could we easily expose a There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch; thanks! Fixed. |
||
CompiledObject: best | ||
Path: unix | ||
Findlibparent: tcpip | ||
Findlibname: arpv4-unix | ||
Modules: Arpv4_unix | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And I think you forgot that file to the PR :p |
||
BuildDepends: tcpip.ethif, | ||
mirage-net-unix, | ||
lwt, | ||
lwt.unix | ||
|
||
Library "ipv4-unix" | ||
CompiledObject: best | ||
Path: unix | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# OASIS_START | ||
# DO NOT EDIT (digest: 5194760ef3cd01243f8b4b4dc5e5d3b9) | ||
Arpv4 | ||
Arpv4_wire | ||
# OASIS_STOP |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# OASIS_START | ||
# DO NOT EDIT (digest: 5194760ef3cd01243f8b4b4dc5e5d3b9) | ||
Arpv4 | ||
Arpv4_wire | ||
# OASIS_STOP |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
cstruct arp { | ||
uint8_t dst[6]; | ||
uint8_t src[6]; | ||
uint16_t ethertype; | ||
uint16_t htype; | ||
uint16_t ptype; | ||
uint8_t hlen; | ||
uint8_t plen; | ||
uint16_t op; | ||
uint8_t sha[6]; | ||
uint32_t spa; | ||
uint8_t tha[6]; | ||
uint32_t tpa | ||
} as big_endian | ||
|
||
cenum op { | ||
Op_request = 1; | ||
Op_reply | ||
} as uint16_t |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
# OASIS_START | ||
# DO NOT EDIT (digest: cb71e7ddbe984c8104a4a6c58420a5a6) | ||
# DO NOT EDIT (digest: e53211788365c0a2b1be74b682c19983) | ||
Ipv4 | ||
Arpv4 | ||
# OASIS_STOP |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
# OASIS_START | ||
# DO NOT EDIT (digest: cb71e7ddbe984c8104a4a6c58420a5a6) | ||
# DO NOT EDIT (digest: e53211788365c0a2b1be74b682c19983) | ||
Ipv4 | ||
Arpv4 | ||
# OASIS_STOP |
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 behttps://github.com/yomimono/mirage.git#separate_arp
(with.git
) to make opam happy.