diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-26 14:21:12 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-26 14:48:41 -0600 |
| commit | 26d7a7ee1307ea104aa610d8bd57bde493be5635 (patch) | |
| tree | ba3c0caa4099d1604f6ed77bf0086ac79ea67b4d | |
| parent | elevate: use upstream windows directory function (diff) | |
| download | wireguard-windows-26d7a7ee1307ea104aa610d8bd57bde493be5635.tar.xz wireguard-windows-26d7a7ee1307ea104aa610d8bd57bde493be5635.zip | |
tunnel: do not query real interface name
We want to enforce the relation between the socket name and the service
name, especially since the wintun adapter name might get a 1 or 2
appended depending on weird Nci duplication detection. So we just stick
with the configuration-given name throughout. Also, the user can change
the adapter name at runtime, which is all the more reason why maybe we
shouldn't care about it so much.
Reported-by: Nenad Kozul <me@nenadkozul.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | services/errors.go | 3 | ||||
| -rw-r--r-- | tunnel/service.go | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/services/errors.go b/services/errors.go index c9b2c049..237cb2c3 100644 --- a/services/errors.go +++ b/services/errors.go @@ -19,7 +19,6 @@ const ( ErrorRingloggerOpen ErrorLoadConfiguration ErrorCreateWintun - ErrorDetermineWintunName ErrorUAPIListen ErrorDNSLookup ErrorFirewall @@ -46,8 +45,6 @@ func (e Error) Error() string { return "Unable to load configuration from path" case ErrorCreateWintun: return "Unable to create Wintun device" - case ErrorDetermineWintunName: - return "Unable to determine Wintun name" case ErrorUAPIListen: return "Unable to listen on named pipe" case ErrorDNSLookup: diff --git a/tunnel/service.go b/tunnel/service.go index dbaa3133..b3699dd5 100644 --- a/tunnel/service.go +++ b/tunnel/service.go @@ -162,13 +162,6 @@ func (service *tunnelService) Execute(args []string, r <-chan svc.ChangeRequest, serviceError = services.ErrorCreateWintun return } - log.Println("Determining Wintun device name") - realInterfaceName, err := wintun.Name() - if err != nil { - serviceError = services.ErrorDetermineWintunName - return - } - conf.Name = realInterfaceName nativeTun = wintun.(*tun.NativeTun) log.Println("Enabling firewall rules") |