diff options
Diffstat (limited to 'main_windows.go')
-rw-r--r-- | main_windows.go | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/main_windows.go b/main_windows.go index f57bc8d..a4dc46f 100644 --- a/main_windows.go +++ b/main_windows.go @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT * - * Copyright (C) 2017-2019 WireGuard LLC. All Rights Reserved. + * Copyright (C) 2017-2023 WireGuard LLC. All Rights Reserved. */ package main @@ -9,8 +9,10 @@ import ( "fmt" "os" "os/signal" - "syscall" + "golang.org/x/sys/windows" + + "golang.zx2c4.com/wireguard/conn" "golang.zx2c4.com/wireguard/device" "golang.zx2c4.com/wireguard/ipc" @@ -31,11 +33,10 @@ func main() { fmt.Fprintln(os.Stderr, "Warning: this is a test program for Windows, mainly used for debugging this Go package. For a real WireGuard for Windows client, the repo you want is <https://git.zx2c4.com/wireguard-windows/>, which includes this code as a module.") logger := device.NewLogger( - device.LogLevelDebug, + device.LogLevelVerbose, fmt.Sprintf("(%s) ", interfaceName), ) - logger.Info.Println("Starting wireguard-go version", device.WireGuardGoVersion) - logger.Debug.Println("Debug log enabled") + logger.Verbosef("Starting wireguard-go version %s", Version) tun, err := tun.CreateTUN(interfaceName, 0) if err == nil { @@ -44,17 +45,21 @@ func main() { interfaceName = realInterfaceName } } else { - logger.Error.Println("Failed to create TUN device:", err) + logger.Errorf("Failed to create TUN device: %v", err) os.Exit(ExitSetupFailed) } - device := device.NewDevice(tun, logger) - device.Up() - logger.Info.Println("Device started") + device := device.NewDevice(tun, conn.NewDefaultBind(), logger) + err = device.Up() + if err != nil { + logger.Errorf("Failed to bring up device: %v", err) + os.Exit(ExitSetupFailed) + } + logger.Verbosef("Device started") uapi, err := ipc.UAPIListen(interfaceName) if err != nil { - logger.Error.Println("Failed to listen on uapi socket:", err) + logger.Errorf("Failed to listen on uapi socket: %v", err) os.Exit(ExitSetupFailed) } @@ -71,13 +76,13 @@ func main() { go device.IpcHandle(conn) } }() - logger.Info.Println("UAPI listener started") + logger.Verbosef("UAPI listener started") // wait for program to terminate signal.Notify(term, os.Interrupt) signal.Notify(term, os.Kill) - signal.Notify(term, syscall.SIGTERM) + signal.Notify(term, windows.SIGTERM) select { case <-term: @@ -90,5 +95,5 @@ func main() { uapi.Close() device.Close() - logger.Info.Println("Shutting down") + logger.Verbosef("Shutting down") } |