From 26d7a7ee1307ea104aa610d8bd57bde493be5635 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 26 Aug 2019 14:21:12 -0600 Subject: 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 Signed-off-by: Jason A. Donenfeld --- tunnel/service.go | 7 ------- 1 file changed, 7 deletions(-) (limited to 'tunnel/service.go') 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") -- cgit v1.2.3-59-g8ed1b