Merge pull request #10076 from idryzhov/if-is-loopback-or-vrf

[mirror_frr.git] / ripd / rip_peer.c

diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c
index 77c73ab398f12c65cfcf756b76ddd96d0c876a06..12c4edd43611c44299e29739249f27b25642f90e 100644 (file)
--- a/ripd/rip_peer.c
+++ b/ripd/rip_peer.c
@@ -29,7 +29,7 @@
 
 #include "ripd/ripd.h"
 
-DEFINE_MTYPE_STATIC(RIPD, RIP_PEER, "RIP peer")
+DEFINE_MTYPE_STATIC(RIPD, RIP_PEER, "RIP peer");
 
 static struct rip_peer *rip_peer_new(void)
 {
@@ -86,8 +86,7 @@ static struct rip_peer *rip_peer_get(struct rip *rip, struct in_addr *addr)
        peer = rip_peer_lookup(rip, addr);
 
        if (peer) {
-               if (peer->t_timeout)
-                       thread_cancel(peer->t_timeout);
+               thread_cancel(&peer->t_timeout);
        } else {
                peer = rip_peer_new();
                peer->rip = rip;
@@ -96,7 +95,6 @@ static struct rip_peer *rip_peer_get(struct rip *rip, struct in_addr *addr)
        }
 
        /* Update timeout thread. */
-       peer->t_timeout = NULL;
        thread_add_timer(master, rip_peer_timeout, peer, RIP_PEER_TIMER_DEFAULT,
                         &peer->t_timeout);
 
@@ -155,8 +153,8 @@ void rip_peer_display(struct vty *vty, struct rip *rip)
        char timebuf[RIP_UPTIME_LEN];
 
        for (ALL_LIST_ELEMENTS(rip->peer_list, node, nnode, peer)) {
-               vty_out(vty, "    %-16s %9d %9d %9d   %s\n",
-                       inet_ntoa(peer->addr), peer->recv_badpackets,
+               vty_out(vty, "    %-16pI4 %9d %9d %9d   %s\n",
+                       &peer->addr, peer->recv_badpackets,
                        peer->recv_badroutes, ZEBRA_RIP_DISTANCE_DEFAULT,
                        rip_peer_uptime(peer, timebuf, RIP_UPTIME_LEN));
        }