From f6095cdfebf6c59362bce8b79525640f50843575 Mon Sep 17 00:00:00 2001 From: Mark Puha Date: Mon, 24 Feb 2025 06:42:57 +0100 Subject: [PATCH] update modules --- .gitignore | 2 +- Dockerfile | 8 ++++---- Makefile | 10 +++++----- README.md | 23 +++++++++-------------- conn/bind_windows.go | 2 +- conn/bindtest/bindtest.go | 2 +- device/bind_test.go | 2 +- device/device.go | 12 ++++++------ device/device_test.go | 8 ++++---- device/junk_creator_test.go | 4 ++-- device/keypair.go | 2 +- device/noise-protocol.go | 2 +- device/noise_test.go | 4 ++-- device/peer.go | 2 +- device/queueconstants_android.go | 2 +- device/queueconstants_default.go | 2 +- device/receive.go | 2 +- device/send.go | 4 ++-- device/sticky_default.go | 4 ++-- device/sticky_linux.go | 4 ++-- device/tun.go | 2 +- device/uapi.go | 4 ++-- go.sum | 12 ++++++++---- ipc/namedpipe/namedpipe_test.go | 2 +- ipc/uapi_linux.go | 2 +- ipc/uapi_unix.go | 2 +- ipc/uapi_windows.go | 4 ++-- main.go | 16 ++++++++-------- main_windows.go | 12 ++++++------ tun/netstack/examples/http_client.go | 6 +++--- tun/netstack/examples/http_server.go | 6 +++--- tun/netstack/examples/ping_client.go | 6 +++--- tun/netstack/tun.go | 2 +- tun/offload_linux.go | 2 +- tun/offload_linux_test.go | 2 +- tun/tun_linux.go | 4 ++-- tun/tuntest/tuntest.go | 2 +- version.go | 2 +- 38 files changed, 94 insertions(+), 95 deletions(-) diff --git a/.gitignore b/.gitignore index c6bbd9cbc..cb8b7caa1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -amneziawg-go \ No newline at end of file +euphoria diff --git a/Dockerfile b/Dockerfile index e51d8fc87..de4696e25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM golang:1.24 as awg +FROM golang:1.24 as euphoria RUN apt-get update && apt install libluajit-5.1-dev -y -COPY . /awg -WORKDIR /awg +COPY . /euphoria +WORKDIR /euphoria RUN go mod download && go mod verify @@ -17,4 +17,4 @@ RUN apk --no-cache add iproute2 iptables bash && \ chmod +x /usr/bin/awg /usr/bin/awg-quick && \ ln -s /usr/bin/awg /usr/bin/wg && \ ln -s /usr/bin/awg-quick /usr/bin/wg-quick -COPY --from=awg /usr/bin/amneziawg-go /usr/bin/amneziawg-go +COPY --from=euphoria /usr/bin/euphoria /usr/bin/euphoria diff --git a/Makefile b/Makefile index 091ac4d06..664af718b 100644 --- a/Makefile +++ b/Makefile @@ -14,18 +14,18 @@ generate-version-and-build: [ "$$(cat version.go 2>/dev/null)" != "$$ver" ] && \ echo "$$ver" > version.go && \ git update-index --assume-unchanged version.go || true - @$(MAKE) amneziawg-go + @$(MAKE) euphoria -amneziawg-go: $(wildcard *.go) $(wildcard */*.go) +euphoria: $(wildcard *.go) $(wildcard */*.go) go build -tags luajit -ldflags="-w -s" -trimpath -v -o "$@" -install: amneziawg-go - @install -v -d "$(DESTDIR)$(BINDIR)" && install -v -m 0755 "$<" "$(DESTDIR)$(BINDIR)/amneziawg-go" +install: euphoria + @install -v -d "$(DESTDIR)$(BINDIR)" && install -v -m 0755 "$<" "$(DESTDIR)$(BINDIR)/euphoria" test: go test ./... clean: - rm -f amneziawg-go + rm -f euphoria .PHONY: all clean test install generate-version-and-build diff --git a/README.md b/README.md index 853d318e5..fb35bbdd0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Go Implementation of AmneziaWG +# Go Implementation of Euphoria AmneziaWG is a contemporary version of the WireGuard protocol. It's a fork of WireGuard-Go and offers protection against detection by Deep Packet Inspection (DPI) systems. At the same time, it retains the simplified architecture and high performance of the original. @@ -11,17 +11,17 @@ As a result, AmneziaWG maintains high performance while adding an extra layer of Simply run: ``` -$ amneziawg-go wg0 +$ euphoria wg0 ``` -This will create an interface and fork into the background. To remove the interface, use the usual `ip link del wg0`, or if your system does not support removing interfaces directly, you may instead remove the control socket via `rm -f /var/run/amneziawg/wg0.sock`, which will result in amneziawg-go shutting down. +This will create an interface and fork into the background. To remove the interface, use the usual `ip link del wg0`, or if your system does not support removing interfaces directly, you may instead remove the control socket via `rm -f /var/run/euphoria/wg0.sock`, which will result in euphoria shutting down. -To run amneziawg-go without forking to the background, pass `-f` or `--foreground`: +To run euphoria without forking to the background, pass `-f` or `--foreground`: ``` -$ amneziawg-go -f wg0 +$ euphoria -f wg0 ``` -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. +When an interface is running, you may use [`euphoria-tools`](https://github.com/amnezia-vpn/euphoria-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`. @@ -31,14 +31,9 @@ To run with more logging you may set the environment variable `LOG_LEVEL=debug`. This will run on Linux; you should run amnezia-wg instead of using default linux kernel module. -### 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 [amneziawg-apple](https://github.com/amnezia-vpn/amneziawg-apple) - ### Windows -This runs on Windows, you should use it from [amneziawg-windows](https://github.com/amnezia-vpn/amneziawg-windows), which uses this as a module. +This runs on Windows, you should use it from [euphoria-windows](https://github.com/amnezia-vpn/euphoria-windows), which uses this as a module. ## Building @@ -46,7 +41,7 @@ This runs on Windows, you should use it from [amneziawg-windows](https://github. This requires an installation of the latest version of [Go](https://go.dev/). ``` -$ git clone https://github.com/amnezia-vpn/amneziawg-go -$ cd amneziawg-go +$ git clone https://github.com/amnezia-vpn/euphoria +$ cd euphoria $ make ``` diff --git a/conn/bind_windows.go b/conn/bind_windows.go index 6cfa09968..6d111ebe6 100644 --- a/conn/bind_windows.go +++ b/conn/bind_windows.go @@ -17,7 +17,7 @@ import ( "golang.org/x/sys/windows" - "github.com/amnezia-vpn/amneziawg-go/conn/winrio" + "github.com/amnezia-vpn/euphoria/conn/winrio" ) const ( diff --git a/conn/bindtest/bindtest.go b/conn/bindtest/bindtest.go index 42b0bb704..d648605e4 100644 --- a/conn/bindtest/bindtest.go +++ b/conn/bindtest/bindtest.go @@ -12,7 +12,7 @@ import ( "net/netip" "os" - "github.com/amnezia-vpn/amneziawg-go/conn" + "github.com/amnezia-vpn/euphoria/conn" ) type ChannelBind struct { diff --git a/device/bind_test.go b/device/bind_test.go index 34d1c4ade..842032679 100644 --- a/device/bind_test.go +++ b/device/bind_test.go @@ -8,7 +8,7 @@ package device import ( "errors" - "github.com/amnezia-vpn/amneziawg-go/conn" + "github.com/amnezia-vpn/euphoria/conn" ) type DummyDatagram struct { diff --git a/device/device.go b/device/device.go index 1e28e8fe3..263248855 100644 --- a/device/device.go +++ b/device/device.go @@ -11,12 +11,12 @@ import ( "sync/atomic" "time" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/device/internal/adapter" - "github.com/amnezia-vpn/amneziawg-go/ipc" - "github.com/amnezia-vpn/amneziawg-go/ratelimiter" - "github.com/amnezia-vpn/amneziawg-go/rwcancel" - "github.com/amnezia-vpn/amneziawg-go/tun" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/device/internal/adapter" + "github.com/amnezia-vpn/euphoria/ipc" + "github.com/amnezia-vpn/euphoria/ratelimiter" + "github.com/amnezia-vpn/euphoria/rwcancel" + "github.com/amnezia-vpn/euphoria/tun" "github.com/tevino/abool/v2" ) diff --git a/device/device_test.go b/device/device_test.go index 0f42c46f9..f06d7b134 100644 --- a/device/device_test.go +++ b/device/device_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/conn/bindtest" - "github.com/amnezia-vpn/amneziawg-go/tun" - "github.com/amnezia-vpn/amneziawg-go/tun/tuntest" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/conn/bindtest" + "github.com/amnezia-vpn/euphoria/tun" + "github.com/amnezia-vpn/euphoria/tun/tuntest" ) // uapiCfg returns a string that contains cfg formatted use with IpcSet. diff --git a/device/junk_creator_test.go b/device/junk_creator_test.go index 96fa6d3fa..447c1cf35 100644 --- a/device/junk_creator_test.go +++ b/device/junk_creator_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/amnezia-vpn/amneziawg-go/conn/bindtest" - "github.com/amnezia-vpn/amneziawg-go/tun/tuntest" + "github.com/amnezia-vpn/euphoria/conn/bindtest" + "github.com/amnezia-vpn/euphoria/tun/tuntest" ) func setUpJunkCreator(t *testing.T) (junkCreator, error) { diff --git a/device/keypair.go b/device/keypair.go index cc2941a1f..9b591a7dc 100644 --- a/device/keypair.go +++ b/device/keypair.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/amnezia-vpn/amneziawg-go/replay" + "github.com/amnezia-vpn/euphoria/replay" ) /* Due to limitations in Go and /x/crypto there is currently diff --git a/device/noise-protocol.go b/device/noise-protocol.go index 75352c034..49a4fcfcb 100644 --- a/device/noise-protocol.go +++ b/device/noise-protocol.go @@ -15,7 +15,7 @@ import ( "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/poly1305" - "github.com/amnezia-vpn/amneziawg-go/tai64n" + "github.com/amnezia-vpn/euphoria/tai64n" ) type handshakeState int diff --git a/device/noise_test.go b/device/noise_test.go index 075b6d304..195bc9068 100644 --- a/device/noise_test.go +++ b/device/noise_test.go @@ -10,8 +10,8 @@ import ( "encoding/binary" "testing" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/tun/tuntest" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/tun/tuntest" ) func TestCurveWrappers(t *testing.T) { diff --git a/device/peer.go b/device/peer.go index 5bc8ca49a..98292fc7e 100644 --- a/device/peer.go +++ b/device/peer.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "github.com/amnezia-vpn/amneziawg-go/conn" + "github.com/amnezia-vpn/euphoria/conn" ) type Peer struct { diff --git a/device/queueconstants_android.go b/device/queueconstants_android.go index 1bff95a31..af28ef40f 100644 --- a/device/queueconstants_android.go +++ b/device/queueconstants_android.go @@ -5,7 +5,7 @@ package device -import "github.com/amnezia-vpn/amneziawg-go/conn" +import "github.com/amnezia-vpn/euphoria/conn" /* Reduce memory consumption for Android */ diff --git a/device/queueconstants_default.go b/device/queueconstants_default.go index 0061b63e1..53c724907 100644 --- a/device/queueconstants_default.go +++ b/device/queueconstants_default.go @@ -7,7 +7,7 @@ package device -import "github.com/amnezia-vpn/amneziawg-go/conn" +import "github.com/amnezia-vpn/euphoria/conn" const ( QueueStagedSize = conn.IdealBatchSize diff --git a/device/receive.go b/device/receive.go index 3df269ee3..2a3189d6d 100644 --- a/device/receive.go +++ b/device/receive.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/amnezia-vpn/amneziawg-go/conn" + "github.com/amnezia-vpn/euphoria/conn" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" diff --git a/device/send.go b/device/send.go index d6352e9fc..553fc3d35 100644 --- a/device/send.go +++ b/device/send.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/tun" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/tun" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" diff --git a/device/sticky_default.go b/device/sticky_default.go index da776e8e9..d3e66d2d7 100644 --- a/device/sticky_default.go +++ b/device/sticky_default.go @@ -3,8 +3,8 @@ package device import ( - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/rwcancel" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/rwcancel" ) func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) { diff --git a/device/sticky_linux.go b/device/sticky_linux.go index 63164a782..820edf1ef 100644 --- a/device/sticky_linux.go +++ b/device/sticky_linux.go @@ -20,8 +20,8 @@ import ( "golang.org/x/sys/unix" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/rwcancel" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/rwcancel" ) func (device *Device) startRouteListener(bind conn.Bind) (*rwcancel.RWCancel, error) { diff --git a/device/tun.go b/device/tun.go index 600a5e5c5..3e9aa7f97 100644 --- a/device/tun.go +++ b/device/tun.go @@ -8,7 +8,7 @@ package device import ( "fmt" - "github.com/amnezia-vpn/amneziawg-go/tun" + "github.com/amnezia-vpn/euphoria/tun" ) const DefaultMTU = 1420 diff --git a/device/uapi.go b/device/uapi.go index 7bd5209d9..cf377bae4 100644 --- a/device/uapi.go +++ b/device/uapi.go @@ -18,8 +18,8 @@ import ( "sync" "time" - "github.com/amnezia-vpn/amneziawg-go/device/internal/adapter" - "github.com/amnezia-vpn/amneziawg-go/ipc" + "github.com/amnezia-vpn/euphoria/device/internal/adapter" + "github.com/amnezia-vpn/euphoria/ipc" ) type IPCError struct { diff --git a/go.sum b/go.sum index 8b1d5e5ac..12d7ef33d 100644 --- a/go.sum +++ b/go.sum @@ -1,17 +1,21 @@ github.com/aarzilli/golua v0.0.0-20250217091409-248753f411c4 h1:gW5i3FQAMcbkNgo/A87gCKAbBMalAO8BlPIMo9Gk2Ow= github.com/aarzilli/golua v0.0.0-20250217091409-248753f411c4/go.mod h1:hMjfaJVSqVnxenMlsxrq3Ni+vrm9Hs64tU4M7dhUoO4= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/tevino/abool/v2 v2.1.0 h1:7w+Vf9f/5gmKT4m4qkayb33/92M+Um45F2BkHOR+L/c= github.com/tevino/abool/v2 v2.1.0/go.mod h1:+Lmlqk6bHDWHqN1cbxqhwEAwMPXgc8I1SDEamtseuXY= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= +golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg= golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= gvisor.dev/gvisor v0.0.0-20250130013005-04f9204697c6 h1:6B7MdW3OEbJqOMr7cEYU9bkzvCjUBX/JlXk12xcANuQ= diff --git a/ipc/namedpipe/namedpipe_test.go b/ipc/namedpipe/namedpipe_test.go index 9f9cd6a6f..56064519c 100644 --- a/ipc/namedpipe/namedpipe_test.go +++ b/ipc/namedpipe/namedpipe_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/amnezia-vpn/amneziawg-go/ipc/namedpipe" + "github.com/amnezia-vpn/euphoria/ipc/namedpipe" "golang.org/x/sys/windows" ) diff --git a/ipc/uapi_linux.go b/ipc/uapi_linux.go index 9738aeabd..36ae8118d 100644 --- a/ipc/uapi_linux.go +++ b/ipc/uapi_linux.go @@ -9,7 +9,7 @@ import ( "net" "os" - "github.com/amnezia-vpn/amneziawg-go/rwcancel" + "github.com/amnezia-vpn/euphoria/rwcancel" "golang.org/x/sys/unix" ) diff --git a/ipc/uapi_unix.go b/ipc/uapi_unix.go index 0da452a7e..4a5aff317 100644 --- a/ipc/uapi_unix.go +++ b/ipc/uapi_unix.go @@ -26,7 +26,7 @@ const ( // socketDirectory is variable because it is modified by a linker // flag in wireguard-android. -var socketDirectory = "/var/run/amneziawg" +var socketDirectory = "/var/run/euphoria" func sockPath(iface string) string { return fmt.Sprintf("%s/%s.sock", socketDirectory, iface) diff --git a/ipc/uapi_windows.go b/ipc/uapi_windows.go index 31d2a6390..829861642 100644 --- a/ipc/uapi_windows.go +++ b/ipc/uapi_windows.go @@ -8,7 +8,7 @@ package ipc import ( "net" - "github.com/amnezia-vpn/amneziawg-go/ipc/namedpipe" + "github.com/amnezia-vpn/euphoria/ipc/namedpipe" "golang.org/x/sys/windows" ) @@ -62,7 +62,7 @@ func init() { func UAPIListen(name string) (net.Listener, error) { listener, err := (&namedpipe.ListenConfig{ SecurityDescriptor: UAPISecurityDescriptor, - }).Listen(`\\.\pipe\ProtectedPrefix\Administrators\AmneziaWG\` + name) + }).Listen(`\\.\pipe\ProtectedPrefix\Administrators\Euphoria\` + name) if err != nil { return nil, err } diff --git a/main.go b/main.go index 77a379a5a..5093bdda2 100644 --- a/main.go +++ b/main.go @@ -14,10 +14,10 @@ import ( "runtime" "strconv" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/device" - "github.com/amnezia-vpn/amneziawg-go/ipc" - "github.com/amnezia-vpn/amneziawg-go/tun" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/device" + "github.com/amnezia-vpn/euphoria/ipc" + "github.com/amnezia-vpn/euphoria/tun" "golang.org/x/sys/unix" ) @@ -48,8 +48,8 @@ func warning() { 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, "│ Running euphoria is not required because this │") + fmt.Fprintln(os.Stderr, "│ kernel has first class support for Euphoria. 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 │") @@ -60,7 +60,7 @@ func warning() { func main() { if len(os.Args) == 2 && os.Args[1] == "--version" { fmt.Printf( - "amneziawg-go %s\n\nUserspace AmneziaWG daemon for %s-%s.\nInformation available at https://amnezia.org\n", + "euphoria %s\n\nUserspace Euphoria daemon for %s-%s.\nInformation available at https://amnezia.org\n", Version, runtime.GOOS, runtime.GOARCH, @@ -150,7 +150,7 @@ func main() { fmt.Sprintf("(%s) ", interfaceName), ) - logger.Verbosef("Starting amneziawg-go version %s", Version) + logger.Verbosef("Starting euphoria 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 bbfa6905c..261494168 100644 --- a/main_windows.go +++ b/main_windows.go @@ -12,11 +12,11 @@ import ( "golang.org/x/sys/windows" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/device" - "github.com/amnezia-vpn/amneziawg-go/ipc" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/device" + "github.com/amnezia-vpn/euphoria/ipc" - "github.com/amnezia-vpn/amneziawg-go/tun" + "github.com/amnezia-vpn/euphoria/tun" ) const ( @@ -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 AmneziaWG for Windows client, please visit: https://amnezia.org") + fmt.Fprintln(os.Stderr, "Warning: this is a test program for Windows, mainly used for debugging this Go package. For a real Euphoria for Windows client, please visit: https://amnezia.org") logger := device.NewLogger( device.LogLevelVerbose, fmt.Sprintf("(%s) ", interfaceName), ) - logger.Verbosef("Starting amneziawg-go version %s", Version) + logger.Verbosef("Starting euphoria version %s", Version) tun, err := tun.CreateTUN(interfaceName, 0) if err == nil { diff --git a/tun/netstack/examples/http_client.go b/tun/netstack/examples/http_client.go index 4c4ea120f..4b81a3f85 100644 --- a/tun/netstack/examples/http_client.go +++ b/tun/netstack/examples/http_client.go @@ -13,9 +13,9 @@ import ( "net/http" "net/netip" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/device" - "github.com/amnezia-vpn/amneziawg-go/tun/netstack" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/device" + "github.com/amnezia-vpn/euphoria/tun/netstack" ) func main() { diff --git a/tun/netstack/examples/http_server.go b/tun/netstack/examples/http_server.go index 09929e04f..b5aa5337d 100644 --- a/tun/netstack/examples/http_server.go +++ b/tun/netstack/examples/http_server.go @@ -14,9 +14,9 @@ import ( "net/http" "net/netip" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/device" - "github.com/amnezia-vpn/amneziawg-go/tun/netstack" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/device" + "github.com/amnezia-vpn/euphoria/tun/netstack" ) func main() { diff --git a/tun/netstack/examples/ping_client.go b/tun/netstack/examples/ping_client.go index d7897b264..3a88f0802 100644 --- a/tun/netstack/examples/ping_client.go +++ b/tun/netstack/examples/ping_client.go @@ -17,9 +17,9 @@ import ( "golang.org/x/net/icmp" "golang.org/x/net/ipv4" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/device" - "github.com/amnezia-vpn/amneziawg-go/tun/netstack" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/device" + "github.com/amnezia-vpn/euphoria/tun/netstack" ) func main() { diff --git a/tun/netstack/tun.go b/tun/netstack/tun.go index 2275173e5..e1b91b850 100644 --- a/tun/netstack/tun.go +++ b/tun/netstack/tun.go @@ -22,7 +22,7 @@ import ( "syscall" "time" - "github.com/amnezia-vpn/amneziawg-go/tun" + "github.com/amnezia-vpn/euphoria/tun" "golang.org/x/net/dns/dnsmessage" "gvisor.dev/gvisor/pkg/buffer" diff --git a/tun/offload_linux.go b/tun/offload_linux.go index 89cf0244f..812e33917 100644 --- a/tun/offload_linux.go +++ b/tun/offload_linux.go @@ -12,7 +12,7 @@ import ( "io" "unsafe" - "github.com/amnezia-vpn/amneziawg-go/conn" + "github.com/amnezia-vpn/euphoria/conn" "golang.org/x/sys/unix" ) diff --git a/tun/offload_linux_test.go b/tun/offload_linux_test.go index a68cd989f..3b6269409 100644 --- a/tun/offload_linux_test.go +++ b/tun/offload_linux_test.go @@ -9,7 +9,7 @@ import ( "net/netip" "testing" - "github.com/amnezia-vpn/amneziawg-go/conn" + "github.com/amnezia-vpn/euphoria/conn" "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/header" diff --git a/tun/tun_linux.go b/tun/tun_linux.go index 011e56a23..7e755d423 100644 --- a/tun/tun_linux.go +++ b/tun/tun_linux.go @@ -17,8 +17,8 @@ import ( "time" "unsafe" - "github.com/amnezia-vpn/amneziawg-go/conn" - "github.com/amnezia-vpn/amneziawg-go/rwcancel" + "github.com/amnezia-vpn/euphoria/conn" + "github.com/amnezia-vpn/euphoria/rwcancel" "golang.org/x/sys/unix" ) diff --git a/tun/tuntest/tuntest.go b/tun/tuntest/tuntest.go index f620e0a0e..c8a2d651a 100644 --- a/tun/tuntest/tuntest.go +++ b/tun/tuntest/tuntest.go @@ -11,7 +11,7 @@ import ( "net/netip" "os" - "github.com/amnezia-vpn/amneziawg-go/tun" + "github.com/amnezia-vpn/euphoria/tun" ) func Ping(dst, src netip.Addr) []byte { diff --git a/version.go b/version.go index db75bb938..a580808b9 100644 --- a/version.go +++ b/version.go @@ -1,3 +1,3 @@ package main -const Version = "0.0.20230223" +const Version = "0.0.1"