move isRelayAddr helper function

libp2p · Oct 12, 2021 · a157b1b · a157b1b
1 parent 2828a61
commit a157b1b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/p2p/protocol/circuitv2/relay/relay.go b/p2p/protocol/circuitv2/relay/relay.go
@@ -139,7 +139,7 @@ func (r *Relay) handleReserve(s network.Stream) {
 	p := s.Conn().RemotePeer()
 	a := s.Conn().RemoteMultiaddr()
 
-	if util.IsRelayAddr(a) {
+	if isRelayAddr(a) {
 		log.Debugf("refusing relay reservation for %s; reservation attempt over relay connection")
 		r.handleError(s, pbv2.Status_PERMISSION_DENIED)
 		return
@@ -184,7 +184,7 @@ func (r *Relay) handleConnect(s network.Stream, msg *pbv2.HopMessage) {
 	src := s.Conn().RemotePeer()
 	a := s.Conn().RemoteMultiaddr()
 
-	if util.IsRelayAddr(a) {
+	if isRelayAddr(a) {
 		log.Debugf("refusing connection from %s; connection attempt over relay connection")
 		r.handleError(s, pbv2.Status_PERMISSION_DENIED)
 		return
@@ -531,3 +531,8 @@ func (r *Relay) disconnected(n network.Network, c network.Conn) {
 
 	delete(r.rsvp, p)
 }
+
+func isRelayAddr(a ma.Multiaddr) bool {
+	_, err := a.ValueForProtocol(ma.P_CIRCUIT)
+	return err == nil
+}
diff --git a/p2p/protocol/circuitv2/util/ma.go b/p2p/protocol/circuitv2/util/ma.go