cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-25 09:31:34 +00:00
Code Releases Activity

use address only not port

Browse Source
This commit is contained in:
Jeff Becker 2018-04-20 08:41:09 -04:00
parent 3c4fee0492
commit 5e23185ddc
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/yggdrasil/tcp.go
View File

@ -38,8 +38,8 @@ type tcpInterface struct {
type tcpInfo struct { type tcpInfo struct {
box boxPubKey box boxPubKey
sig sigPubKey sig sigPubKey
localAddr net.Addr localAddr string
remoteAddr net.Addr remoteAddr string
} }
func (iface *tcpInterface) init(core *Core, addr string) (err error) { func (iface *tcpInterface) init(core *Core, addr string) (err error) {
@ -131,8 +131,8 @@ func (iface *tcpInterface) handler(sock net.Conn) {
return return
} }
// 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 = sock.LocalAddr() info.localAddr, _, _ = net.SplitHostPort(sock.LocalAddr().String())
info.remoteAddr = sock.RemoteAddr() 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()
@ -233,7 +233,7 @@ func (iface *tcpInterface) handler(sock net.Conn) {
p.core.peers.mutex.Unlock() p.core.peers.mutex.Unlock()
close(linkIn) close(linkIn)
}() }()
them := sock.RemoteAddr() them, _, _ := net.SplitHostPort(sock.RemoteAddr().String())
themNodeID := getNodeID(&info.box) themNodeID := getNodeID(&info.box)
themAddr := address_addrForNodeID(themNodeID) themAddr := address_addrForNodeID(themNodeID)
themAddrString := net.IP(themAddr[:]).String() themAddrString := net.IP(themAddr[:]).String()