From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Tue, 26 Oct 2021 12:51:44 +0000 (+0200)
Subject: wintun: align 64-bit argument on ARM32
X-Git-Tag: 0.0.20220117~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e42c6c4bc2d0d1e6b4f247b98cf4ead8a1b08a2e;p=thirdparty%2Fwireguard-go.git

wintun: align 64-bit argument on ARM32

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/tun/wintun/wintun_windows.go b/tun/wintun/wintun_windows.go
index b3aa6e9..2fe26a7 100644
--- a/tun/wintun/wintun_windows.go
+++ b/tun/wintun/wintun_windows.go
@@ -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)
 	}