multi: apply roasbeef diff to support incoming socks.ProxiedAddr

This commit is contained in:
MeshCollider authored and Olaoluwa Osuntokun committed 2018-02-05 17:37:46 -08:00
1 parent 36219427ad
commit 4b1cc98808
7 files changed
+86 -43

No files matched your search

+5 -5
View File
@@ -56,7 +56,7 @@ type LinkNode struct {
// authenticated connection for the stored identity public key.
//
// TODO(roasbeef): also need to support hidden service addrs
Addresses []*net.TCPAddr
Addresses []net.Addr
db *DB
}
@@ -64,13 +64,13 @@ type LinkNode struct {
// NewLinkNode creates a new LinkNode from the provided parameters, which is
// backed by an instance of channeldb.
func (db *DB) NewLinkNode(bitNet wire.BitcoinNet, pub *btcec.PublicKey,
addr *net.TCPAddr) *LinkNode {
addr net.Addr) *LinkNode {
return &LinkNode{
Network: bitNet,
IdentityPub: pub,
LastSeen: time.Now(),
Addresses: []*net.TCPAddr{addr},
Addresses: []net.Addr{addr},
db: db,
}
}
@@ -267,13 +267,13 @@ func deserializeLinkNode(r io.Reader) (*LinkNode, error) {
}
numAddrs := byteOrder.Uint32(buf[:4])
node.Addresses = make([]*net.TCPAddr, numAddrs)
node.Addresses = make([]net.Addr, numAddrs)
for i := uint32(0); i < numAddrs; i++ {
addr, err := deserializeAddr(r)
if err != nil {
return nil, err
}
node.Addresses[i] = addr.(*net.TCPAddr)
node.Addresses[i] = addr
}
return node, nil