From 4847578777fd331c1ad066a2923fe410e5f82e83 Mon Sep 17 00:00:00 2001 From: albexk Date: Wed, 3 Apr 2024 18:45:26 +0300 Subject: [PATCH] Minor naming changes --- README.md | 6 +++--- main.go | 22 +++++++++++----------- main_windows.go | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index ab6f62bec..853d318e5 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ To run amneziawg-go without forking to the background, pass `-f` or `--foregroun ``` $ amneziawg-go -f wg0 ``` -When an interface is running, you may use [`amnezia-wg-tools `](https://github.com/amnezia-vpn/amneziawg-go-tools) to configure it, as well as the usual `ip(8)` and `ifconfig(8)` commands. +When an interface is running, you may use [`amneziawg-tools `](https://github.com/amnezia-vpn/amneziawg-tools) to configure it, as well as the usual `ip(8)` and `ifconfig(8)` commands. To run with more logging you may set the environment variable `LOG_LEVEL=debug`. @@ -34,11 +34,11 @@ This will run on Linux; you should run amnezia-wg instead of using default linux ### macOS This runs on macOS using the utun driver. It does not yet support sticky sockets, and won't support fwmarks because of Darwin limitations. Since the utun driver cannot have arbitrary interface names, you must either use `utun[0-9]+` for an explicit interface name or `utun` to have the kernel select one for you. If you choose `utun` as the interface name, and the environment variable `WG_TUN_NAME_FILE` is defined, then the actual name of the interface chosen by the kernel is written to the file specified by that variable. -This runs on MacOS, you should use it from [awg-apple](https://github.com/amnezia-vpn/awg-apple) +This runs on MacOS, you should use it from [amneziawg-apple](https://github.com/amnezia-vpn/amneziawg-apple) ### Windows -This runs on Windows, you should use it from [awg-windows](https://github.com/amnezia-vpn/awg-windows), which uses this as a module. +This runs on Windows, you should use it from [amneziawg-windows](https://github.com/amnezia-vpn/amneziawg-windows), which uses this as a module. ## Building diff --git a/main.go b/main.go index 775372c90..c17c4053f 100644 --- a/main.go +++ b/main.go @@ -46,20 +46,20 @@ func warning() { return } - fmt.Fprintln(os.Stderr, "┌──────────────────────────────────────────────────────┐") - fmt.Fprintln(os.Stderr, "│ │") - fmt.Fprintln(os.Stderr, "│ Running wireguard-go is not required because this │") - fmt.Fprintln(os.Stderr, "│ kernel has first class support for WireGuard. For │") - fmt.Fprintln(os.Stderr, "│ information on installing the kernel module, │") - fmt.Fprintln(os.Stderr, "│ please visit: │") - fmt.Fprintln(os.Stderr, "│ https://www.wireguard.com/install/ │") - fmt.Fprintln(os.Stderr, "│ │") - fmt.Fprintln(os.Stderr, "└──────────────────────────────────────────────────────┘") + fmt.Fprintln(os.Stderr, "┌──────────────────────────────────────────────────────────────┐") + fmt.Fprintln(os.Stderr, "│ │") + fmt.Fprintln(os.Stderr, "│ Running amneziawg-go is not required because this │") + fmt.Fprintln(os.Stderr, "│ kernel has first class support for AmneziaWG. For │") + fmt.Fprintln(os.Stderr, "│ information on installing the kernel module, │") + fmt.Fprintln(os.Stderr, "│ please visit: │") + fmt.Fprintln(os.Stderr, "| https://github.com/amnezia-vpn/amneziawg-linux-kernel-module │") + fmt.Fprintln(os.Stderr, "│ │") + fmt.Fprintln(os.Stderr, "└──────────────────────────────────────────────────────────────┘") } func main() { if len(os.Args) == 2 && os.Args[1] == "--version" { - fmt.Printf("wireguard-go v%s\n\nUserspace WireGuard daemon for %s-%s.\nInformation available at https://www.wireguard.com.\nCopyright (C) Jason A. Donenfeld .\n", Version, runtime.GOOS, runtime.GOARCH) + fmt.Printf("amneziawg-go v%s\n\nUserspace AmneziaWG daemon for %s-%s.\nInformation available at https://amnezia.org\n", Version, runtime.GOOS, runtime.GOARCH) return } @@ -145,7 +145,7 @@ func main() { fmt.Sprintf("(%s) ", interfaceName), ) - logger.Verbosef("Starting wireguard-go version %s", Version) + logger.Verbosef("Starting amneziawg-go version %s", Version) if err != nil { logger.Errorf("Failed to create TUN device: %v", err) diff --git a/main_windows.go b/main_windows.go index 807f6e2bb..bbfa6905c 100644 --- a/main_windows.go +++ b/main_windows.go @@ -30,13 +30,13 @@ func main() { } interfaceName := os.Args[1] - 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 , which includes this code as a module.") + fmt.Fprintln(os.Stderr, "Warning: this is a test program for Windows, mainly used for debugging this Go package. For a real AmneziaWG for Windows client, please visit: https://amnezia.org") logger := device.NewLogger( device.LogLevelVerbose, fmt.Sprintf("(%s) ", interfaceName), ) - logger.Verbosef("Starting wireguard-go version %s", Version) + logger.Verbosef("Starting amneziawg-go version %s", Version) tun, err := tun.CreateTUN(interfaceName, 0) if err == nil {