summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-25 10:34:30 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-25 10:34:30 -0300
commitaf16e9e84cb8756c31d60fbea7d760926e7f38f2 (patch)
treee012b711bde8d0f8ccb9e86c4c5e7467824939b5
parent65c7fba0e1c87bceebf72835b445f9effcc6d2da (diff)
parent2101deef0ce4910a2f508b4158e9603d378a9a9d (diff)
downloadmullvadvpn-af16e9e84cb8756c31d60fbea7d760926e7f38f2.tar.xz
mullvadvpn-af16e9e84cb8756c31d60fbea7d760926e7f38f2.zip
Merge branch 'fix-crash-on-32bit-platforms'
-rw-r--r--talpid-core/src/tunnel/wireguard/wireguard_go.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/talpid-core/src/tunnel/wireguard/wireguard_go.rs b/talpid-core/src/tunnel/wireguard/wireguard_go.rs
index dfb015d8fa..f2349ef0cb 100644
--- a/talpid-core/src/tunnel/wireguard/wireguard_go.rs
+++ b/talpid-core/src/tunnel/wireguard/wireguard_go.rs
@@ -36,7 +36,7 @@ impl WgGoTunnel {
let handle = unsafe {
wgTurnOnWithFd(
iface_name.as_ptr() as *const i8,
- config.mtu as i64,
+ config.mtu as isize,
wg_config_str.as_ptr() as *const i8,
tunnel_device.as_raw_fd(),
log_file.as_raw_fd(),
@@ -139,7 +139,7 @@ extern "C" {
#[cfg_attr(target_os = "android", link_name = "wgTurnOnWithFdAndroid")]
fn wgTurnOnWithFd(
iface_name: *const i8,
- mtu: i64,
+ mtu: isize,
settings: *const i8,
fd: Fd,
log_fd: Fd,