Skip to content
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

Tcpip.4.1.0 #37

Merged
merged 4 commits into from
Feb 18, 2020
Merged

Tcpip.4.1.0 #37

merged 4 commits into from
Feb 18, 2020

Conversation

hannesm
Copy link
Member

@hannesm hannesm commented Feb 8, 2020

this depends on the not-yet-released tcpip 4.1.0 which changes the type of Fragments.Cache.t

in addition, this as well removes some unnecessary dependencies from mirage-nat

and reverts the change from Lru.F.t to Lru.M.t (for the overall reasons mentioned in mirage/mirage-tcpip#423 // mirage/qubes-mirage-firewall#93)

//cc @talex5 @xaki23

This reverts parts of cc1aac2, while:
a) keeping the lru>=0.3.0 compatibility
b) using in the record a non-mutable field to a ref lru.t (previously:
   mutable x : Lru.t ref; now x : Lru.t ref) - to satisfy the SUBTABLE interface
@xaki23
Copy link

xaki23 commented Feb 9, 2020

tcpip-4.1.0 looks merged now, so +1 for merging this one
ocaml/opam-repository#15808

@talex5
Copy link
Contributor

talex5 commented Feb 17, 2020

I don't know much about this code, but this PR looks reasonable to me.

@hannesm hannesm merged commit 0c8846a into mirage:master Feb 18, 2020
@hannesm hannesm deleted the tcpip.4.1.0 branch February 18, 2020 20:04
hannesm added a commit to hannesm/opam-repository that referenced this pull request Feb 18, 2020
CHANGES:

- support tcpip 4.1.0, which Ipv4.Fragments interface changed from LRU.M to LRU.F
- Mirage_nat_lru uses as well a LRU.F again
- breaking: Nat_packet.of_ipv4_frame / of_ethernet_frame output a pair of
  `Fragments.t * (t option, error) result`
- all in mirage/mirage-nat#37 by @hannesm
mgree pushed a commit to mgree/opam-repository that referenced this pull request Feb 19, 2020
CHANGES:

- support tcpip 4.1.0, which Ipv4.Fragments interface changed from LRU.M to LRU.F
- Mirage_nat_lru uses as well a LRU.F again
- breaking: Nat_packet.of_ipv4_frame / of_ethernet_frame output a pair of
  `Fragments.t * (t option, error) result`
- all in mirage/mirage-nat#37 by @hannesm
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants