fluencelabs/go-libp2p-kad-dht
1
0
Fork 0
mirror of https://github.com/fluencelabs/go-libp2p-kad-dht synced 2025-05-28 05:31:19 +00:00
Code Issues Projects Releases Wiki Activity

notify: make locking clearer

Browse Source
This commit is contained in:
Steven Allen 2017-07-26 14:07:17 -07:00
parent 13a847a8bb
commit ba0ddf36bd
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
notif.go
View File

@ -45,13 +45,16 @@ func (nn *netNotifiee) Connected(n inet.Network, v inet.Conn) {
cancel: cancel, cancel: cancel,
} }
go func() {
// Note: We *could* just check the peerstore to see if the remote side supports the dht // Note: We *could* just check the peerstore to see if the remote side supports the dht
// protocol, but its not clear that that information will make it into the peerstore // protocol, but its not clear that that information will make it into the peerstore
// by the time this notification is sent. So just to be very careful, we brute force this // by the time this notification is sent. So just to be very careful, we brute force this
// and open a new stream // and open a new stream
go nn.testConnection(ctx, v)
}
func (nn *netNotifiee) testConnection(ctx context.Context, v inet.Conn) {
dht := nn.DHT()
for { for {
s, err := dht.host.NewStream(ctx, v.RemotePeer(), ProtocolDHT, ProtocolDHTOld) s, err := dht.host.NewStream(ctx, v.RemotePeer(), ProtocolDHT, ProtocolDHTOld)
@ -59,12 +62,13 @@ func (nn *netNotifiee) Connected(n inet.Network, v inet.Conn) {
case nil: case nil:
s.Close() s.Close()
dht.plk.Lock() dht.plk.Lock()
defer dht.plk.Unlock()
// Check if canceled under the lock. // Check if canceled under the lock.
if ctx.Err() == nil { if ctx.Err() == nil {
dht.Update(dht.Context(), v.RemotePeer()) dht.Update(dht.Context(), v.RemotePeer())
} }
dht.plk.Unlock()
case io.EOF: case io.EOF:
if ctx.Err() == nil { if ctx.Err() == nil {
// Connection died but we may still have *an* open connection (context not canceled) so try again. // Connection died but we may still have *an* open connection (context not canceled) so try again.
@ -78,7 +82,6 @@ func (nn *netNotifiee) Connected(n inet.Network, v inet.Conn) {
} }
return return
} }
}()
} }
func (nn *netNotifiee) Disconnected(n inet.Network, v inet.Conn) { func (nn *netNotifiee) Disconnected(n inet.Network, v inet.Conn) {