snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

device: rename unsafeRemovePeer to removePeerLocked

Browse source 
This matches the new naming scheme of upLocked and downLocked.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2021-02-09 16:11:33 +01:00
parent eaf664e4e9
commit 9e728c2eb0
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
device/device.go
View file

@ -125,12 +125,8 @@ func (device *Device) isUp() bool {
return device.deviceState() == deviceStateUp return device.deviceState() == deviceStateUp
} }
/* Converts the peer into a "zombie", which remains in the peer map, // Must hold device.peers.Lock()
* but processes no packets and does not exists in the routing table. func removePeerLocked(device *Device, peer *Peer, key NoisePublicKey) {
*
* Must hold device.peers.Mutex
*/
func unsafeRemovePeer(device *Device, peer *Peer, key NoisePublicKey) {
// stop routing and processing of packets // stop routing and processing of packets
device.allowedips.RemoveByPeer(peer) device.allowedips.RemoveByPeer(peer)
peer.Stop() peer.Stop()
@ -245,7 +241,7 @@ func (device *Device) SetPrivateKey(sk NoisePrivateKey) error {
for key, peer := range device.peers.keyMap { for key, peer := range device.peers.keyMap {
if peer.handshake.remoteStatic.Equals(publicKey) { if peer.handshake.remoteStatic.Equals(publicKey) {
peer.handshake.mutex.RUnlock() peer.handshake.mutex.RUnlock()
unsafeRemovePeer(device, peer, key) removePeerLocked(device, peer, key)
peer.handshake.mutex.RLock() peer.handshake.mutex.RLock()
} }
} }
@ -334,7 +330,7 @@ func (device *Device) RemovePeer(key NoisePublicKey) {
peer, ok := device.peers.keyMap[key] peer, ok := device.peers.keyMap[key]
if ok { if ok {
unsafeRemovePeer(device, peer, key) removePeerLocked(device, peer, key)
} }
} }
@ -343,7 +339,7 @@ func (device *Device) RemoveAllPeers() {
defer device.peers.Unlock() defer device.peers.Unlock()
for key, peer := range device.peers.keyMap { for key, peer := range device.peers.keyMap {
unsafeRemovePeer(device, peer, key) removePeerLocked(device, peer, key)
} }
device.peers.keyMap = make(map[NoisePublicKey]*Peer) device.peers.keyMap = make(map[NoisePublicKey]*Peer)