This repository has been archived by the owner on Oct 26, 2022. It is now read-only.
Wireguard packet support #191
Closed
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
|
Hello @Leo1003 Apologies for not being responsive. Thanks a lot for the PR, I'll try to take a close look today. |
little-dude
suggested changes
Nov 21, 2021
There was a problem hiding this comment.
Hello,
Thanks again for your work. I'm not a wireguard user myself, so I haven't ran the example yet.
I like the PR a lot, but I'm a bit scared of adding unsafe code, especially because I think we can avoid it here. You can see my suggested changes in your fork at Leo1003#1
What do you think?
little-dude
reviewed
Nov 21, 2021
little-dude
reviewed
Nov 21, 2021
|
@Leo1003 would you mind showing what the output of the example looks like? I don't have wireguard configured so I can't really test it. |
|
|
Thanks for your patience @Leo1003 :) I updated my PR. Let's rebase this and get it merged! |
First, `miri` didn't like this unsafe:
```
running 3 tests
test raw::test::test_parse_sockaddr_in6_1 ... ok
test raw::test::test_parse_sockaddr_in_1 ... error: Undefined Behavior: accessing memory with alignment 1, but alignment 2 is required
--> netlink-packet-wireguard/src/raw.rs:136:32
|
136 | let data: &'a T = unsafe { &*ptr };
| ^^^^^ accessing memory with alignment 1, but alignment 2 is required
|
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
= help: see doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
= note: inside `raw::from_raw_slice::<libc::sockaddr>` at netlink-packet-wireguard/src/raw.rs:136:32
note: inside `raw::parse_sockaddr` at netlink-packet-wireguard/src/raw.rs:91:41
--> netlink-packet-wireguard/src/raw.rs:91:41
|
91 | let csockaddr: &sockaddr = unsafe { from_raw_slice(buf)? };
| ^^^^^^^^^^^^^^^^^^^
note: inside `raw::test::test_parse_sockaddr_in_1` at netlink-packet-wireguard/src/raw.rs:160:22
--> netlink-packet-wireguard/src/raw.rs:160:22
|
160 | let ipaddr = parse_sockaddr(&SOCKADDR_IN_BYTES_1).unwrap();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: inside closure at netlink-packet-wireguard/src/raw.rs:159:5
--> netlink-packet-wireguard/src/raw.rs:159:5
|
158 | #[test]
| ------- in this procedural macro expansion
159 | / fn test_parse_sockaddr_in_1() {
160 | | let ipaddr = parse_sockaddr(&SOCKADDR_IN_BYTES_1).unwrap();
161 | | assert_eq!(ipaddr, SocketAddrV4::new(Ipv4Addr::LOCALHOST, 7290).into());
162 | | }
| |_____^
```
Second, although in C the netlink packets are encoded en decoded by
simply transmuting slices into struct, we cannot safely to this in
Rust unless the types are _at least_ `#[repr(C)]`. If we want to go
down that path, I think we have two choices:
- using bindgen to wrap the C structs, and use the same strategy than
in C
- defining `#[repr(C)]` structs and use something like `bytemuck` to
convert slices into structs and vice-versa.
The other netlink crates took the third option of going full rust and
manually parsing the packets. For consistency, this commit implements
this solution.
|
I rebased and merged manually, but for some reason Github doesn't automatically mark the PR as merged. Thanks a lot @Leo1003 ! I'll try to make a release this week. |
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This contains a draft Wireguard generic netlink packet support.
There are some issues in the current codes:
Should this be handled by
netlink-packet-utils?struct in_addrstruct in6_addrstruct sockaddr_instruct sockaddr_in6struct timespec