vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 18:49:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #205 from safing/fix/packet-context

Browse source 
Fix tracing context assigned to packets
This commit is contained in:
Daniel 2020-11-30 15:13:23 +01:00 • committed by GitHub
commit b29775b6a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
firewall/interception.go
View file

@ -64,11 +64,13 @@ func handlePacket(ctx context.Context, pkt packet.Packet) {
return return
} }
// Add context tracer and set context on packet.
traceCtx, tracer := log.AddTracer(ctx) traceCtx, tracer := log.AddTracer(ctx)
if tracer != nil { if tracer != nil {
pkt.SetCtx(traceCtx) defer tracer.Submit()
tracer.Tracef("filter: handling packet: %s", pkt) tracer.Tracef("filter: handling packet: %s", pkt)
} }
pkt.SetCtx(traceCtx)
// associate packet to link and handle // associate packet to link and handle
conn, ok := network.GetConnection(pkt.GetConnectionID()) conn, ok := network.GetConnection(pkt.GetConnectionID())
@ -327,8 +329,8 @@ func packetHandler(ctx context.Context) error {
case <-ctx.Done(): case <-ctx.Done():
return nil return nil
case pkt := <-interception.Packets: case pkt := <-interception.Packets:
interceptionModule.StartWorker("initial packet handler", func(ctx context.Context) error { interceptionModule.StartWorker("initial packet handler", func(workerCtx context.Context) error {
handlePacket(ctx, pkt) handlePacket(workerCtx, pkt)
return nil return nil
}) })
} }