path: root/tunnel/service.go
diff options
authorJason A. Donenfeld <Jason@zx2c4.com>2019-08-26 14:21:12 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2019-08-26 14:48:41 -0600
commit26d7a7ee1307ea104aa610d8bd57bde493be5635 (patch)
treeba3c0caa4099d1604f6ed77bf0086ac79ea67b4d /tunnel/service.go
parentelevate: use upstream windows directory function (diff)
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>
Diffstat (limited to '')
1 files changed, 0 insertions, 7 deletions
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
- 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")