status-im
/
go-libp2p
mirror of https://github.com/status-im/go-libp2p.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make tag value fixed, tagged in first circuit, untagged in last.

This commit is contained in:
vyzo 2021-09-16 14:06:52 +03:00
parent 369df59523
commit 0d8a1852cf
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
p2p/protocol/circuitv1/relay/relay.go
View File

@ -29,8 +29,8 @@ const (
ConnectTimeout = 30 * time.Second
HandshakeTimeout = time.Minute
RelayHopTag = "relay-hop"
MaxRelayHopTag = 5
RelayHopTag = "relay-v1-hop"
RelayHopTagValue = 2
maxMessageSize = 4096
)
@ -269,8 +269,8 @@ func (r *Relay) addConn(p peer.ID) {
conns := r.conns[p]
conns++
r.conns[p] = conns
if conns < MaxRelayHopTag {
r.host.ConnManager().UpsertTag(p, RelayHopTag, func(v int) int { return v + 1 })
if conns == 1 {
r.host.ConnManager().TagPeer(p, RelayHopTag, RelayHopTagValue)
}
}
@ -281,11 +281,8 @@ func (r *Relay) rmConn(p peer.ID) {
r.conns[p] = conns
} else {
delete(r.conns, p)
r.host.ConnManager().UntagPeer(p, RelayHopTag)
}
if conns <= MaxRelayHopTag {
r.host.ConnManager().UpsertTag(p, RelayHopTag, func(v int) int { return v - 1 })
}
}
func (r *Relay) relayConn(src, dest network.Stream, srcID, destID peer.ID, done func()) {

12
p2p/protocol/circuitv2/relay/relay.go
View File

@ -30,8 +30,8 @@ const (
ConnectTimeout = 30 * time.Second
HandshakeTimeout = time.Minute
RelayHopTag = "relay-hop"
MaxRelayHopTag = 5
RelayHopTag = "relay-v2-hop"
RelayHopTagValue = 2
maxMessageSize = 4096
)
@ -346,8 +346,8 @@ func (r *Relay) addConn(p peer.ID) {
conns := r.conns[p]
conns++
r.conns[p] = conns
if conns <= MaxRelayHopTag {
r.host.ConnManager().UpsertTag(p, RelayHopTag, func(v int) int { return v + 1 })
if conns == 1 {
r.host.ConnManager().TagPeer(p, RelayHopTag, RelayHopTagValue)
}
}
@ -358,9 +358,7 @@ func (r *Relay) rmConn(p peer.ID) {
r.conns[p] = conns
} else {
delete(r.conns, p)
}
if conns < MaxRelayHopTag {
r.host.ConnManager().UpsertTag(p, RelayHopTag, func(v int) int { return v - 1 })
r.host.ConnManager().UntagPeer(p, RelayHopTag)
}
}