github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix tracing context assigned to packets

Browse Source
This commit is contained in:
Daniel
2020-11-30 14:49:21 +01:00
parent 454a234449
commit c37674d94c
1 changed files with 5 additions and 3 deletions
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
}) })
} }