diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-06-28 15:23:22 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-06-28 15:23:22 +0100 |
| commit | 8f6c45227f4d9af8bf2dd9a39a7adb86d4fa8be6 (patch) | |
| tree | 72b311bd80a07d7cc64e6e63f46ea65359c7e582 | |
| parent | c24192e8246424203075af00bfb523e79c572080 (diff) | |
| parent | c65d986b4ecb646775ecf233cedd5ee163f458b0 (diff) | |
| download | mullvadvpn-8f6c45227f4d9af8bf2dd9a39a7adb86d4fa8be6.tar.xz mullvadvpn-8f6c45227f4d9af8bf2dd9a39a7adb86d4fa8be6.zip | |
Merge branch 'bump-wireguard-go'
| m--------- | dist-assets/binaries | 0 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/wireguard_go.rs | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/dist-assets/binaries b/dist-assets/binaries -Subproject c79a133c850e05f588000e5e45f6909607b4176 +Subproject 6ddc1ac39fc79c487e0bd7858b2455f454545f1 diff --git a/talpid-core/src/tunnel/wireguard/wireguard_go.rs b/talpid-core/src/tunnel/wireguard/wireguard_go.rs index ee5a6f1226..dfb015d8fa 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_go.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_go.rs @@ -136,6 +136,7 @@ extern "C" { // // Positive return values are tunnel handles for this specific wireguard tunnel instance. // Negative return values signify errors. All error codes are opaque. + #[cfg_attr(target_os = "android", link_name = "wgTurnOnWithFdAndroid")] fn wgTurnOnWithFd( iface_name: *const i8, mtu: i64, |