Skip to content

Commit a8b8830

Browse files
Serock3Serock3
committed
Merge branch 'add-daita-cfg-flag-no-feature' of https://github.com/mullvad/mullvadvpn-app into add-daita-cfg-flag-no-feature
2 parents 6a92be2 + 6856cc5 commit a8b8830

File tree

10 files changed

+53
-36
lines changed

10 files changed

+53
-36
lines changed

‎.github/workflows/daemon.yml

+5
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ jobs:
8686
- name: Checkout repository
8787
uses: actions/checkout@v2
8888

89+
- name: Checkout wireguard-go submodule
90+
run: |
91+
git config --global --add safe.directory '*'
92+
git submodule update --init --depth=1wireguard-go-rs/libwg/wireguard-go
93+
8994
- name: Install Protoc
9095
uses: arduino/setup-protoc@v3
9196
with:

‎.github/workflows/rust-supply-chain.yml

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ jobs:
1515
steps:
1616
- name: Checkout repository
1717
uses: actions/checkout@v3
18+
19+
- name: Checkout wireguard-go submodule
20+
run: git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go
1821

1922
- name: Checkout wireguard-go submodule
2023
run: git submodule update --init --depth=1 wireguard-go-rs/libwg/wireguard-go

‎talpid-wireguard/src/wireguard_go/daita.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ impl Session {
3434
ACTIONS_CAPACITY,
3535
)
3636
};
37-
if !res {
37+
38+
if res != 0 {
3839
// TODO: return error
39-
panic!("Failed to activate DAITA on tunnel {tunnel_handle}")
40+
panic!("Failed to activate DAITA on tunnel {tunnel_handle}, error code: {res}");
4041
}
4142
Ok(Self {
4243
_tunnel_handle: tunnel_handle,

‎wireguard-go-rs/build.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ fn main() {
1515
"android" => {
1616
cmd.arg("--android");
1717
}
18-
// TODO: Is is allowed to panic? Won't this always happen if we run `cargo build` in the
19-
// workspace root for e.g. windows?
20-
_ => unimplemented!("building wireguard-go-rs for {target_os} is not implemented."),
18+
"macos" => {}
19+
// building wireguard-go-rs for windows is not implemented
20+
_ => return,
2121
}
2222

2323
let output = cmd.output().expect("build-wireguard-go.sh failed");
@@ -30,22 +30,18 @@ fn main() {
3030
panic!();
3131
}
3232

33-
// declare_libs_dir("../dist-assets/binaries");
34-
declare_libs_dir("../build/lib");
35-
36-
println!("cargo::rustc-link-search={out_dir}");
37-
3833
if target_os == "android" {
3934
// NOTE: Go programs does not support being statically linked on android
4035
// so we need to dynamically link to libwg
41-
println!("cargo::rustc-link-lib=wg")
36+
println!("cargo::rustc-link-lib=wg");
37+
declare_libs_dir("../build/lib");
4238
} else {
4339
// other platforms can statically link to libwg just fine
4440
// TODO: consider doing dynamic linking everywhere, to keep things simpler
4541
println!("cargo::rustc-link-lib=static=wg");
42+
println!("cargo::rustc-link-search={out_dir}");
4643
}
4744

48-
// TODO: check that these are correct
4945
println!("cargo::rerun-if-changed=libwg");
5046
}
5147

‎wireguard-go-rs/libwg/libwg.go

+10-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package main
88

99
// #include <stdio.h>
1010
// #include <stdlib.h>
11-
// #include "libwg.h"
11+
// #include <stdint.h>
1212
import "C"
1313

1414
import (
@@ -22,9 +22,14 @@ import (
2222
"golang.zx2c4.com/wireguard/device"
2323
)
2424

25+
// FFI integer result codes
2526
const (
26-
ERROR_GENERAL_FAILURE = -1
27-
ERROR_INTERMITTENT_FAILURE = -2
27+
OK = C.int32_t(-iota)
28+
ERROR_GENERAL_FAILURE
29+
ERROR_INTERMITTENT_FAILURE
30+
ERROR_UNKNOWN_TUNNEL
31+
ERROR_UNKNOWN_PEER
32+
ERROR_ENABLE_DAITA
2833
)
2934

3035
var tunnels tunnelcontainer.Container
@@ -69,10 +74,10 @@ func wgGetConfig(tunnelHandle int32) *C.char {
6974
}
7075

7176
//export wgSetConfig
72-
func wgSetConfig(tunnelHandle int32, cSettings *C.char) int32 {
77+
func wgSetConfig(tunnelHandle int32, cSettings *C.char) C.int32_t {
7378
tunnel, err := tunnels.Get(tunnelHandle)
7479
if err != nil {
75-
return ERROR_GENERAL_FAILURE
80+
return ERROR_UNKNOWN_TUNNEL
7681
}
7782
if cSettings == nil {
7883
tunnel.Logger.Errorf("cSettings is null\n")

‎wireguard-go-rs/libwg/libwg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <stdbool.h>
33

44
/// Activate DAITA for the specified tunnel.
5-
bool wgActivateDaita(int32_t tunnelHandle, uint8_t* noisePublic, char* machines, uint32_t eventsCapacity, uint32_t actionsCapacity);
5+
int32_t wgActivateDaita(int32_t tunnelHandle, uint8_t* noisePublic, char* machines, uint32_t eventsCapacity, uint32_t actionsCapacity);
66
char* wgGetConfig(int32_t tunnelHandle);
77
int32_t wgSetConfig(int32_t tunnelHandle, char* cSettings);
88
void wgFreePtr(void*);

‎wireguard-go-rs/libwg/libwg_android.go

+11-9
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66

77
package main
88

9+
// #include <stdint.h>
10+
import "C"
11+
912
import (
10-
"C"
1113
"bufio"
1214
"strings"
1315
"unsafe"
@@ -28,7 +30,7 @@ type LogSink = unsafe.Pointer
2830
type LogContext = unsafe.Pointer
2931

3032
//export wgTurnOn
31-
func wgTurnOn(cSettings *C.char, fd int, logSink LogSink, logContext LogContext) int32 {
33+
func wgTurnOn(cSettings *C.char, fd int, logSink LogSink, logContext LogContext) C.int32_t {
3234
logger := logging.NewLogger(logSink, logContext)
3335

3436
if cSettings == nil {
@@ -71,33 +73,33 @@ func wgTurnOn(cSettings *C.char, fd int, logSink LogSink, logContext LogContext)
7173
return ERROR_GENERAL_FAILURE
7274
}
7375

74-
return handle
76+
return C.int32_t(handle)
7577
}
7678

7779
//export wgGetSocketV4
78-
func wgGetSocketV4(tunnelHandle int32) int32 {
80+
func wgGetSocketV4(tunnelHandle int32) C.int32_t {
7981
tunnel, err := tunnels.Get(tunnelHandle)
8082
if err != nil {
81-
return ERROR_GENERAL_FAILURE
83+
return ERROR_UNKNOWN_TUNNEL
8284
}
8385
peek := tunnel.Device.Bind().(conn.PeekLookAtSocketFd)
8486
fd, err := peek.PeekLookAtSocketFd4()
8587
if err != nil {
8688
return ERROR_GENERAL_FAILURE
8789
}
88-
return int32(fd)
90+
return C.int32_t(fd)
8991
}
9092

9193
//export wgGetSocketV6
92-
func wgGetSocketV6(tunnelHandle int32) int32 {
94+
func wgGetSocketV6(tunnelHandle int32) C.int32_t {
9395
tunnel, err := tunnels.Get(tunnelHandle)
9496
if err != nil {
95-
return ERROR_GENERAL_FAILURE
97+
return ERROR_UNKNOWN_TUNNEL
9698
}
9799
peek := tunnel.Device.Bind().(conn.PeekLookAtSocketFd)
98100
fd, err := peek.PeekLookAtSocketFd6()
99101
if err != nil {
100102
return ERROR_GENERAL_FAILURE
101103
}
102-
return int32(fd)
104+
return C.int32_t(fd)
103105
}

‎wireguard-go-rs/libwg/libwg_daita.go

+10-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package main
55

66
// #include <stdio.h>
77
// #include <stdlib.h>
8-
// #include "libwg.h"
8+
// #include <stdint.h>
99
import "C"
1010

1111
import (
@@ -15,10 +15,10 @@ import (
1515
)
1616

1717
//export wgActivateDaita
18-
func wgActivateDaita(tunnelHandle int32, noisePublic *C.uint8_t, machines *C.char, eventsCapacity uint32, actionsCapacity uint32) C.bool {
19-
tunnel, err := tunnels.Get(tunnelHandle)
18+
func wgActivateDaita(tunnelHandle C.int32_t, noisePublic *C.uint8_t, machines *C.char, eventsCapacity C.uint32_t, actionsCapacity C.uint32_t) C.int32_t {
19+
tunnel, err := tunnels.Get(int32(tunnelHandle))
2020
if err != nil {
21-
return false
21+
return ERROR_UNKNOWN_TUNNEL
2222
}
2323

2424
tunnel.Logger.Verbosef("Initializing libmaybenot")
@@ -27,8 +27,12 @@ func wgActivateDaita(tunnelHandle int32, noisePublic *C.uint8_t, machines *C.cha
2727
peer := tunnel.Device.LookupPeer(publicKey)
2828

2929
if peer == nil {
30-
return false
30+
return ERROR_UNKNOWN_PEER
3131
}
3232

33-
return (C.bool)(peer.EnableDaita(C.GoString((*C.char)(machines)), uint(eventsCapacity), uint(actionsCapacity)))
33+
if !peer.EnableDaita(C.GoString((*C.char)(machines)), uint(eventsCapacity), uint(actionsCapacity)) {
34+
return ERROR_ENABLE_DAITA
35+
}
36+
37+
return OK
3438
}

‎wireguard-go-rs/libwg/libwg_default.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
package main
1212

1313
// #include <stdlib.h>
14+
// #include <stdint.h>
1415
import "C"
1516
import (
1617
"bufio"
@@ -32,7 +33,7 @@ type LogSink = unsafe.Pointer
3233
type LogContext = unsafe.Pointer
3334

3435
//export wgTurnOn
35-
func wgTurnOn(mtu int, cSettings *C.char, fd int, logSink LogSink, logContext LogContext) int32 {
36+
func wgTurnOn(mtu int, cSettings *C.char, fd int, logSink LogSink, logContext LogContext) C.int32_t {
3637
logger := logging.NewLogger(logSink, logContext)
3738

3839
if cSettings == nil {
@@ -74,5 +75,5 @@ func wgTurnOn(mtu int, cSettings *C.char, fd int, logSink LogSink, logContext Lo
7475
return ERROR_GENERAL_FAILURE
7576
}
7677

77-
return handle
78+
return C.int32_t(handle)
7879
}

‎wireguard-go-rs/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extern "C" {
5959
machines: *const c_char,
6060
events_capacity: u32,
6161
actions_capacity: u32,
62-
) -> bool;
62+
) -> i32;
6363

6464
// Frees a pointer allocated by the go runtime - useful to free return value of wgGetConfig
6565
pub fn wgFreePtr(ptr: *mut c_void);

0 commit comments

Comments
 (0)