diff --git a/net/peer.go b/net/peer.go index b30d64d..40debc1 100644 --- a/net/peer.go +++ b/net/peer.go @@ -44,7 +44,7 @@ type Peer interface { ConnectionURIs() []*url.URL IsHandshakeDone() bool SetHandshakeDone(status bool) - GetIP() string + GetIPString() string Abuser() bool } @@ -83,7 +83,7 @@ func (b *BasePeer) End() error { func (b *BasePeer) EndForAbuse() error { panic("must implement in child class") } -func (b *BasePeer) GetIP() string { +func (b *BasePeer) GetIPString() string { panic("must implement in child class") } diff --git a/net/ws.go b/net/ws.go index 7aa5328..2484424 100644 --- a/net/ws.go +++ b/net/ws.go @@ -137,7 +137,7 @@ func (p *WebSocketPeer) GetChallenge() []byte { return p.challenge } -func (b *WebSocketPeer) GetIP() string { +func (b *WebSocketPeer) GetIPString() string { ctx, cancel := context.WithCancel(context.Background()) netConn := websocket.NetConn(ctx, b.socket, websocket.MessageBinary) diff --git a/service/default/p2p.go b/service/default/p2p.go index c884c14..03b5b00 100644 --- a/service/default/p2p.go +++ b/service/default/p2p.go @@ -222,7 +222,7 @@ func (p *P2PServiceDefault) ConnectToNode(connectionUris []*url.URL, retry uint, } } - fromPeerIP := fromPeer.GetIP() + fromPeerIP := fromPeer.GetIPString() if !p.incomingIPBlocklist.Contains(fromPeerIP) { p.incomingIPBlocklist.Put(fromPeerIP, true) @@ -282,7 +282,7 @@ func (p *P2PServiceDefault) ConnectToNode(connectionUris []*url.URL, retry uint, } } - fromPeerIP := fromPeer.GetIP() + fromPeerIP := fromPeer.GetIPString() if !p.incomingIPBlocklist.Contains(fromPeerIP) { p.incomingIPBlocklist.Put(fromPeerIP, true) blocked = true @@ -371,7 +371,7 @@ func (p *P2PServiceDefault) OnNewPeer(peer net.Peer, verifyId bool) error { pid = "unknown" } - pip := peer.GetIP() + pip := peer.GetIPString() if p.incomingIPBlocklist.Contains(pid) { p.Logger().Error("peer is on identity blocklist", zap.String("peer", pid))