Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cde224950c44
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 52f23cc5c78f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 28, 2018

  1. docs

    hannesm committed Mar 28, 2018
    Copy the full SHA
    c2e1d6c View commit details

Commits on Apr 3, 2018

  1. Merge pull request #899 from hannesm/docs

    docs
    mor1 authored Apr 3, 2018
    Copy the full SHA
    52f23cc View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/mirage.mli
6 changes: 3 additions & 3 deletions lib/mirage.mli
Original file line number Diff line number Diff line change
@@ -310,7 +310,7 @@ type ipv6_config = {
val create_ipv4: ?group:string ->
?config:ipv4_config -> ethernet impl -> arpv4 impl -> ipv4 impl
(** Use an IPv4 address
Exposes the keys {!Key.V4.ipv4} and {!Key.V4.ipv4-gateway}.
Exposes the keys {!Key.V4.network} and {!Key.V4.gateway}.
If provided, the values of these keys will override those supplied
in the ipv4 configuration record, if that has been provided.
*)
@@ -381,7 +381,7 @@ val direct_stackv4:
?group:string ->
network impl -> ethernet impl -> arpv4 impl -> ipv4 impl -> stackv4 impl

(** Network stack with sockets. Exposes the key {Key.interfaces}. *)
(** Network stack with sockets. Exposes the key {!Key.V4.interfaces}. *)
val socket_stackv4:
?group:string -> Ipaddr.V4.t list -> stackv4 impl

@@ -393,7 +393,7 @@ val qubes_ipv4_stack: ?group:string -> ?qubesdb:qubesdb impl -> ?arp:(ethernet i
* build an ipv4, then building a stack on top of that. *)
val dhcp_ipv4_stack: ?group:string -> ?time:time impl -> ?arp:(ethernet impl -> arpv4 impl) -> network impl -> stackv4 impl

(** Build a stackv4 by checking the {Key.ip4}, and {Key.ipv4-gateway} keys
(** Build a stackv4 by checking the {!Key.V4.network}, and {!Key.V4.gateway} keys
* for ipv4 configuration information, filling in unspecified information from [?config],
* then building a stack on top of that. *)
val static_ipv4_stack: ?group:string -> ?config:ipv4_config -> ?arp:(ethernet impl -> arpv4 impl) -> network impl -> stackv4 impl