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() {
392
392
393
393
device .peers .RLock ()
394
394
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
+ }
400
399
}
401
400
}
402
401
device .peers .RUnlock ()
Original file line number Diff line number Diff line change @@ -33,15 +33,15 @@ type Keypair struct {
33
33
}
34
34
35
35
type Keypairs struct {
36
- sync.RWMutex
36
+ sync.Mutex
37
37
current * Keypair
38
38
previous * Keypair
39
39
next * Keypair
40
40
}
41
41
42
42
func (kp * Keypairs ) Current () * Keypair {
43
- kp .RLock ()
44
- defer kp .RUnlock ()
43
+ kp .Lock ()
44
+ defer kp .Unlock ()
45
45
return kp .current
46
46
}
47
47
You can’t perform that action at this time.
0 commit comments