tonarino/innernet
1
1
Fork 0
mirror of https://github.com/tonarino/innernet.git synced 2024-11-10 17:04:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

wgctrl-rs: fix ipv6 endpoint encoding (thanks @mk-fg)

Browse source 
Previously, it remained the `Default::default()` value.
Added test to validate correctness
This commit is contained in:
Jake McGinty 2021-05-11 13:52:06 +09:00
parent 3542c6c9e0
commit 46f2a1e24c
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
wgctrl-rs/src/backends/kernel.rs
View file

@ -223,14 +223,14 @@ fn encode_endpoint(endpoint: Option<SocketAddr>) -> wgctrl_sys::wg_peer__bindgen
},
Some(SocketAddr::V6(s)) => {
let mut peer = wgctrl_sys::wg_peer__bindgen_ty_1::default();
let in6_addr = wgctrl_sys::in6_addr__bindgen_ty_1{__u6_addr8: s.ip().octets()};
peer.addr6 = wgctrl_sys::sockaddr_in6 {
sin6_family: libc::AF_INET6 as u16,
sin6_addr: Default::default(),
sin6_addr: wgctrl_sys::in6_addr{__in6_u: in6_addr},
sin6_port: u16::to_be(s.port()),
sin6_flowinfo: 0,
sin6_scope_id: 0,
};
unsafe { peer.addr6 }.sin6_addr.__in6_u.__u6_addr8 = s.ip().octets();
peer
},
None => wgctrl_sys::wg_peer__bindgen_ty_1::default(),
@ -524,3 +524,19 @@ impl Key {
Self::from_base64(&base64::encode(&bytes))
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_encode_endpoint() -> Result<(), Box<dyn std::error::Error>> {
let endpoint = Some("1.2.3.4:51820".parse()?);
let endpoint6: Option<SocketAddr> = Some("[2001:db8:1::1]:51820".parse()?);
let encoded = encode_endpoint(endpoint);
let encoded6 = encode_endpoint(endpoint6);
assert_eq!(endpoint, parse_endpoint(&encoded));
assert_eq!(endpoint6, parse_endpoint(&encoded6));
Ok(())
}
}