From 15810daa2283e3cfe0c811c3632f053274f31950 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Mon, 8 Feb 2021 10:01:35 -0800 Subject: device: separate timersInit from timersStart timersInit sets up the timers. It need only be done once per peer. timersStart does the work to prepare the timers for a newly running peer. It needs to be done every time a peer starts. Separate the two and call them in the appropriate places. This prevents data races on the peer's timers fields when starting and stopping peers. Signed-off-by: Josh Bleecher Snyder --- device/peer.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'device/peer.go') diff --git a/device/peer.go b/device/peer.go index abe8a08..3e4f4ec 100644 --- a/device/peer.go +++ b/device/peer.go @@ -107,6 +107,7 @@ func (device *Device) NewPeer(pk NoisePublicKey) (*Peer, error) { device.peers.empty.Set(false) // start peer + peer.timersInit() if peer.device.isUp() { peer.Start() } @@ -183,7 +184,7 @@ func (peer *Peer) Start() { } peer.device.queue.encryption.wg.Add(1) // keep encryption queue open for our writes - peer.timersInit() + peer.timersStart() go peer.RoutineSequentialSender() go peer.RoutineSequentialReceiver() -- cgit v1.2.3