TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-21 04:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/netstack: remove some v2 logging by default

Browse Source 
Even with [v2], it still logtails and takes time to format.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-03-03 10:37:01 -08:00
parent d01c60dad5
commit f858b0d25f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wgengine/netstack/netstack.go
View File

@ -42,6 +42,8 @@ import (
"tailscale.com/wgengine/tstun" "tailscale.com/wgengine/tstun"
) )
const debugNetstack = false
// Impl contains the state for the netstack implementation, // Impl contains the state for the netstack implementation,
// and implements wgengine.FakeImpl to act as a userspace network // and implements wgengine.FakeImpl to act as a userspace network
// stack when Tailscale is running in fake mode. // stack when Tailscale is running in fake mode.
@ -286,8 +288,9 @@ func (ns *Impl) injectOutbound() {
full = append(full, hdrNetwork.View()...) full = append(full, hdrNetwork.View()...)
full = append(full, hdrTransport.View()...) full = append(full, hdrTransport.View()...)
full = append(full, pkt.Data.ToView()...) full = append(full, pkt.Data.ToView()...)
if debugNetstack {
ns.logf("[v2] packet Write out: % x", full) ns.logf("[v2] packet Write out: % x", full)
}
if err := ns.tundev.InjectOutbound(full); err != nil { if err := ns.tundev.InjectOutbound(full); err != nil {
log.Printf("netstack inject outbound: %v", err) log.Printf("netstack inject outbound: %v", err)
return return
@ -304,7 +307,9 @@ func (ns *Impl) injectInbound(p *packet.Parsed, t *tstun.TUN) filter.Response {
case 6: case 6:
pn = header.IPv6ProtocolNumber pn = header.IPv6ProtocolNumber
} }
ns.logf("[v2] packet in (from %v): % x", p.Src, p.Buffer()) if debugNetstack {
ns.logf("[v2] packet in (from %v): % x", p.Src, p.Buffer())
}
vv := buffer.View(append([]byte(nil), p.Buffer()...)).ToVectorisedView() vv := buffer.View(append([]byte(nil), p.Buffer()...)).ToVectorisedView()
packetBuf := stack.NewPacketBuffer(stack.PacketBufferOptions{ packetBuf := stack.NewPacketBuffer(stack.PacketBufferOptions{
Data: vv, Data: vv,
@ -314,7 +319,11 @@ func (ns *Impl) injectInbound(p *packet.Parsed, t *tstun.TUN) filter.Response {
} }
func (ns *Impl) acceptTCP(r *tcp.ForwarderRequest) { func (ns *Impl) acceptTCP(r *tcp.ForwarderRequest) {
ns.logf("[v2] ForwarderRequest: %v", r) if debugNetstack {
// Kinda ugly:
// ForwarderRequest: &{{{{0 0}}} 0xc0001c30b0 0xc0004c3d40 {1240 6 true 826109390 0 true}
ns.logf("[v2] ForwarderRequest: %v", r)
}
var wq waiter.Queue var wq waiter.Queue
ep, err := r.CreateEndpoint(&wq) ep, err := r.CreateEndpoint(&wq)
if err != nil { if err != nil {