trace outgoing hard reset too

ooni · Feb 9, 2024 · b2fcbfd · b2fcbfd
1 parent 79c9cf0
commit b2fcbfd
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/internal/packetmuxer/service.go b/internal/packetmuxer/service.go
@@ -66,6 +66,7 @@ func (s *Service) StartWorkers(
 		muxerToNetwork:       *s.MuxerToNetwork,
 		networkToMuxer:       s.NetworkToMuxer,
 		sessionManager:       sessionManager,
+		tracer:               config.Tracer(),
 		workersManager:       workersManager,
 	}
 	workersManager.StartWorker(ws.moveUpWorker)
@@ -107,6 +108,9 @@ type workersState struct {
 	// sessionManager manages the OpenVPN session.
 	sessionManager *session.Manager
 
+	// tracer is a [model.HandshakeTracer].
+	tracer model.HandshakeTracer
+
 	// workersManager controls the workers lifecycle.
 	workersManager *workers.Manager
 }
@@ -289,6 +293,12 @@ func (ws *workersState) serializeAndEmit(packet *model.Packet) error {
 		return err
 	}
 
+	ws.tracer.OnOutgoingPacket(
+		packet,
+		int(ws.sessionManager.NegotiationState()),
+		ws.hardResetCount,
+	)
+
 	// emit the packet. Possibly BLOCK writing to the networkio layer.
 	select {
 	case ws.muxerToNetwork <- rawPacket: