]> git.ipfire.org Git - thirdparty/wireguard-go.git/commitdiff
wintun: align 64-bit argument on ARM32
authorJason A. Donenfeld <Jason@zx2c4.com>
Tue, 26 Oct 2021 12:51:44 +0000 (14:51 +0200)
committerJason A. Donenfeld <Jason@zx2c4.com>
Tue, 26 Oct 2021 12:53:40 +0000 (14:53 +0200)
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
tun/wintun/wintun_windows.go

index b3aa6e9196fa0a37d7daaa84dc13ce2e6bc4ba8f..2fe26a7e73f23154c9dedbb53d456e79bc038225 100644 (file)
@@ -53,10 +53,14 @@ func logMessage(level loggerLevel, timestamp uint64, msg *uint16) int {
 
 func setupLogger(dll *lazyDLL) {
        var callback uintptr
-       if runtime.GOARCH == "386" || runtime.GOARCH == "arm" {
+       if runtime.GOARCH == "386" {
                callback = windows.NewCallback(func(level loggerLevel, timestampLow, timestampHigh uint32, msg *uint16) int {
                        return logMessage(level, uint64(timestampHigh)<<32|uint64(timestampLow), msg)
                })
+       } else if runtime.GOARCH == "arm" {
+               callback = windows.NewCallback(func(level loggerLevel, _, timestampLow, timestampHigh uint32, msg *uint16) int {
+                       return logMessage(level, uint64(timestampHigh)<<32|uint64(timestampLow), msg)
+               })
        } else if runtime.GOARCH == "amd64" || runtime.GOARCH == "arm64" {
                callback = windows.NewCallback(logMessage)
        }