Skip to content
This repository has been archived by the owner on Sep 9, 2022. It is now read-only.

Commit

Permalink
fix: expose full multiaddrs from conn.RemoteMultiaddr
Browse files Browse the repository at this point in the history
There's no reason _not_ to do this.
  • Loading branch information
Stebalien committed Sep 18, 2019
1 parent a8e2ae4 commit aa51db5
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
7 changes: 1 addition & 6 deletions conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,7 @@ func (c *Conn) untagHop() {

// TODO: is it okay to cast c.Conn().RemotePeer() into a multiaddr? might be "user input"
func (c *Conn) RemoteMultiaddr() ma.Multiaddr {
proto := ma.ProtocolWithCode(ma.P_P2P).Name
peerid := c.stream.Conn().RemotePeer().Pretty()
p2paddr := ma.StringCast(fmt.Sprintf("/%s/%s", proto, peerid))

circaddr := ma.Cast(ma.CodeToVarint(P_CIRCUIT))
return p2paddr.Encapsulate(circaddr)
return c.stream.Conn().RemoteMultiaddr().Encapsulate(circuitAddr)
}

func (c *Conn) LocalMultiaddr() ma.Multiaddr {
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ require (
github.com/multiformats/go-multiaddr v0.0.4
github.com/multiformats/go-multiaddr-net v0.0.1
)

go 1.12
2 changes: 1 addition & 1 deletion listen.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (l *RelayListener) Addr() net.Addr {
}

func (l *RelayListener) Multiaddr() ma.Multiaddr {
return ma.Cast(ma.CodeToVarint(P_CIRCUIT))
return circuitAddr
}

func (l *RelayListener) Close() error {
Expand Down
2 changes: 2 additions & 0 deletions transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ var Protocol = ma.Protocol{
VCode: ma.CodeToVarint(P_CIRCUIT),
}

var circuitAddr ma.Multiaddr = ma.Cast(Protocol.VCode)

func init() {
ma.AddProtocol(Protocol)
}
Expand Down

0 comments on commit aa51db5

Please sign in to comment.