make hop tags and values private

vyzo · vyzo · commit 9674b5cda585 · 2021-09-21T13:38:50.000+03:00
diff --git a/p2p/protocol/circuitv1/relay/relay.go b/p2p/protocol/circuitv1/relay/relay.go
@@ -29,8 +29,8 @@ const (
 	ConnectTimeout   = 30 * time.Second
 	HandshakeTimeout = time.Minute
 
-	RelayHopTag      = "relay-v1-hop"
-	RelayHopTagValue = 2
+	relayHopTag      = "relay-v1-hop"
+	relayHopTagValue = 2
 
 	maxMessageSize = 4096
 )
@@ -270,7 +270,7 @@ func (r *Relay) addConn(p peer.ID) {
 	conns++
 	r.conns[p] = conns
 	if conns == 1 {
-		r.host.ConnManager().TagPeer(p, RelayHopTag, RelayHopTagValue)
+		r.host.ConnManager().TagPeer(p, relayHopTag, relayHopTagValue)
 	}
 }
 
@@ -281,7 +281,7 @@ func (r *Relay) rmConn(p peer.ID) {
 		r.conns[p] = conns
 	} else {
 		delete(r.conns, p)
-		r.host.ConnManager().UntagPeer(p, RelayHopTag)
+		r.host.ConnManager().UntagPeer(p, relayHopTag)
 	}
 }
 
diff --git a/p2p/protocol/circuitv2/relay/relay.go b/p2p/protocol/circuitv2/relay/relay.go
@@ -30,8 +30,8 @@ const (
 	ConnectTimeout   = 30 * time.Second
 	HandshakeTimeout = time.Minute
 
-	RelayHopTag      = "relay-v2-hop"
-	RelayHopTagValue = 2
+	relayHopTag      = "relay-v2-hop"
+	relayHopTagValue = 2
 
 	maxMessageSize = 4096
 )
@@ -347,7 +347,7 @@ func (r *Relay) addConn(p peer.ID) {
 	conns++
 	r.conns[p] = conns
 	if conns == 1 {
-		r.host.ConnManager().TagPeer(p, RelayHopTag, RelayHopTagValue)
+		r.host.ConnManager().TagPeer(p, relayHopTag, relayHopTagValue)
 	}
 }
 
@@ -358,7 +358,7 @@ func (r *Relay) rmConn(p peer.ID) {
 		r.conns[p] = conns
 	} else {
 		delete(r.conns, p)
-		r.host.ConnManager().UntagPeer(p, RelayHopTag)
+		r.host.ConnManager().UntagPeer(p, relayHopTag)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ const (`
`29`	`29`	`ConnectTimeout = 30 * time.Second`
`30`	`30`	`HandshakeTimeout = time.Minute`
`31`	`31`
`32`		`- RelayHopTag = "relay-v1-hop"`
`33`		`- RelayHopTagValue = 2`
	`32`	`+ relayHopTag = "relay-v1-hop"`
	`33`	`+ relayHopTagValue = 2`
`34`	`34`
`35`	`35`	`maxMessageSize = 4096`
`36`	`36`	`)`
`@@ -270,7 +270,7 @@ func (r *Relay) addConn(p peer.ID) {`
`270`	`270`	`conns++`
`271`	`271`	`r.conns[p] = conns`
`272`	`272`	`if conns == 1 {`
`273`		`- r.host.ConnManager().TagPeer(p, RelayHopTag, RelayHopTagValue)`
	`273`	`+ r.host.ConnManager().TagPeer(p, relayHopTag, relayHopTagValue)`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`
`@@ -281,7 +281,7 @@ func (r *Relay) rmConn(p peer.ID) {`
`281`	`281`	`r.conns[p] = conns`
`282`	`282`	`} else {`
`283`	`283`	`delete(r.conns, p)`
`284`		`- r.host.ConnManager().UntagPeer(p, RelayHopTag)`
	`284`	`+ r.host.ConnManager().UntagPeer(p, relayHopTag)`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ const (`
`30`	`30`	`ConnectTimeout = 30 * time.Second`
`31`	`31`	`HandshakeTimeout = time.Minute`
`32`	`32`
`33`		`- RelayHopTag = "relay-v2-hop"`
`34`		`- RelayHopTagValue = 2`
	`33`	`+ relayHopTag = "relay-v2-hop"`
	`34`	`+ relayHopTagValue = 2`
`35`	`35`
`36`	`36`	`maxMessageSize = 4096`
`37`	`37`	`)`
`@@ -347,7 +347,7 @@ func (r *Relay) addConn(p peer.ID) {`
`347`	`347`	`conns++`
`348`	`348`	`r.conns[p] = conns`
`349`	`349`	`if conns == 1 {`
`350`		`- r.host.ConnManager().TagPeer(p, RelayHopTag, RelayHopTagValue)`
	`350`	`+ r.host.ConnManager().TagPeer(p, relayHopTag, relayHopTagValue)`
`351`	`351`	`}`
`352`	`352`	`}`
`353`	`353`
`@@ -358,7 +358,7 @@ func (r *Relay) rmConn(p peer.ID) {`
`358`	`358`	`r.conns[p] = conns`
`359`	`359`	`} else {`
`360`	`360`	`delete(r.conns, p)`
`361`		`- r.host.ConnManager().UntagPeer(p, RelayHopTag)`
	`361`	`+ r.host.ConnManager().UntagPeer(p, relayHopTag)`
`362`	`362`	`}`
`363`	`363`	`}`
`364`	`364`