highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-09-05 17:05:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

lnd: rename removePeer to removePeerUnsafe

Browse Source 
rename `removePeer` to highlight that the mutex has to be acquired
before calling it.
This commit is contained in:
ziggie
2025-06-24 15:59:15 +02:00
committed by Oliver Gugger
parent a656f2c8a6
commit 78313e3436
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server.go
View File

@@ -4074,7 +4074,7 @@ func (s *server) InboundPeerConnected(conn net.Conn) {
// Remove the current peer from the server's internal state and // Remove the current peer from the server's internal state and
// signal that the peer termination watcher does not need to // signal that the peer termination watcher does not need to
// execute for this peer. // execute for this peer.
s.removePeer(connectedPeer) s.removePeerUnsafe(connectedPeer)
s.ignorePeerTermination[connectedPeer] = struct{}{} s.ignorePeerTermination[connectedPeer] = struct{}{}
s.scheduledPeerConnection[pubStr] = func() { s.scheduledPeerConnection[pubStr] = func() {
s.peerConnected(conn, nil, true) s.peerConnected(conn, nil, true)
@@ -4191,7 +4191,7 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
// Remove the current peer from the server's internal state and // Remove the current peer from the server's internal state and
// signal that the peer termination watcher does not need to // signal that the peer termination watcher does not need to
// execute for this peer. // execute for this peer.
s.removePeer(connectedPeer) s.removePeerUnsafe(connectedPeer)
s.ignorePeerTermination[connectedPeer] = struct{}{} s.ignorePeerTermination[connectedPeer] = struct{}{}
s.scheduledPeerConnection[pubStr] = func() { s.scheduledPeerConnection[pubStr] = func() {
s.peerConnected(conn, connReq, false) s.peerConnected(conn, connReq, false)
@@ -4711,7 +4711,7 @@ func (s *server) peerTerminationWatcher(p *peer.Brontide, ready chan struct{}) {
// First, cleanup any remaining state the server has regarding the peer // First, cleanup any remaining state the server has regarding the peer
// in question. // in question.
s.removePeer(p) s.removePeerUnsafe(p)
// Next, check to see if this is a persistent peer or not. // Next, check to see if this is a persistent peer or not.
if _, ok := s.persistentPeers[pubStr]; !ok { if _, ok := s.persistentPeers[pubStr]; !ok {
@@ -4920,11 +4920,11 @@ func (s *server) connectToPersistentPeer(pubKeyStr string) {
}() }()
} }
// removePeer removes the passed peer from the server's state of all active // removePeerUnsafe removes the passed peer from the server's state of all
// peers. // active peers.
// //
// NOTE: Server mutex must be held when calling this function. // NOTE: Server mutex must be held when calling this function.
func (s *server) removePeer(p *peer.Brontide) { func (s *server) removePeerUnsafe(p *peer.Brontide) {
if p == nil { if p == nil {
return return
} }
@@ -5128,7 +5128,7 @@ func (s *server) DisconnectPeer(pubKey *btcec.PublicKey) error {
delete(s.persistentPeersBackoff, pubStr) delete(s.persistentPeersBackoff, pubStr)
// Remove the peer by calling Disconnect. Previously this was done with // Remove the peer by calling Disconnect. Previously this was done with
// removePeer, which bypassed the peerTerminationWatcher. // removePeerUnsafe, which bypassed the peerTerminationWatcher.
// //
// NOTE: We call it in a goroutine to avoid blocking the main server // NOTE: We call it in a goroutine to avoid blocking the main server
// goroutine because we might hold the server's mutex. // goroutine because we might hold the server's mutex.