lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wgengine/router: don't double-prefix dns log messages [Windows]

pull/902/head
Brad Fitzpatrick 2020-11-06 11:42:34 -08:00
parent bda53897b5
commit 119101962c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wgengine/router/dns/config.go
View File

@ -63,7 +63,8 @@ func (lhs Config) Equal(rhs Config) bool {
// ManagerConfig is the set of parameters from which // ManagerConfig is the set of parameters from which
// a manager implementation is chosen and initialized. // a manager implementation is chosen and initialized.
type ManagerConfig struct { type ManagerConfig struct {
// logf is the logger for the manager to use. // Logf is the logger for the manager to use.
// It is wrapped with a "dns: " prefix.
Logf logger.Logf Logf logger.Logf
// InterfaceNAme is the name of the interface with which DNS settings should be associated. // InterfaceNAme is the name of the interface with which DNS settings should be associated.
InterfaceName string InterfaceName string

2
wgengine/router/router_windows.go
View File

@ -39,7 +39,7 @@ func newUserspaceRouter(logf logger.Logf, wgdev *device.Device, tundev tun.Devic
nativeTun := tundev.(*tun.NativeTun) nativeTun := tundev.(*tun.NativeTun)
guid := nativeTun.GUID().String() guid := nativeTun.GUID().String()
mconfig := dns.ManagerConfig{ mconfig := dns.ManagerConfig{
Logf: logger.WithPrefix(logf, "dns: "), Logf: logf,
InterfaceName: guid, InterfaceName: guid,
} }