fix: DNS TTL not respected

Author: ninabarbakadze

p2p/peer.go

@@ -32,6 +32,8 @@ type Peer interface {
 	IsOutbound() bool   // did we dial the peer
 	IsPersistent() bool // do we redial this peer when we disconnect
 
+	IPHasChanged() bool // has the peer's IP changed
+
 	CloseConn() error // close original connection
 
 	NodeInfo() NodeInfo // peer's info
@@ -300,6 +302,13 @@ func (p *peer) IsPersistent() bool {
 	return p.peerConn.persistent
 }
 
+// IPHasChanged returns true and the new IP if the peer's IP has changed.
+func (p *peer) IPHasChanged() bool {
+	oldIP := p.ip
+	newIP := p.RemoteIP()
+	return !oldIP.Equal(newIP) 
+}
+
 // NodeInfo returns a copy of the peer's NodeInfo.
 func (p *peer) NodeInfo() NodeInfo {
 	return p.nodeInfo

p2p/peer_set_test.go

@@ -27,6 +27,7 @@ func (mp *mockPeer) NodeInfo() NodeInfo              { return DefaultNodeInfo{}
 func (mp *mockPeer) Status() ConnectionStatus        { return ConnectionStatus{} }
 func (mp *mockPeer) ID() ID                          { return mp.id }
 func (mp *mockPeer) IsOutbound() bool                { return false }
+func (mp *mockPeer) IPHasChanged() bool              { return true }
 func (mp *mockPeer) IsPersistent() bool              { return true }
 func (mp *mockPeer) Get(s string) interface{}        { return s }
 func (mp *mockPeer) Set(string, interface{})         {}

p2p/switch.go

@@ -381,22 +381,38 @@ func (sw *Switch) StopPeerForError(peer Peer, reason interface{}) {
 	sw.stopAndRemovePeer(peer, reason)
 
 	if peer.IsPersistent() {
-		var addr *NetAddress
-		if peer.IsOutbound() { // socket address for outbound peers
-			addr = peer.SocketAddr()
-		} else { // self-reported address for inbound peers
-			var err error
-			addr, err = peer.NodeInfo().NetAddress()
-			if err != nil {
-				sw.Logger.Error("Wanted to reconnect to inbound peer, but self-reported address is wrong",
-					"peer", peer, "err", err)
-				return
-			}
+		addr, err := sw.getPeerAddress(peer)
+		if err != nil {
+			return
+		}
+		go sw.reconnectToPeer(addr)
+	}
+
+	if peer.IPHasChanged() {
+		addr, err := sw.getPeerAddress(peer)
+		if err != nil {
+			return
 		}
 		go sw.reconnectToPeer(addr)
 	}
 }
 
+// getPeerAddress returns the appropriate NetAddress for a given peer,
+// handling both outbound and inbound peers.
+func (sw *Switch) getPeerAddress(peer Peer) (*NetAddress, error) {
+	if peer.IsOutbound() {
+		return peer.SocketAddr(), nil
+	}
+	// For inbound peers, get the self-reported address
+	addr, err := peer.NodeInfo().NetAddress()
+	if err != nil {
+		sw.Logger.Error("Failed to get address for inbound peer",
+			"peer", peer, "err", err)
+		return nil, err
+	}
+	return addr, nil
+}
+
 // StopPeerGracefully disconnects from a peer gracefully.
 // TODO: handle graceful disconnects.
 func (sw *Switch) StopPeerGracefully(peer Peer) {

p2p/switch_test.go

@@ -566,6 +566,37 @@ func TestSwitchReconnectsToInboundPersistentPeer(t *testing.T) {
 	assert.Equal(t, 1, sw.Peers().Size())
 }
 
+func TestSwitchReconnectsWhenOutboundPeerDnsChanges(t *testing.T) {
+	sw := MakeSwitch(cfg, 1, "testing", "123.123.123", initSwitchFunc)
+	err := sw.Start()
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		if err := sw.Stop(); err != nil {
+			t.Error(err)
+		}
+	})
+
+	// change the DNS of the peer
+	// Initial setup
+	initialPrivKey := ed25519.GenPrivKey()
+
+	rp := &remotePeer{PrivKey: initialPrivKey, Config: cfg}
+	rp.Start()
+
+	fmt.Println("Dialing to", rp.Addr().String())
+
+	// Now change the private key
+	newPrivKey := ed25519.GenPrivKey()
+	rp.PrivKey = newPrivKey
+	rp.Start()
+
+	fmt.Println("Dialing to", rp.Addr().String())
+	// get all peers
+	peers := sw.Peers().List()
+	fmt.Println("Peers", peers)
+	// Add assertions or further logic to verify the effects of the key change
+}
+
 func TestSwitchDialPeersAsync(t *testing.T) {
 	if testing.Short() {
 		return