public-mirrors
/
innernet
mirror of https://github.com/tonarino/innernet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from aeber/fix_macos_ipv6 

Fix macos ip/route setup for ipv6 nets
pull/31/head
Jake McGinty 2021-04-02 16:44:40 +09:00 committed by GitHub
parent 03576a5892 c3ae74bd34
commit d2bc2b3506
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
shared/src/wg.rs
View File

@ -24,16 +24,24 @@ fn cmd(bin: &str, args: &[&str]) -> Result<process::Output, Error> {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
pub fn set_addr(interface: &str, addr: IpNetwork) -> Result<(), Error> { pub fn set_addr(interface: &str, addr: IpNetwork) -> Result<(), Error> {
let real_interface = wgctrl::backends::userspace::resolve_tun(interface).with_str(interface)?; let real_interface = wgctrl::backends::userspace::resolve_tun(interface).with_str(interface)?;
cmd(
"ifconfig", if addr.is_ipv4() {
&[ cmd(
&real_interface, "ifconfig",
"inet", &[
&addr.to_string(), &real_interface,
&addr.ip().to_string(), "inet",
"alias", &addr.to_string(),
], &addr.ip().to_string(),
)?; "alias",
],
)?;
} else {
cmd(
"ifconfig",
&[&real_interface, "inet6", &addr.to_string(), "alias"],
)?;
}
cmd("ifconfig", &[&real_interface, "mtu", "1420"])?; cmd("ifconfig", &[&real_interface, "mtu", "1420"])?;
Ok(()) Ok(())
} }
@ -113,7 +121,7 @@ pub fn add_route(interface: &str, cidr: IpNetwork) -> Result<bool, Error> {
&[ &[
"-n", "-n",
"add", "add",
"-inet", if cidr.is_ipv4() { "-inet" } else { "-inet6" },
&cidr.to_string(), &cidr.to_string(),
"-interface", "-interface",
&real_interface, &real_interface,