From 3b59fd0fe0badbf82ca7af84159aa39c16cab3ce Mon Sep 17 00:00:00 2001
From: capossele <angelocapossele@gmail.com>
Date: Wed, 18 Dec 2019 08:38:54 +0000
Subject: [PATCH] :art: adds pubAddr to the transport
---
packages/gossip/transport/handshake.go | 2 +-
packages/gossip/transport/transport.go | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/packages/gossip/transport/handshake.go b/packages/gossip/transport/handshake.go
index 2be73aab..a33b3329 100644
--- a/packages/gossip/transport/handshake.go
+++ b/packages/gossip/transport/handshake.go
@@ -56,7 +56,7 @@ func (t *TCP) validateHandshakeRequest(reqData []byte, fromAddr string) bool {
)
return false
}
- if m.GetTo() != t.pubIP {
+ if m.GetTo() != t.pubAddr {
t.log.Debugw("invalid handshake",
"to", m.GetTo(),
)
diff --git a/packages/gossip/transport/transport.go b/packages/gossip/transport/transport.go
index 83fd6edd..61690e0f 100644
--- a/packages/gossip/transport/transport.go
+++ b/packages/gossip/transport/transport.go
@@ -41,7 +41,7 @@ const (
// TCP establishes verified incoming and outgoing TCP connections to other peers.
type TCP struct {
local *peer.Local
- pubIP string
+ pubAddr string
listener *net.TCPListener
log *zap.SugaredLogger
@@ -86,7 +86,7 @@ func Listen(local *peer.Local, log *zap.SugaredLogger) (*TCP, error) {
return nil, ErrNoGossip
}
- t.pubIP = gossipAddr.String()
+ t.pubAddr = gossipAddr.String()
host, port, _ := net.SplitHostPort(gossipAddr.String())
if host != "127.0.0.1" {
@@ -304,7 +304,7 @@ func (t *TCP) listenLoop() {
func (t *TCP) doHandshake(key peer.PublicKey, remoteAddr string, conn net.Conn) error {
_, connPort, _ := net.SplitHostPort(conn.LocalAddr().String())
- from, _, _ := net.SplitHostPort(t.pubIP)
+ from, _, _ := net.SplitHostPort(t.pubAddr)
reqData, err := newHandshakeRequest(from+":"+connPort, remoteAddr)
if err != nil {
--
GitLab