yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-04-28 14:15:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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 {
box boxPubKey
sig sigPubKey
localAddr net.Addr
remoteAddr net.Addr
localAddr string
remoteAddr string
}
func (iface *tcpInterface) init(core *Core, addr string) (err error) {
@ -131,8 +131,8 @@ func (iface *tcpInterface) handler(sock net.Conn) {
return
}
// Check if we already have a connection to this node, close and block if yes
info.localAddr = sock.LocalAddr()
info.remoteAddr = sock.RemoteAddr()
info.localAddr, _, _ = net.SplitHostPort(sock.LocalAddr().String())
info.remoteAddr, _, _ = net.SplitHostPort(sock.RemoteAddr().String())
iface.mutex.Lock()
if blockChan, isIn := iface.conns[info]; isIn {
iface.mutex.Unlock()
@ -233,7 +233,7 @@ func (iface *tcpInterface) handler(sock net.Conn) {
p.core.peers.mutex.Unlock()
close(linkIn)
}()
them := sock.RemoteAddr()
them, _, _ := net.SplitHostPort(sock.RemoteAddr().String())
themNodeID := getNodeID(&info.box)
themAddr := address_addrForNodeID(themNodeID)
themAddrString := net.IP(themAddr[:]).String()