File tree Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Expand file tree Collapse file tree 2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -392,11 +392,10 @@ func (device *Device) SendKeepalivesToPeersWithCurrentKeypair() {
392392
393393 device .peers .RLock ()
394394 for _ , peer := range device .peers .keyMap {
395- peer .keypairs .RLock ()
396- sendKeepalive := peer .keypairs .current != nil && ! peer .keypairs .current .created .Add (RejectAfterTime ).Before (time .Now ())
397- peer .keypairs .RUnlock ()
398- if sendKeepalive {
399- peer .SendKeepalive ()
395+ if current := peer .keypairs .Current (); current != nil {
396+ if current .created .Add (RejectAfterTime ).Before (time .Now ()) {
397+ peer .SendKeepalive ()
398+ }
400399 }
401400 }
402401 device .peers .RUnlock ()
Original file line number Diff line number Diff line change @@ -33,15 +33,15 @@ type Keypair struct {
3333}
3434
3535type Keypairs struct {
36- sync.RWMutex
36+ sync.Mutex
3737 current * Keypair
3838 previous * Keypair
3939 next * Keypair
4040}
4141
4242func (kp * Keypairs ) Current () * Keypair {
43- kp .RLock ()
44- defer kp .RUnlock ()
43+ kp .Lock ()
44+ defer kp .Unlock ()
4545 return kp .current
4646}
4747
You can’t perform that action at this time.
0 commit comments