remove dependency on cstruct, use string and bytes instead #279
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hannesm
force-pushed
the
nono-cstruct
branch
from
dda7db1 to
a0637e1
Compare
|
The CI failures for the unikernels are due to the fact that our cirrus jobs use the miragevpn#main opam file for discovering dependencies. |
mirage-router: avoid deprecated function get_ip
reynir
reviewed
Sep 27, 2024
| @@ -95,9 +92,11 @@ let send_ping ({ ip_config; seq_no; mtu = _; ping = _ } as ifconfig) = | |||
| ~payload_len:(Cstruct.lenv [ icmpv4_hdr; payload ]) | |||
| ipv4_hdr | |||
| in | |||
| (ifconfig, Cstruct.concat [ ipv4_hdr; icmpv4_hdr; payload ]) | |||
| ( ifconfig, | |||
| Cstruct.to_string (Cstruct.concat [ ipv4_hdr; icmpv4_hdr; payload ]) ) | |||
There was a problem hiding this comment.
I wonder if it would be faster or better to do String.concat "" (List.map Cstruct.to_string [ ... ])
This may very well be premature optimization in unimportant code.
Comment on lines
+572
to
+573
| | `SHA512 -> "SHA512" | ||
| | _ -> assert false) |
There was a problem hiding this comment.
This is a bit annoying, but I didn't find a nicer way.
| @@ -1248,7 +1269,7 @@ let outgoing s data = | |||
|
|
|||
| let ping = | |||
| (* constant ping_string in OpenVPN: src/openvpn/ping.c *) | |||
| Cstruct.of_hex "2a 18 7b f3 64 1e b4 cb 07 ed 2d 0a 98 1f c7 48" | |||
| Ohex.decode "2a 18 7b f3 64 1e b4 cb 07 ed 2d 0a 98 1f c7 48" | |||
There was a problem hiding this comment.
We can make this a string literal now, but I like this.
| let out = Cstruct.append out wkc in | ||
| Packet.set_protocol out session.protocol; | ||
| let out = out ^ wkc in | ||
| Packet.set_protocol (Bytes.unsafe_of_string out) session.protocol; |
There was a problem hiding this comment.
The let out = out ^ wkc in line above allocates a new string so it's local to us.
Co-authored-by: Reynir Björnsson <[email protected]>
Co-authored-by: Reynir Björnsson <[email protected]>
Co-authored-by: Reynir Björnsson <[email protected]>
Co-authored-by: Reynir Björnsson <[email protected]>
Co-authored-by: Reynir Björnsson <[email protected]>
Co-authored-by: Reynir Björnsson <[email protected]>
Instead of doing unsafe casts to bytes and then calling Lwt_unix.write.
|
|
Hm, CI failed due to the unikernels pinning the main branch :/ |
|
Here are some numbers of iperf3 over openvpn with the server running in a local VM. Before this branch was mergedWith this branch mergedDownload speed is roughly the same while upload speed is 15% faster and now closer to the download speed. |
This was referenced Sep 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
re done of #223. compiles and test run fine. I'm sure there are potential optimizations, and we should take a look into what we did in #223 (which I tried and failed to rebase).