version: hard code name and version at compile time

We really do want the true name and version in logs so that external
consumers have a good reference point for helping us debug.

We can then do the log file directory explicitly.

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

6 files changed, 8 insertions, 157 deletions

diff --git a/version/debugging_linux.go b/version/debugging_linux.go
index 7c9c09c5..ddea4242 100644
--- a/version/debugging_linux.go
+++ b/version/debugging_linux.go
@@ -30,10 +30,6 @@ func OsName() string {
 	return fmt.Sprintf("%s %s %s", utsToStr(utsname.Sysname), utsToStr(utsname.Release), utsToStr(utsname.Version))
 }
 
-func RunningNameVersion() (string, string) {
-	return "WireGuard", "0.0.0.0"
-}
-
 func VerifyAuthenticode(path string) bool {
 	return true
 }
diff --git a/version/mksyscall.go b/version/mksyscall.go
deleted file mode 100644
index 3c993928..00000000
--- a/version/mksyscall.go
+++ /dev/null
@@ -1,8 +0,0 @@
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
- */
-
-package version
-
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go os_windows.go version_windows.go
diff --git a/version/useragent.go b/version/useragent.go
index 52fb5c83..1c1adf55 100644
--- a/version/useragent.go
+++ b/version/useragent.go
@@ -10,7 +10,11 @@ import (
 	"runtime"
 )
 
+// #include "version.h"
+import "C"
+
+const Number = C.WIREGUARD_WINDOWS_VERSION_STRING
+
 func UserAgent() string {
-	name, ver := RunningNameVersion()
-	return fmt.Sprintf("%s/%s (%s; %s)", name, ver, OsName(), runtime.GOARCH)
+	return fmt.Sprintf("WireGuard/%s (%s; %s)", Number, OsName(), runtime.GOARCH)
 }
diff --git a/version/version.h b/version/version.h
new file mode 100644
index 00000000..61ce5495
--- /dev/null
+++ b/version/version.h
@@ -0,0 +1,2 @@
+#define WIREGUARD_WINDOWS_VERSION_ARRAY 0,0,23
+#define WIREGUARD_WINDOWS_VERSION_STRING "0.0.23"
diff --git a/version/version_windows.go b/version/version_windows.go
deleted file mode 100644
index b583d160..00000000
--- a/version/version_windows.go
+++ /dev/null
@@ -1,61 +0,0 @@
-/* SPDX-License-Identifier: MIT
- *
- * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
- */
-
-package version
-
-import (
-	"os"
-	"runtime"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-//sys	GetFileVersionInfoSize(filename *uint16, zero *uint32) (size uint32, err error) = version.GetFileVersionInfoSizeW
-//sys	GetFileVersionInfo(filename *uint16, zero uint32, size uint32, block *byte) (err error) = version.GetFileVersionInfoW
-//sys	VerQueryValue(block *byte, section *uint16, value **byte, size *uint32) (err error) = version.VerQueryValueW
-
-var cachedVersion, cachedName string
-
-func RunningNameVersion() (name, version string) {
-	if len(cachedVersion) != 0 || len(cachedName) != 0 {
-		return cachedName, cachedVersion
-	}
-	self, err := os.Executable()
-	if err != nil {
-		panic(err)
-	}
-	self16, err := windows.UTF16PtrFromString(self)
-	if err != nil {
-		panic(err)
-	}
-	var zero uint32
-	size, err := GetFileVersionInfoSize(self16, &zero)
-	if err != nil {
-		panic(err)
-	}
-	buffer := make([]byte, size)
-	err = GetFileVersionInfo(self16, zero, size, &buffer[0])
-	if err != nil {
-		panic(err)
-	}
-
-	var val16 *uint16
-	err = VerQueryValue(&buffer[0], windows.StringToUTF16Ptr(`\StringFileInfo\040904b0\ProductName`), (**byte)(unsafe.Pointer(&val16)), &size)
-	if err != nil {
-		panic(err)
-	}
-	name = windows.UTF16ToString((*[(1 << 30) - 1]uint16)(unsafe.Pointer(val16))[:size])
-	err = VerQueryValue(&buffer[0], windows.StringToUTF16Ptr(`\StringFileInfo\040904b0\ProductVersion`), (**byte)(unsafe.Pointer(&val16)), &size)
-	if err != nil {
-		panic(err)
-	}
-	version = windows.UTF16ToString((*[(1 << 30) - 1]uint16)(unsafe.Pointer(val16))[:size])
-	runtime.KeepAlive(buffer)
-
-	cachedName = name
-	cachedVersion = version
-	return
-}
diff --git a/version/zsyscall_windows.go b/version/zsyscall_windows.go
deleted file mode 100644
index 21684bb3..00000000
--- a/version/zsyscall_windows.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Code generated by 'go generate'; DO NOT EDIT.
-
-package version
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var _ unsafe.Pointer
-
-// Do the interface allocations only once for common
-// Errno values.
-const (
-	errnoERROR_IO_PENDING = 997
-)
-
-var (
-	errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING)
-)
-
-// errnoErr returns common boxed Errno values, to prevent
-// allocations at runtime.
-func errnoErr(e syscall.Errno) error {
-	switch e {
-	case 0:
-		return nil
-	case errnoERROR_IO_PENDING:
-		return errERROR_IO_PENDING
-	}
-	// TODO: add more here, after collecting data on the common
-	// error values see on Windows. (perhaps when running
-	// all.bat?)
-	return e
-}
-
-var (
-	modversion = windows.NewLazySystemDLL("version.dll")
-
-	procGetFileVersionInfoSizeW = modversion.NewProc("GetFileVersionInfoSizeW")
-	procGetFileVersionInfoW     = modversion.NewProc("GetFileVersionInfoW")
-	procVerQueryValueW          = modversion.NewProc("VerQueryValueW")
-)
-
-func GetFileVersionInfoSize(filename *uint16, zero *uint32) (size uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetFileVersionInfoSizeW.Addr(), 2, uintptr(unsafe.Pointer(filename)), uintptr(unsafe.Pointer(zero)), 0)
-	size = uint32(r0)
-	if size == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func GetFileVersionInfo(filename *uint16, zero uint32, size uint32, block *byte) (err error) {
-	r1, _, e1 := syscall.Syscall6(procGetFileVersionInfoW.Addr(), 4, uintptr(unsafe.Pointer(filename)), uintptr(zero), uintptr(size), uintptr(unsafe.Pointer(block)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
-
-func VerQueryValue(block *byte, section *uint16, value **byte, size *uint32) (err error) {
-	r1, _, e1 := syscall.Syscall6(procVerQueryValueW.Addr(), 4, uintptr(unsafe.Pointer(block)), uintptr(unsafe.Pointer(section)), uintptr(unsafe.Pointer(value)), uintptr(unsafe.Pointer(size)), 0, 0)
-	if r1 == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}