5
0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-29 15:31:35 +00:00

Don't track localAddr in conns as it is irrelevant

This commit is contained in:
Neil Alexander 2018-12-30 16:48:34 +00:00
parent cb4495902b
commit 80c9a1bc12
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944

View File

@ -53,8 +53,8 @@ type tcpInterface struct {
type tcpInfo struct { type tcpInfo struct {
box crypto.BoxPubKey box crypto.BoxPubKey
sig crypto.SigPubKey sig crypto.SigPubKey
localAddr string
remoteAddr string remoteAddr string
remotePort string
} }
// Wrapper function to set additional options for specific connection types. // Wrapper function to set additional options for specific connection types.
@ -313,8 +313,7 @@ func (iface *tcpInterface) handler(sock net.Conn, incoming bool) {
} }
} }
// Check if we already have a connection to this node, close and block if yes // Check if we already have a connection to this node, close and block if yes
info.localAddr, _, _ = net.SplitHostPort(sock.LocalAddr().String()) info.remoteAddr, info.remotePort, _ = net.SplitHostPort(sock.RemoteAddr().String())
info.remoteAddr, _, _ = net.SplitHostPort(sock.RemoteAddr().String())
iface.mutex.Lock() iface.mutex.Lock()
if blockChan, isIn := iface.conns[info]; isIn { if blockChan, isIn := iface.conns[info]; isIn {
iface.mutex.Unlock() iface.mutex.Unlock()