mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

net/tstun: fix spelling of "WireGuard"

Browse Source 
Updates #cleanup

Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: Ida7e30f4689bc18f5f7502f53a0adb5ac3c7981a
This commit is contained in:
Andrew Dunham 2024-02-27 23:25:36 -05:00
parent a20e46a80f
commit 3dd8ae2f26
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/tstun/wrap.go
View File

@ -160,8 +160,8 @@ type Wrapper struct {
// PreFilterPacketInboundFromWireGuard is the inbound filter function that runs before the main filter // PreFilterPacketInboundFromWireGuard is the inbound filter function that runs before the main filter
// and therefore sees the packets that may be later dropped by it. // and therefore sees the packets that may be later dropped by it.
PreFilterPacketInboundFromWireGuard FilterFunc PreFilterPacketInboundFromWireGuard FilterFunc
// PostFilterPacketInboundFromWireGaurd is the inbound filter function that runs after the main filter. // PostFilterPacketInboundFromWireGuard is the inbound filter function that runs after the main filter.
PostFilterPacketInboundFromWireGaurd FilterFunc PostFilterPacketInboundFromWireGuard FilterFunc
// PreFilterPacketOutboundToWireGuardNetstackIntercept is a filter function that runs before the main filter // PreFilterPacketOutboundToWireGuardNetstackIntercept is a filter function that runs before the main filter
// for packets from the local system. This filter is populated by netstack to hook // for packets from the local system. This filter is populated by netstack to hook
// packets that should be handled by netstack. If set, this filter runs before // packets that should be handled by netstack. If set, this filter runs before
@ -1047,8 +1047,8 @@ func (t *Wrapper) filterPacketInboundFromWireGuard(p *packet.Parsed, captHook ca
return filter.Drop return filter.Drop
} }
if t.PostFilterPacketInboundFromWireGaurd != nil { if t.PostFilterPacketInboundFromWireGuard != nil {
if res := t.PostFilterPacketInboundFromWireGaurd(p, t); res.IsDrop() { if res := t.PostFilterPacketInboundFromWireGuard(p, t); res.IsDrop() {
return res return res
} }
} }

2
wgengine/netstack/netstack.go
View File

@ -320,7 +320,7 @@ func Create(logf logger.Logf, tundev *tstun.Wrapper, e wgengine.Engine, mc *magi
} }
ns.ctx, ns.ctxCancel = context.WithCancel(context.Background()) ns.ctx, ns.ctxCancel = context.WithCancel(context.Background())
ns.atomicIsLocalIPFunc.Store(tsaddr.FalseContainsIPFunc()) ns.atomicIsLocalIPFunc.Store(tsaddr.FalseContainsIPFunc())
ns.tundev.PostFilterPacketInboundFromWireGaurd = ns.injectInbound ns.tundev.PostFilterPacketInboundFromWireGuard = ns.injectInbound
ns.tundev.PreFilterPacketOutboundToWireGuardNetstackIntercept = ns.handleLocalPackets ns.tundev.PreFilterPacketOutboundToWireGuardNetstackIntercept = ns.handleLocalPackets
stacksForMetrics.Store(ns, struct{}{}) stacksForMetrics.Store(ns, struct{}{})
return ns, nil return ns, nil

2
wgengine/userspace.go
View File

@ -359,7 +359,7 @@ func NewUserspaceEngine(logf logger.Logf, conf Config) (_ Engine, reterr error)
tsTUNDev.SetDiscoKey(e.magicConn.DiscoPublicKey()) tsTUNDev.SetDiscoKey(e.magicConn.DiscoPublicKey())
if conf.RespondToPing { if conf.RespondToPing {
e.tundev.PostFilterPacketInboundFromWireGaurd = echoRespondToAll e.tundev.PostFilterPacketInboundFromWireGuard = echoRespondToAll
} }
e.tundev.PreFilterPacketOutboundToWireGuardEngineIntercept = e.handleLocalPackets e.tundev.PreFilterPacketOutboundToWireGuardEngineIntercept = e.handleLocalPackets