static void ripng_peer_free(struct ripng_peer *peer)
{
- RIPNG_TIMER_OFF(peer->t_timeout);
+ THREAD_OFF(peer->t_timeout);
XFREE(MTYPE_RIPNG_PEER, peer);
}
/* RIPng peer is timeout.
* Garbage collector.
**/
-static int ripng_peer_timeout(struct thread *t)
+static void ripng_peer_timeout(struct thread *t)
{
struct ripng_peer *peer;
peer = THREAD_ARG(t);
listnode_delete(peer->ripng->peer_list, peer);
ripng_peer_free(peer);
-
- return 0;
}
/* Get RIPng peer. At the same time update timeout thread. */
peer = ripng_peer_lookup(ripng, addr);
if (peer) {
- thread_cancel(&peer->t_timeout);
+ THREAD_OFF(peer->t_timeout);
} else {
peer = ripng_peer_new();
peer->ripng = ripng;
char timebuf[RIPNG_UPTIME_LEN];
for (ALL_LIST_ELEMENTS(ripng->peer_list, node, nnode, peer)) {
- vty_out(vty, " %s \n%14s %10d %10d %10d %s\n",
- inet6_ntoa(peer->addr), " ", peer->recv_badpackets,
+ vty_out(vty, " %pI6 \n%14s %10d %10d %10d %s\n",
+ &peer->addr, " ", peer->recv_badpackets,
peer->recv_badroutes, ZEBRA_RIPNG_DISTANCE_DEFAULT,
ripng_peer_uptime(peer, timebuf, RIPNG_UPTIME_LEN));
}