From 19867b2b6d8cec4c991130b0a23cd60e09031189 Mon Sep 17 00:00:00 2001 From: Dmytro Shynkevych Date: Wed, 15 Jul 2020 11:48:33 -0400 Subject: [PATCH] tstun: remove buggy-looking log line. This log line looks buggy, even though lacking a filter is expected during bringup. We already know if we forget to SetFilter: it breaks the magicsock test, so no useful information is lost. Resolves #559. Signed-off-by: Dmytro Shynkevych --- wgengine/tstun/tun.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wgengine/tstun/tun.go b/wgengine/tstun/tun.go index cdba27c8d..951124cf3 100644 --- a/wgengine/tstun/tun.go +++ b/wgengine/tstun/tun.go @@ -109,7 +109,7 @@ type TUN struct { func WrapTUN(logf logger.Logf, tdev tun.Device) *TUN { tun := &TUN{ - logf: logf, + logf: logger.WithPrefix(logf, "tstun: "), tdev: tdev, // bufferConsumed is conceptually a condition variable: // a goroutine should not block when setting it, even with no listeners. @@ -221,7 +221,6 @@ func (t *TUN) filterOut(buf []byte) filter.Response { filt, _ := t.filter.Load().(*filter.Filter) if filt == nil { - t.logf("tstun: warning: you forgot to use SetFilter()! Packet dropped.") return filter.Drop } @@ -301,7 +300,6 @@ func (t *TUN) filterIn(buf []byte) filter.Response { filt, _ := t.filter.Load().(*filter.Filter) if filt == nil { - t.logf("tstun: warning: you forgot to use SetFilter()! Packet dropped.") return filter.Drop }