adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrate to golang.zx2c4.com/wireguard/wgctrl (#239)

Browse Source 
* migrate to golang.zx2c4.com/wireguard/wgctrl

This commit introduces the usage of wgctrl.
It avoids the usage of exec calls of the wg command
and parsing the output of `wg show`.

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* vendor wgctrl

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* apply suggestions from code review

Remove wireguard.Enpoint struct and use net.UDPAddr for the resolved
endpoint and addr string (dnsanme:port) if a DN was supplied.

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* pkg/*: use wireguard.Enpoint

This commit introduces the wireguard.Enpoint struct.
It encapsulates a DN name with port and a net.UPDAddr.
The fields are private and only accessible over exported Methods
to avoid accidental modification.

Also iptables.GetProtocol is improved to avoid ipv4 rules being applied
by `ip6tables`.

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* pkg/wireguard/conf_test.go: add tests for Endpoint

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* cmd/kg/main.go: validate port range

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* add suggestions from review

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* pkg/mesh/mesh.go: use Equal func

Implement an Equal func for Enpoint and use it instead of comparing
strings.

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* cmd/kgctl/main.go: check port range

Signed-off-by: leonnicolas <leonloechner@gmx.de>

* vendor

Signed-off-by: leonnicolas <leonloechner@gmx.de>
This commit is contained in:
leonnicolas
2022-01-30 17:38:45 +01:00
committed by GitHub
parent 797133f272
commit 6a696e03e7
299 changed files with 26275 additions and 10252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
vendor/modules.txt vendored
View File

@@ -92,6 +92,9 @@ github.com/imdario/mergo
# github.com/inconshreveable/mousetrap v1.0.0
## explicit
github.com/inconshreveable/mousetrap
# github.com/josharian/native v0.0.0-20200817173448-b6b71def0850
## explicit; go 1.13
github.com/josharian/native
# github.com/json-iterator/go v1.1.11
## explicit; go 1.12
github.com/json-iterator/go
@@ -108,6 +111,16 @@ github.com/mattn/go-isatty
# github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369
## explicit; go 1.9
github.com/matttproud/golang_protobuf_extensions/pbutil
# github.com/mdlayher/genetlink v1.0.0
## explicit; go 1.13
github.com/mdlayher/genetlink
# github.com/mdlayher/netlink v1.4.1
## explicit; go 1.12
github.com/mdlayher/netlink
github.com/mdlayher/netlink/nlenc
# github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb
## explicit; go 1.17
github.com/mdlayher/socket
# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
## explicit
github.com/modern-go/concurrent
@@ -155,6 +168,10 @@ github.com/vishvananda/netlink/nl
# github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc
## explicit
github.com/vishvananda/netns
# golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871
## explicit; go 1.17
golang.org/x/crypto/curve25519
golang.org/x/crypto/curve25519/internal/field
# golang.org/x/lint v0.0.0-20200302205851-738671d3881b
## explicit; go 1.11
golang.org/x/lint
@@ -163,8 +180,9 @@ golang.org/x/lint/golint
## explicit; go 1.12
golang.org/x/mod/module
golang.org/x/mod/semver
# golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
## explicit; go 1.11
# golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9
## explicit; go 1.17
golang.org/x/net/bpf
golang.org/x/net/context
golang.org/x/net/context/ctxhttp
golang.org/x/net/http/httpguts
@@ -175,7 +193,7 @@ golang.org/x/net/idna
## explicit; go 1.11
golang.org/x/oauth2
golang.org/x/oauth2/internal
# golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
# golang.org/x/sys v0.0.0-20211124211545-fe61309f8881
## explicit; go 1.17
golang.org/x/sys/execabs
golang.org/x/sys/internal/unsafeheader
@@ -216,6 +234,21 @@ golang.org/x/tools/internal/typesinternal
## explicit; go 1.11
golang.org/x/xerrors
golang.org/x/xerrors/internal
# golang.zx2c4.com/wireguard v0.0.0-20211123210315-387f7c461a16
## explicit; go 1.17
golang.zx2c4.com/wireguard/ipc/namedpipe
# golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211124212657-dd7407c86d22
## explicit; go 1.13
golang.zx2c4.com/wireguard/wgctrl
golang.zx2c4.com/wireguard/wgctrl/internal/wginternal
golang.zx2c4.com/wireguard/wgctrl/internal/wglinux
golang.zx2c4.com/wireguard/wgctrl/internal/wglinux/internal/wgh
golang.zx2c4.com/wireguard/wgctrl/internal/wgopenbsd
golang.zx2c4.com/wireguard/wgctrl/internal/wgopenbsd/internal/wgh
golang.zx2c4.com/wireguard/wgctrl/internal/wguser
golang.zx2c4.com/wireguard/wgctrl/internal/wgwindows
golang.zx2c4.com/wireguard/wgctrl/internal/wgwindows/internal/ioctl
golang.zx2c4.com/wireguard/wgctrl/wgtypes
# google.golang.org/appengine v1.6.5
## explicit; go 1.11
google.golang.org/appengine/internal